diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json index 0139c8a4ab6..5d76955c361 100644 --- a/tests/wpt/meta/MANIFEST.json +++ b/tests/wpt/meta/MANIFEST.json @@ -500723,7 +500723,7 @@ [] ], "webxr_util.js": [ - "824aee5700a15d518a113bbbcaab7bdf92d187e2", + "ab8f7c80c31fc7bc827bd61abf13e095e53b48cd", [] ] }, diff --git a/tests/wpt/meta/webxr/__dir__.ini b/tests/wpt/meta/webxr/__dir__.ini index fd78c99e339..16c2a8593c1 100644 --- a/tests/wpt/meta/webxr/__dir__.ini +++ b/tests/wpt/meta/webxr/__dir__.ini @@ -1 +1 @@ -prefs: [dom.webxr.test: true, dom.webgl2.enabled: true] \ No newline at end of file +prefs: [dom.webxr.test: true, dom.webgl2.enabled: true, dom.webxr.layers.enabled: true] \ No newline at end of file diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html.ini index fed069ed36e..256255b16cb 100644 --- a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_dataUnavailable.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_cpu_dataUnavailable.https.html] + expected: ERROR [Ensures depth data is not available when cleared in the controller, `cpu-optimized` - webgl] expected: FAIL [Ensures depth data is not available when cleared in the controller, `cpu-optimized` - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini index 67d0e4bbdd8..bd9620affc4 100644 --- a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_inactiveFrame.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_cpu_inactiveFrame.https.html] + expected: ERROR [Ensures getDepthInformation() throws when not run in an active frame, `cpu-optimized` - webgl] expected: FAIL [Ensures getDepthInformation() throws when not run in an active frame, `cpu-optimized` - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html.ini index 15ef5e0b2e6..809dce7d84b 100644 --- a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_incorrectUsage.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_cpu_incorrectUsage.https.html] + expected: ERROR [Ensures XRWebGLDepthInformation is not obtainable in `cpu-optimized` usage mode - webgl] expected: FAIL [Ensures XRWebGLDepthInformation is not obtainable in `cpu-optimized` usage mode - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html.ini index 0887ed820fb..49ce8a8d50d 100644 --- a/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/cpu/depth_sensing_cpu_staleView.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_cpu_staleView.https.html] + expected: ERROR [Ensures getDepthInformation() throws when run with stale XRView, `cpu-optimized` - webgl] expected: FAIL [Ensures getDepthInformation() throws when run with stale XRView, `cpu-optimized` - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html.ini index 6f14589c244..a8440f2e916 100644 --- a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_dataUnavailable.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_gpu_dataUnavailable.https.html] + expected: ERROR [Ensures depth data is not available when cleared in the controller, `gpu-optimized` - webgl] expected: FAIL [Ensures depth data is not available when cleared in the controller, `gpu-optimized` - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html.ini b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html.ini index eae490182bb..c49fa2d1001 100644 --- a/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html.ini +++ b/tests/wpt/meta/webxr/depth-sensing/gpu/depth_sensing_gpu_staleView.https.html.ini @@ -1,7 +1,7 @@ [depth_sensing_gpu_staleView.https.html] + expected: ERROR [Ensures getDepthInformation() throws when not run with stale XRView, `gpu-optimized` - webgl] expected: FAIL [Ensures getDepthInformation() throws when not run with stale XRView, `gpu-optimized` - webgl2] expected: FAIL - diff --git a/tests/wpt/meta/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html.ini b/tests/wpt/meta/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html.ini index d8131452238..3fdd556882c 100644 --- a/tests/wpt/meta/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html.ini +++ b/tests/wpt/meta/webxr/light-estimation/xrWebGLBinding_getReflectionCubeMap.https.html.ini @@ -1,7 +1,3 @@ [xrWebGLBinding_getReflectionCubeMap.https.html] [Test that getReflectionCubeMap returns or throws appropriately without a reflection map. - webgl] expected: FAIL - - [Test that getReflectionCubeMap returns or throws appropriately without a reflection map. - webgl2] - expected: FAIL - diff --git a/tests/wpt/meta/webxr/render_state_update.https.html.ini b/tests/wpt/meta/webxr/render_state_update.https.html.ini deleted file mode 100644 index 0e57356683e..00000000000 --- a/tests/wpt/meta/webxr/render_state_update.https.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[render_state_update.https.html] - expected: ERROR diff --git a/tests/wpt/meta/webxr/xrWebGLLayer_constructor.https.html.ini b/tests/wpt/meta/webxr/xrWebGLLayer_constructor.https.html.ini index 0de39606381..0dca0a14292 100644 --- a/tests/wpt/meta/webxr/xrWebGLLayer_constructor.https.html.ini +++ b/tests/wpt/meta/webxr/xrWebGLLayer_constructor.https.html.ini @@ -1,7 +1,7 @@ [xrWebGLLayer_constructor.https.html] + expected: ERROR [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl2] - expected: FAIL + expected: NOTRUN [Ensure that XRWebGLLayer's constructor throws appropriate errors using webgl] - expected: FAIL - + expected: TIMEOUT diff --git a/tests/wpt/tests/webxr/resources/webxr_util.js b/tests/wpt/tests/webxr/resources/webxr_util.js index 824aee5700a..ab8f7c80c31 100644 --- a/tests/wpt/tests/webxr/resources/webxr_util.js +++ b/tests/wpt/tests/webxr/resources/webxr_util.js @@ -13,6 +13,8 @@ // override this. var xr_debug = function(name, msg) {}; +let loaded = new Promise(resolve => document.addEventListener('DOMContentLoaded', resolve)); + function xr_promise_test(name, func, properties, glContextType, glContextProperties) { promise_test(async (t) => { if (glContextType === 'webgl2') { @@ -60,6 +62,7 @@ function xr_promise_test(name, func, properties, glContextType, glContextPropert let canvas = null; if (glContextType) { canvas = document.createElement('canvas'); + await loaded; document.body.appendChild(canvas); gl = canvas.getContext(glContextType, glContextProperties); } @@ -161,22 +164,20 @@ function xr_session_promise_test( })); } - document.addEventListener('DOMContentLoaded', () => { - xr_promise_test( - name + ' - webgl', - runTest, - properties, - 'webgl', - {alpha: false, antialias: false, ...glcontextProperties} - ); - xr_promise_test( - name + ' - webgl2', - runTest, - properties, - 'webgl2', - {alpha: false, antialias: false, ...glcontextProperties} - ); - }); + xr_promise_test( + name + ' - webgl', + runTest, + properties, + 'webgl', + {alpha: false, antialias: false, ...glcontextProperties} + ); + xr_promise_test( + name + ' - webgl2', + runTest, + properties, + 'webgl2', + {alpha: false, antialias: false, ...glcontextProperties} + ); }