From 08b954d2c6897bb65f907f2dd3a6f96d76425408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Wed, 20 Sep 2023 13:06:09 +0300 Subject: [PATCH 1/2] Add tests for gl.readPixels(), gl.texImage2D() and gl.texSubImage2D() from Wasm Memories of 4GB and 16GB in size. --- sdk/tests/conformance2/00_test_list.txt | 1 + sdk/tests/conformance2/wasm/00_test_list.txt | 6 ++ .../wasm/readpixels-16gb-wasm-memory.html | 51 +++++++++++ .../wasm/readpixels-4gb-wasm-memory.html | 50 +++++++++++ .../wasm/teximage2d-16gb-wasm-memory.html | 85 ++++++++++++++++++ .../wasm/teximage2d-4gb-wasm-memory.html | 85 ++++++++++++++++++ .../wasm/texsubimage2d-16gb-wasm-memory.html | 86 +++++++++++++++++++ .../wasm/texsubimage2d-4gb-wasm-memory.html | 86 +++++++++++++++++++ sdk/tests/test-guidelines.md | 6 +- 9 files changed, 453 insertions(+), 3 deletions(-) create mode 100644 sdk/tests/conformance2/wasm/00_test_list.txt create mode 100644 sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html create mode 100644 sdk/tests/conformance2/wasm/readpixels-4gb-wasm-memory.html create mode 100644 sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html create mode 100644 sdk/tests/conformance2/wasm/teximage2d-4gb-wasm-memory.html create mode 100644 sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html create mode 100644 sdk/tests/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html diff --git a/sdk/tests/conformance2/00_test_list.txt b/sdk/tests/conformance2/00_test_list.txt index e251dc9758..fabc72c1da 100644 --- a/sdk/tests/conformance2/00_test_list.txt +++ b/sdk/tests/conformance2/00_test_list.txt @@ -18,3 +18,4 @@ textures/00_test_list.txt transform_feedback/00_test_list.txt uniforms/00_test_list.txt vertex_arrays/00_test_list.txt +--min-version 2.0.1 wasm/00_test_list.txt diff --git a/sdk/tests/conformance2/wasm/00_test_list.txt b/sdk/tests/conformance2/wasm/00_test_list.txt new file mode 100644 index 0000000000..35c886b757 --- /dev/null +++ b/sdk/tests/conformance2/wasm/00_test_list.txt @@ -0,0 +1,6 @@ +--min-version 2.0.1 readpixels-16gb-wasm-memory.html +--min-version 2.0.1 readpixels-4gb-wasm-memory.html +--min-version 2.0.1 teximage2d-16gb-wasm-memory.html +--min-version 2.0.1 teximage2d-4gb-wasm-memory.html +--min-version 2.0.1 texsubimage2d-16gb-wasm-memory.html +--min-version 2.0.1 texsubimage2d-4gb-wasm-memory.html diff --git a/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html new file mode 100644 index 0000000000..1cd27a84a6 --- /dev/null +++ b/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html @@ -0,0 +1,51 @@ + + + + + +gl.readPixels() test to Wasm Memory 16GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/wasm/readpixels-4gb-wasm-memory.html b/sdk/tests/conformance2/wasm/readpixels-4gb-wasm-memory.html new file mode 100644 index 0000000000..c1ff463e8c --- /dev/null +++ b/sdk/tests/conformance2/wasm/readpixels-4gb-wasm-memory.html @@ -0,0 +1,50 @@ + + + + + +gl.readPixels() test to Wasm Memory 4GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html new file mode 100644 index 0000000000..f1ec6755a4 --- /dev/null +++ b/sdk/tests/conformance2/wasm/teximage2d-16gb-wasm-memory.html @@ -0,0 +1,85 @@ + + + + + +gl.texImage2D() test to Wasm Memory 16GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/wasm/teximage2d-4gb-wasm-memory.html b/sdk/tests/conformance2/wasm/teximage2d-4gb-wasm-memory.html new file mode 100644 index 0000000000..33f3a10cff --- /dev/null +++ b/sdk/tests/conformance2/wasm/teximage2d-4gb-wasm-memory.html @@ -0,0 +1,85 @@ + + + + + +gl.texImage2D() test to Wasm Memory 4GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html new file mode 100644 index 0000000000..d1820808d3 --- /dev/null +++ b/sdk/tests/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html @@ -0,0 +1,86 @@ + + + + + +gl.texSubImage2D() test to Wasm Memory 16GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html b/sdk/tests/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html new file mode 100644 index 0000000000..e396b11fef --- /dev/null +++ b/sdk/tests/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html @@ -0,0 +1,86 @@ + + + + + +gl.texSubImage2D() test to Wasm Memory 4GB in size. + + + + + + +
+
+ + + + diff --git a/sdk/tests/test-guidelines.md b/sdk/tests/test-guidelines.md index 679892b1f0..b02738726e 100644 --- a/sdk/tests/test-guidelines.md +++ b/sdk/tests/test-guidelines.md @@ -18,7 +18,7 @@ the WebGL Working Group when "official" snapshots are taken. These lines must appear in a comment at the top of every code file under sdk/tests/conformance ``` -Copyright (c) 2019 The Khronos Group Inc. +Copyright (c) 2023 The Khronos Group Inc. Use of this source code is governed by an MIT-style license that can be found in the LICENSE.txt file. ``` @@ -102,7 +102,7 @@ found in the LICENSE.txt file. * Tests that are short and run synchronously end with - + * Tests that take a long time use setTimeout so as not to freeze the browser. @@ -144,7 +144,7 @@ found in the LICENSE.txt file. * Vendors may place test harness specific code in the testing infrastructure. - resources/js-test-pre.js + js/js-test-pre.js conformance/more/unit.js * Indent with spaces not tabs. (not everyone uses your tab settings). From 3c171e24a8b7297e7cf0cea7d1ab4a239ee83604 Mon Sep 17 00:00:00 2001 From: Ken Russell Date: Thu, 21 Sep 2023 22:56:36 -0700 Subject: [PATCH 2/2] Update readpixels-16gb-wasm-memory.html Deleted trailing whitespace. --- sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html b/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html index 1cd27a84a6..06a1bf7fc5 100644 --- a/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html +++ b/sdk/tests/conformance2/wasm/readpixels-16gb-wasm-memory.html @@ -26,7 +26,7 @@ let gl = wtu.create3DContext("canvas"); const PAGE = 65536; -const SIZE = 16*1024*1024*1024; +const SIZE = 16*1024*1024*1024; let view = new Uint8Array(new WebAssembly.Memory({ index: 'i64', initial: SIZE/PAGE }).buffer); // Clear the canvas to a specific color