Skip to content

Commit

Permalink
Update WebGL conformance tests 2023-10-14 (39b34d8f45ab0d5c243f336420…
Browse files Browse the repository at this point in the history
…d7475dbe4ed61f)

https://bugs.webkit.org/show_bug.cgi?id=263966
rdar://117740578

Unreviewed, imported from upstream.

* LayoutTests/webgl/2.0.y/conformance2/canvas/drawingbuffer-storage-test-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/canvas/drawingbuffer-storage-test.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/query/occlusion-query-scissor-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/query/occlusion-query-scissor.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/readpixels-16gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/readpixels-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/readpixels-4gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/readpixels-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/teximage2d-16gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/teximage2d-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/teximage2d-4gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/teximage2d-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/texsubimage2d-16gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/texsubimage2d-4gb-wasm-memory-expected.txt: Added.
* LayoutTests/webgl/2.0.y/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance/canvas/drawingbuffer-storage-test.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance/extensions/khr-parallel-shader-compile.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/canvas/drawingbuffer-storage-test.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/query/occlusion-query-scissor.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/renderbuffers/framebuffer-texture-layer.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/rendering/blitframebuffer-test.html:
* LayoutTests/webgl/resources/webgl_test_files/conformance2/textures/misc/tex-image-10bpc.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/readpixels-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/readpixels-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/teximage2d-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/teximage2d-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html: Added.
* LayoutTests/webgl/resources/webgl_test_files/js/tests/drawingbuffer-storage-test.js: Added.
(runTest.initialize):
(runTest.testPixel):
(runTest.srgbToLinear):
(runTest.testClearColor.let.testCase):
(runTest.testClearColor):
(runTest.testNoAlpha):
(runTest.testMissingExtension):
(runTest.testMaxSize):
(runTest.testDrawToCanvas.let.testCase):
(runTest.testDrawToCanvas):
(runTest):
* LayoutTests/webgl/resources/webgl_test_files/resources/red-gradient-8x1-10bit-untagged.png: Added.

Canonical link: https://commits.webkit.org/270111@main
  • Loading branch information
kkinnunen-apple committed Nov 2, 2023
1 parent 1f27ea4 commit 5f0cd64
Show file tree
Hide file tree
Showing 33 changed files with 1,199 additions and 1 deletion.
5 changes: 5 additions & 0 deletions LayoutTests/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -4171,6 +4171,11 @@ webgl/2.0.y/conformance2/extensions/webgl-stencil-texturing.html [ Pass ]
webgl/2.0.y/conformance2/rendering/rasterizer-discard-and-implicit-clear.html [ Pass ]
webgl/2.0.y/conformance2/textures/canvas/ [ Pass ]
webgl/2.0.y/conformance2/textures/webgl_canvas [ Pass ]
webgl/2.0.y/conformance2/wasm [ Pass ]

webkit.org/b/263969 webgl/2.0.y/conformance2/wasm/readpixels-16gb-wasm-memory.html [ Failure ]
webkit.org/b/263969 webgl/2.0.y/conformance2/wasm/teximage2d-16gb-wasm-memory.html [ Failure ]
webkit.org/b/263969 webgl/2.0.y/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html [ Failure ]

# WebGL 1.0.3 and 2.0.0 tests where behavior is obsolete and WebKit contains implementation
# and tests for the new behavior. Should be removed once 1.0.3 and 2.0.0 are retired.
Expand Down
5 changes: 5 additions & 0 deletions LayoutTests/platform/ios-simulator/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ webkit.org/b/237415 webgl/1.0.x/conformance/rendering/clipping-wide-points.html
webkit.org/b/254805 webgl/2.0.y/conformance/rendering/blending.html [ Failure ]
webkit.org/b/261270 webgl/2.0.y/conformance2/extensions/webgl-stencil-texturing.html [ Failure Pass ]

# Sometimes out of memory
webgl/2.0.y/conformance2/wasm/readpixels-4gb-wasm-memory.html [ Pass Failure ]
webgl/2.0.y/conformance2/wasm/teximage2d-4gb-wasm-memory.html [ Pass Failure ]
webgl/2.0.y/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html [ Pass Failure ]

# Failure for CSS tables
imported/w3c/web-platform-tests/css/css-tables/subpixel-collapsed-borders-003.html [ ImageOnlyFailure ]

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/canvas/drawingbuffer-storage-test.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for drawingbuffer-storage-test.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/canvas/drawingbuffer-storage-test.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/canvas/drawingbuffer-storage-test.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/canvas/drawingbuffer-storage-test.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/query/occlusion-query-scissor.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for occlusion-query-scissor.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/query/occlusion-query-scissor.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/query/occlusion-query-scissor.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/query/occlusion-query-scissor.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/readpixels-16gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for readpixels-16gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/readpixels-16gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/readpixels-16gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/readpixels-16gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/readpixels-4gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for readpixels-4gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/readpixels-4gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/readpixels-4gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/readpixels-4gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/teximage2d-16gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for teximage2d-16gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/teximage2d-16gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/teximage2d-16gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/teximage2d-16gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/teximage2d-4gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for teximage2d-4gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/teximage2d-4gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/teximage2d-4gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/teximage2d-4gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for texsubimage2d-16gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-16gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.

Test: ../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html?webglVersion=2
[ PASS ] All tests passed
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- This file is auto-generated by Tools/Scripts/update-webgl-conformance-tests. DO NOT EDIT -->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL Conformance Test Wrapper for texsubimage2d-4gb-wasm-memory.html</title>
<script type="text/javascript" src="../../../resources/js-test-pre.js"></script>
<script type="text/javascript" src="../../../resources/webkit-webgl-test-harness.js"></script>
</head>
<body>
<p>This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.</p>
Test: <a href="../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html?webglVersion=2">../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html?webglVersion=2</a>
<div id="iframe">
<iframe src="../../../resources/webgl_test_files/conformance2/wasm/texsubimage2d-4gb-wasm-memory.html?quiet=1&webglVersion=2" width="800" height="600"></iframe>
</div>
<div id="result"></div>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
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.
-->

<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL drawingBufferStorage Conformance Tests</title>
<link rel="stylesheet" href="../../resources/js-test-style.css"/>
<script src="../../js/js-test-pre.js"></script>
<script src="../../js/webgl-test-utils.js"></script>
<script src="../../js/tests/drawingbuffer-storage-test.js"></script>
</head>
<body>
<div id="description"></div>
<div id="console"></div>
<script>
runTest(1);

var successfullyParsed = true;
</script>
<script src="../../js/js-test-post.js"></script>
</body>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,32 @@
testPassed(`COMPLETION_STATUS_KHR sucessfully transitioned from false to true`);
}

debug("Checking that compiling lots of programs in parallel eventually completes.");
let programs = [];
for (let i = 0; i < 256; ++i) {
gl.shaderSource(vs, vertexSource());
gl.shaderSource(fs, fragmentSource());
gl.compileShader(vs);
gl.compileShader(fs);
let program = gl.createProgram();
gl.attachShader(program, vs);
gl.attachShader(program, fs);
gl.linkProgram(program);
programs.push(program);
}
let allDone = false;
while (!allDone) {
allDone = true;
for (let i = 0; i < programs.length; ++i) {
if (!gl.getProgramParameter(programs[i], COMPLETION_STATUS_KHR)) {
allDone = false;
break;
}
}
if (!allDone) {
await new Promise(requestAnimationFrame);
}
}

debug("Checking that status is true when context is lost.");
if (loseContext) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
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.
-->

<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>WebGL2 drawingBufferStorage Conformance Tests</title>
<link rel="stylesheet" href="../../resources/js-test-style.css"/>
<script src="../../js/js-test-pre.js"></script>
<script src="../../js/webgl-test-utils.js"></script>
<script src="../../js/tests/drawingbuffer-storage-test.js"></script>
</head>
<body>
<div id="description"></div>
<div id="console"></div>
<script>
runTest(2);

var successfullyParsed = true;
</script>
<script src="../../js/js-test-post.js"></script>
</body>
</html>
Loading

0 comments on commit 5f0cd64

Please sign in to comment.