From 7024c99a86b12ad26df57d8407ed83dc7939b7fa Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sat, 1 Sep 2018 02:27:23 +0200 Subject: [PATCH] Update WebGL tests https://github.com/KhronosGroup/WebGL/pull/2702 --- tests/wpt/webgl/meta/MANIFEST.json | 44 +-- .../buffer-data-array-buffer-delete.html.ini | 3 +- ...-bindings-affected-by-to-data-url.html.ini | 3 +- .../context/premultiplyalpha-test.html.ini | 68 ++++- .../framebuffer-state-restoration.html.ini | 4 +- .../rendering/multisample-corruption.html.ini | 4 +- .../preservedrawingbuffer-leak.html.ini | 4 +- ...tex-video-using-tex-unit-non-zero.html.ini | 4 +- .../misc/texture-upload-size.html.ini | 3 + .../tex-2d-alpha-alpha-unsigned_byte.html.ini | 4 +- ...luminance-luminance-unsigned_byte.html.ini | 4 +- ...pha-luminance_alpha-unsigned_byte.html.ini | 4 +- .../tex-2d-rgb-rgb-unsigned_byte.html.ini | 4 +- ...x-2d-rgb-rgb-unsigned_short_5_6_5.html.ini | 4 +- .../tex-2d-rgba-rgba-unsigned_byte.html.ini | 4 +- ...-rgba-rgba-unsigned_short_4_4_4_4.html.ini | 4 +- ...-rgba-rgba-unsigned_short_5_5_5_1.html.ini | 4 +- .../canvas-resizing-with-pbo-bound.html.ini | 28 +- .../buffer-data-array-buffer-delete.html | 32 +- .../tests/conformance/canvas/canvas-test.html | 1 + ...-static-webgl-to-multiple-canvas-test.html | 2 +- .../canvas/draw-webgl-to-canvas-test.html | 2 +- ...ffer-bindings-affected-by-to-data-url.html | 5 + .../conformance/canvas/rapid-resizing.html | 2 + .../conformance/canvas/to-data-url-test.html | 1 + ...ext-attribute-preserve-drawing-buffer.html | 9 + .../context/premultiplyalpha-test.html | 6 + .../framebuffer-state-restoration.html | 5 + .../rendering/multisample-corruption.html | 11 +- .../rendering/preservedrawingbuffer-leak.html | 11 +- .../tex-video-using-tex-unit-non-zero.html | 281 +++++++++--------- .../textures/misc/texture-upload-size.html | 3 + .../conformance2/context/00_test_list.txt | 1 + .../conformance2/context/context-mode.html | 79 +++++ .../canvas-resizing-with-pbo-bound.html | 2 + ...mage-and-sub-image-2d-with-webgl-canvas.js | 5 + 36 files changed, 459 insertions(+), 196 deletions(-) create mode 100644 tests/wpt/webgl/tests/conformance2/context/context-mode.html diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json index b5fc2a57533f..ee13046d7f20 100644 --- a/tests/wpt/webgl/meta/MANIFEST.json +++ b/tests/wpt/webgl/meta/MANIFEST.json @@ -15796,6 +15796,12 @@ {} ] ], + "conformance2/context/context-mode.html": [ + [ + "/_webgl/conformance2/context/context-mode.html", + {} + ] + ], "conformance2/context/context-resize-changes-buffer-binding-bug.html": [ [ "/_webgl/conformance2/context/context-resize-changes-buffer-binding-bug.html", @@ -27482,7 +27488,7 @@ "testharness" ], "conformance/buffers/buffer-data-array-buffer-delete.html": [ - "c2a8d35e1a965eff1ea8d7117cf030a7471d6231", + "579aa2037882da16836eb1e5183afcc3b153d1f6", "testharness" ], "conformance/buffers/buffer-data-dynamic-delay.html": [ @@ -27534,7 +27540,7 @@ "testharness" ], "conformance/canvas/canvas-test.html": [ - "e1a900a31b53eca74de2e6692fcd28533fe26f41", + "072f144888a7dad5ea71ddb941d49bf1c85a4131", "testharness" ], "conformance/canvas/canvas-zero-size.html": [ @@ -27542,11 +27548,11 @@ "testharness" ], "conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html": [ - "0770cb5ffc303d66b92b9a9715190afb11485e6b", + "35bead3cc5eb245b055bdf312adb187329c4629b", "testharness" ], "conformance/canvas/draw-webgl-to-canvas-test.html": [ - "45b79bbde40f316699aae227160de34c14028092", + "27f01d41dfe211fbdafa44ead612daa820746a1e", "testharness" ], "conformance/canvas/drawingbuffer-hd-dpi-test.html": [ @@ -27562,7 +27568,7 @@ "testharness" ], "conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html": [ - "9cb944a3392de4b14c728a067d01908d1e0e9c96", + "b09b00bfde56521dc1cf2bd269e3465fc01133e5", "testharness" ], "conformance/canvas/framebuffer-bindings-unaffected-on-resize.html": [ @@ -27570,7 +27576,7 @@ "testharness" ], "conformance/canvas/rapid-resizing.html": [ - "f423e17f563da0751d96604adc64bbc0537a52bc", + "cd3dbb8e9575036c33b12264e9c46b339336db7e", "testharness" ], "conformance/canvas/render-after-resize-test.html": [ @@ -27582,7 +27588,7 @@ "testharness" ], "conformance/canvas/to-data-url-test.html": [ - "67e26a408ea461faa66394dad11d3efca1c712d9", + "d7e77c869899a9d8dfa15a2eb7068c95f66b1c0a", "testharness" ], "conformance/canvas/viewport-unchanged-upon-resize.html": [ @@ -27598,7 +27604,7 @@ "testharness" ], "conformance/context/context-attribute-preserve-drawing-buffer.html": [ - "2726815a7c4ebf3d6a19c29a3e301830ef0ff11d", + "64b9e5bf377e131f9d10ef0a68282a485a63dd52", "testharness" ], "conformance/context/context-attributes-alpha-depth-stencil-antialias.html": [ @@ -27658,7 +27664,7 @@ "testharness" ], "conformance/context/premultiplyalpha-test.html": [ - "4f63c2ef232a2e17a83d90d72ba2098c02bbb6a5", + "6bf9503c359d71f841fdd9724c3d12bafb006d28", "testharness" ], "conformance/context/resources/context-release-child-with-worker.html": [ @@ -36310,7 +36316,7 @@ "testharness" ], "conformance/renderbuffers/framebuffer-state-restoration.html": [ - "4028029e468238e6506bef01797e6ad04b4fb784", + "dbef36b66f50a2715395c9773b48246b8b7d586f", "testharness" ], "conformance/renderbuffers/framebuffer-test.html": [ @@ -36414,7 +36420,7 @@ "testharness" ], "conformance/rendering/multisample-corruption.html": [ - "d3d25e0a876973ea397097823ed9132dc892ddcc", + "7de9b47f229ac935cdb76b14e6237243ae14ce04", "testharness" ], "conformance/rendering/negative-one-index.html": [ @@ -36446,7 +36452,7 @@ "testharness" ], "conformance/rendering/preservedrawingbuffer-leak.html": [ - "bd1dccbdeea10de6d62f31ce9e6c46048134b276", + "3df53551ef062f8c5a9b52003f2a564db14d990f", "testharness" ], "conformance/rendering/rendering-stencil-large-viewport.html": [ @@ -36970,7 +36976,7 @@ "testharness" ], "conformance/textures/misc/tex-video-using-tex-unit-non-zero.html": [ - "8db7d43610e820a46b9662103cffe9c86f819edc", + "9abe3bd71772133857507f18a5a6fcfc95b080da", "testharness" ], "conformance/textures/misc/texparameter-test.html": [ @@ -37062,7 +37068,7 @@ "testharness" ], "conformance/textures/misc/texture-upload-size.html": [ - "59934e4ede1ab612ad2c7342bac79ddbe4db4d68", + "8832033dd705cc6ccea02c58eff879a8f2f59e3e", "testharness" ], "conformance/textures/misc/texture-with-flip-y-and-premultiply-alpha.html": [ @@ -37426,7 +37432,7 @@ "testharness" ], "conformance2/context/00_test_list.txt": [ - "c2d13238b2991ae4e3d0ea802f6a63c2c40dd455", + "fc4f8b8c07fcbe15156d55a4a58ddb2727567dc9", "support" ], "conformance2/context/constants-and-properties-2.html": [ @@ -37437,6 +37443,10 @@ "5476f4e3a68be618c89380128f77d0b97b333457", "testharness" ], + "conformance2/context/context-mode.html": [ + "fa44ce4c877adf82bf6245776b9b1237ad557d89", + "testharness" + ], "conformance2/context/context-resize-changes-buffer-binding-bug.html": [ "c169eed8a573eed8ec12efea9093e55d477e8b44", "testharness" @@ -37934,7 +37944,7 @@ "testharness" ], "conformance2/rendering/canvas-resizing-with-pbo-bound.html": [ - "bb303081fc8e012d03d2056f6c1028026eb91236", + "78f7f9da22268d73fddb2e33c9c08e929efe65ab", "testharness" ], "conformance2/rendering/clear-func-buffer-type-match.html": [ @@ -46534,7 +46544,7 @@ "support" ], "js/tests/tex-image-and-sub-image-2d-with-webgl-canvas.js": [ - "61578ab040f12208119f9afbbf156a8aea47a9d4", + "8ade197c61c116a25bbb6dc380334b9cca1010de", "support" ], "js/tests/tex-image-and-sub-image-3d-with-canvas-sub-rectangle.js": [ diff --git a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini index 59852dba1f6e..4c895897d401 100644 --- a/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini +++ b/tests/wpt/webgl/meta/conformance/buffers/buffer-data-array-buffer-delete.html.ini @@ -1,9 +1,8 @@ [buffer-data-array-buffer-delete.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL - [WebGL test #1: gl should be non-null. Was null] + [WebGL test #1: context does not exist] expected: FAIL diff --git a/tests/wpt/webgl/meta/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html.ini b/tests/wpt/webgl/meta/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html.ini index 8a9c9cae380b..dfb9898d3b03 100644 --- a/tests/wpt/webgl/meta/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html.ini +++ b/tests/wpt/webgl/meta/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html.ini @@ -1,8 +1,7 @@ [framebuffer-bindings-affected-by-to-data-url.html] - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL - [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] + [WebGL test #1: context does not exist] expected: FAIL diff --git a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini index e7020b7432db..5494eb69348f 100644 --- a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini +++ b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini @@ -1,12 +1,74 @@ [premultiplyalpha-test.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL - [WebGL test #1: gl.getContextAttributes().premultipliedAlpha should be true. Threw exception TypeError: gl is null] + [WebGL test #5: context does not exist] expected: FAIL - [WebGL test #2: gl.getContextAttributes().preserveDrawingBuffer should be true. Threw exception TypeError: gl is null] + [WebGL test #3: context does not exist] + expected: FAIL + + [WebGL test #6: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #11: context does not exist] + expected: FAIL + + [WebGL test #13: context does not exist] + expected: FAIL + + [WebGL test #18: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #14: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #20: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #4: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #15: context does not exist] + expected: FAIL + + [WebGL test #23: context does not exist] + expected: FAIL + + [WebGL test #17: context does not exist] + expected: FAIL + + [WebGL test #8: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #22: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #10: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #21: context does not exist] + expected: FAIL + + [WebGL test #2: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #1: context does not exist] + expected: FAIL + + [WebGL test #19: context does not exist] + expected: FAIL + + [WebGL test #7: context does not exist] + expected: FAIL + + [WebGL test #9: context does not exist] + expected: FAIL + + [WebGL test #16: Unable to fetch WebGL rendering context for Canvas] + expected: FAIL + + [WebGL test #12: Unable to fetch WebGL rendering context for Canvas] expected: FAIL diff --git a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini index bef96451d922..8a7bc8a443f1 100644 --- a/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini +++ b/tests/wpt/webgl/meta/conformance/renderbuffers/framebuffer-state-restoration.html.ini @@ -1,5 +1,7 @@ [framebuffer-state-restoration.html] - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini index 6d8da9b93f72..a9db337a9839 100644 --- a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini +++ b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini @@ -1,6 +1,8 @@ [multisample-corruption.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini index 7b23dcad35a0..74771cdf1ca5 100644 --- a/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini +++ b/tests/wpt/webgl/meta/conformance/rendering/preservedrawingbuffer-leak.html.ini @@ -1,6 +1,8 @@ [preservedrawingbuffer-leak.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini index 5035d26be998..9b47471145c5 100644 --- a/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html.ini @@ -1,6 +1,8 @@ [tex-video-using-tex-unit-non-zero.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini index acb21a9163df..917f7e454cfa 100644 --- a/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini @@ -3,3 +3,6 @@ [Overall test] expected: NOTRUN + [WebGL test #20: could not create image (SVG)] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini index dbdf31ff32e7..12cb8560a348 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-alpha-alpha-unsigned_byte.html.ini @@ -1,6 +1,8 @@ [tex-2d-alpha-alpha-unsigned_byte.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini index 23559bf9946f..8f783ef6cd48 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance-luminance-unsigned_byte.html.ini @@ -1,6 +1,8 @@ [tex-2d-luminance-luminance-unsigned_byte.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini index b366ccffc180..3740984c2433 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html.ini @@ -1,6 +1,8 @@ [tex-2d-luminance_alpha-luminance_alpha-unsigned_byte.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini index 915c592402a4..165188da97aa 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_byte.html.ini @@ -1,6 +1,8 @@ [tex-2d-rgb-rgb-unsigned_byte.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini index 85e69c47bfe1..3a1901898445 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgb-rgb-unsigned_short_5_6_5.html.ini @@ -1,6 +1,8 @@ [tex-2d-rgb-rgb-unsigned_short_5_6_5.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini index e32493a9f420..6ce29315c67e 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_byte.html.ini @@ -1,6 +1,8 @@ [tex-2d-rgba-rgba-unsigned_byte.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini index c7877e83dd57..7e33894a200a 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html.ini @@ -1,6 +1,8 @@ [tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini index b5db4f16552e..40496fcde9cb 100644 --- a/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini +++ b/tests/wpt/webgl/meta/conformance/textures/webgl_canvas/tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html.ini @@ -1,6 +1,8 @@ [tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html] bug: https://github.com/servo/servo/issues/21132 - expected: ERROR [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL + [WebGL test #1: context does not exist] + expected: FAIL + diff --git a/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini index d6a3e8f1fcc0..dddb52a97245 100644 --- a/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini +++ b/tests/wpt/webgl/meta/conformance2/rendering/canvas-resizing-with-pbo-bound.html.ini @@ -1,11 +1,31 @@ [canvas-resizing-with-pbo-bound.html] - expected: TIMEOUT - [Overall test] - expected: NOTRUN - [WebGL test #0: Unable to fetch WebGL rendering context for Canvas] expected: FAIL [WebGL test #1: context does not exist] expected: FAIL + [WebGL test #13: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error] + expected: FAIL + + [WebGL test #26: Pixel unpack buffer binding was lost] + expected: FAIL + + [WebGL test #20: Pixel unpack buffer binding was lost] + expected: FAIL + + [WebGL test #19: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error] + expected: FAIL + + [WebGL test #25: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error] + expected: FAIL + + [WebGL test #7: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error] + expected: FAIL + + [WebGL test #8: Pixel unpack buffer binding was lost] + expected: FAIL + + [WebGL test #14: Pixel unpack buffer binding was lost] + expected: FAIL + diff --git a/tests/wpt/webgl/tests/conformance/buffers/buffer-data-array-buffer-delete.html b/tests/wpt/webgl/tests/conformance/buffers/buffer-data-array-buffer-delete.html index c2a8d35e1a96..579aa2037882 100644 --- a/tests/wpt/webgl/tests/conformance/buffers/buffer-data-array-buffer-delete.html +++ b/tests/wpt/webgl/tests/conformance/buffers/buffer-data-array-buffer-delete.html @@ -56,24 +56,28 @@ var wtu = WebGLTestUtils; var gl = wtu.create3DContext(canvas, {preserveDrawingBuffer: true}); -shouldBeNonNull("gl"); -var array = new Float32Array([0]); -var buf = gl.createBuffer(); -gl.bindBuffer(gl.ARRAY_BUFFER, buf); -gl.bufferData(gl.ARRAY_BUFFER, array, gl.STATIC_DRAW); -wtu.glErrorShouldBe(gl, gl.NO_ERROR); +if (!gl) { + testFailed("context does not exist"); + finishTest(); +} else { + var array = new Float32Array([0]); + var buf = gl.createBuffer(); + gl.bindBuffer(gl.ARRAY_BUFFER, buf); + gl.bufferData(gl.ARRAY_BUFFER, array, gl.STATIC_DRAW); + wtu.glErrorShouldBe(gl, gl.NO_ERROR); -var attribLocation = 1; -gl.enableVertexAttribArray(attribLocation); -gl.vertexAttribPointer(attribLocation, 1, gl.FLOAT, false, 0, 0); + var attribLocation = 1; + gl.enableVertexAttribArray(attribLocation); + gl.vertexAttribPointer(attribLocation, 1, gl.FLOAT, false, 0, 0); -gl.deleteBuffer(buf); + gl.deleteBuffer(buf); -setTimeout(function() { - // Wait for possible context loss - finishTest(); -}, 2000); + setTimeout(function() { + // Wait for possible context loss + finishTest(); + }, 2000); +} var successfullyParsed = true; diff --git a/tests/wpt/webgl/tests/conformance/canvas/canvas-test.html b/tests/wpt/webgl/tests/conformance/canvas/canvas-test.html index e1a900a31b53..072f144888a7 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/canvas-test.html +++ b/tests/wpt/webgl/tests/conformance/canvas/canvas-test.html @@ -57,6 +57,7 @@ var gl = wtu.create3DContext(canvas); if (!gl) { testFailed("context does not exist"); + finishTest(); } else { testPassed("context exists"); diff --git a/tests/wpt/webgl/tests/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html b/tests/wpt/webgl/tests/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html index 0770cb5ffc30..35bead3cc5eb 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html +++ b/tests/wpt/webgl/tests/conformance/canvas/draw-static-webgl-to-multiple-canvas-test.html @@ -90,8 +90,8 @@ err = gl.getError(); debug(""); - finishTest(); } +finishTest(); diff --git a/tests/wpt/webgl/tests/conformance/canvas/draw-webgl-to-canvas-test.html b/tests/wpt/webgl/tests/conformance/canvas/draw-webgl-to-canvas-test.html index 45b79bbde40f..27f01d41dfe2 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/draw-webgl-to-canvas-test.html +++ b/tests/wpt/webgl/tests/conformance/canvas/draw-webgl-to-canvas-test.html @@ -93,8 +93,8 @@ err = gl.getError(); debug(""); - finishTest(); } +finishTest(); diff --git a/tests/wpt/webgl/tests/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html b/tests/wpt/webgl/tests/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html index 9cb944a3392d..b09b00bfde56 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html +++ b/tests/wpt/webgl/tests/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html @@ -47,6 +47,11 @@ var glCanvas = document.getElementById("example"); var gl = wtu.create3DContext(glCanvas, {preserveDrawingBuffer: true, premultipliedAlpha: true}); + if (!gl) { + testFailed("context does not exist"); + return; + } + var program = wtu.setupColorQuad(gl); // Clear backbuffer in red. diff --git a/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html b/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html index f423e17f563d..cd3dbb8e9575 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html +++ b/tests/wpt/webgl/tests/conformance/canvas/rapid-resizing.html @@ -93,6 +93,8 @@ if (!gl) { testFailed("context does not exist"); + + wtu.requestAnimFrame(nextTest); } else { testPassed("context exists"); diff --git a/tests/wpt/webgl/tests/conformance/canvas/to-data-url-test.html b/tests/wpt/webgl/tests/conformance/canvas/to-data-url-test.html index 67e26a408ea4..d7e77c869899 100644 --- a/tests/wpt/webgl/tests/conformance/canvas/to-data-url-test.html +++ b/tests/wpt/webgl/tests/conformance/canvas/to-data-url-test.html @@ -53,6 +53,7 @@ if (!gl) { testFailed("can't create 3d context"); + finishTest(); return; } diff --git a/tests/wpt/webgl/tests/conformance/context/context-attribute-preserve-drawing-buffer.html b/tests/wpt/webgl/tests/conformance/context/context-attribute-preserve-drawing-buffer.html index 2726815a7c4e..64b9e5bf377e 100644 --- a/tests/wpt/webgl/tests/conformance/context/context-attribute-preserve-drawing-buffer.html +++ b/tests/wpt/webgl/tests/conformance/context/context-attribute-preserve-drawing-buffer.html @@ -84,6 +84,15 @@ var ctx1 = c1.getContext('2d'); var ctx2 = c2.getContext('2d'); var gl = wtu.create3DContext(c3, { alpha:false, preserveDrawingBuffer:preserve }); + if (!gl) { + testFailed("context does not exist"); + if (preserve) { + finishTest() + } else { + runTest(true); + } + return; + } gl.clearColor(1, 0, 0, 1); gl.clear(gl.COLOR_BUFFER_BIT); ctx1.drawImage(c3, 0, 0); diff --git a/tests/wpt/webgl/tests/conformance/context/premultiplyalpha-test.html b/tests/wpt/webgl/tests/conformance/context/premultiplyalpha-test.html index 4f63c2ef232a..6bf9503c359d 100644 --- a/tests/wpt/webgl/tests/conformance/context/premultiplyalpha-test.html +++ b/tests/wpt/webgl/tests/conformance/context/premultiplyalpha-test.html @@ -175,6 +175,12 @@ + ", antialias: " + antialias + ", imageFormat: " + test.imageFormat); + if (!gl) { + testFailed("context does not exist"); + doNextTest(); + return; + } + shouldBe('gl.getContextAttributes().premultipliedAlpha', premultipliedAlpha.toString()); shouldBeTrue('gl.getContextAttributes().preserveDrawingBuffer'); diff --git a/tests/wpt/webgl/tests/conformance/renderbuffers/framebuffer-state-restoration.html b/tests/wpt/webgl/tests/conformance/renderbuffers/framebuffer-state-restoration.html index 4028029e4682..dbef36b66f50 100644 --- a/tests/wpt/webgl/tests/conformance/renderbuffers/framebuffer-state-restoration.html +++ b/tests/wpt/webgl/tests/conformance/renderbuffers/framebuffer-state-restoration.html @@ -48,6 +48,11 @@ function test() { var gl = wtu.create3DContext("example", {preserveDrawingBuffer: true}); + if (!gl) { + testFailed("context does not exist"); + finishTest(); + return; + } var program = wtu.setupColorQuad(gl); var colorLoc = gl.getUniformLocation(program, "u_color"); gl.enable(gl.DEPTH_TEST); diff --git a/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html b/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html index d3d25e0a8769..7de9b47f229a 100644 --- a/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html +++ b/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html @@ -51,9 +51,14 @@ var wtu = WebGLTestUtils; var gl = wtu.create3DContext("example", {antialias: true, preserveDrawingBuffer: true}); -var test = IterableTest.createMultisampleCorruptionTest(gl); -var iterations = parseInt(wtu.getUrlOptions().iterations, 10) || 25; -IterableTest.run(test, iterations); +if (!gl) { + testFailed("context does not exist"); + finishTest(); +} else { + var test = IterableTest.createMultisampleCorruptionTest(gl); + var iterations = parseInt(wtu.getUrlOptions().iterations, 10) || 25; + IterableTest.run(test, iterations); +} var successfullyParsed = true; diff --git a/tests/wpt/webgl/tests/conformance/rendering/preservedrawingbuffer-leak.html b/tests/wpt/webgl/tests/conformance/rendering/preservedrawingbuffer-leak.html index bd1dccbdeea1..3df53551ef06 100644 --- a/tests/wpt/webgl/tests/conformance/rendering/preservedrawingbuffer-leak.html +++ b/tests/wpt/webgl/tests/conformance/rendering/preservedrawingbuffer-leak.html @@ -51,9 +51,14 @@ var wtu = WebGLTestUtils; var gl = wtu.create3DContext("example", {preserveDrawingBuffer: true}); -var test = IterableTest.createPreserveDrawingBufferLeakTest(gl); -var iterations = parseInt(wtu.getUrlOptions().iterations, 10) || 50; -IterableTest.run(test, iterations); +if (!gl) { + testFailed("context does not exist"); + finishTest(); +} else { + var test = IterableTest.createPreserveDrawingBufferLeakTest(gl); + var iterations = parseInt(wtu.getUrlOptions().iterations, 10) || 50; + IterableTest.run(test, iterations); +} var successfullyParsed = true; diff --git a/tests/wpt/webgl/tests/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html b/tests/wpt/webgl/tests/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html index 8db7d43610e8..9abe3bd71772 100644 --- a/tests/wpt/webgl/tests/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html +++ b/tests/wpt/webgl/tests/conformance/textures/misc/tex-video-using-tex-unit-non-zero.html @@ -71,151 +71,164 @@ diff --git a/tests/wpt/webgl/tests/conformance/textures/misc/texture-upload-size.html b/tests/wpt/webgl/tests/conformance/textures/misc/texture-upload-size.html index 59934e4ede1a..8832033dd705 100644 --- a/tests/wpt/webgl/tests/conformance/textures/misc/texture-upload-size.html +++ b/tests/wpt/webgl/tests/conformance/textures/misc/texture-upload-size.html @@ -137,6 +137,9 @@ var img = wtu.makeImage(test.src, function() { testImage(test, img); setTimeout(runNextTest, 0); + }, function () { + testFailed("could not create image" + (test.isSVG ? " (SVG)" : "")); + setTimeout(runNextTest, 0); }); } else if (test.type == "video") { debug("HTMLVideoElement (" + test.videoType + ")"); diff --git a/tests/wpt/webgl/tests/conformance2/context/00_test_list.txt b/tests/wpt/webgl/tests/conformance2/context/00_test_list.txt index c2d13238b299..fc4f8b8c07fc 100644 --- a/tests/wpt/webgl/tests/conformance2/context/00_test_list.txt +++ b/tests/wpt/webgl/tests/conformance2/context/00_test_list.txt @@ -1,5 +1,6 @@ constants-and-properties-2.html context-attributes-depth-stencil-antialias-obeyed.html +--min-version 2.0.1 context-mode.html --min-version 2.0.1 context-sharing-texture2darray-texture3d-data-bug.html context-type-test-2.html --min-version 2.0.1 context-resize-changes-buffer-binding-bug.html diff --git a/tests/wpt/webgl/tests/conformance2/context/context-mode.html b/tests/wpt/webgl/tests/conformance2/context/context-mode.html new file mode 100644 index 000000000000..fa44ce4c877a --- /dev/null +++ b/tests/wpt/webgl/tests/conformance2/context/context-mode.html @@ -0,0 +1,79 @@ + + + + + + +WebGL2 Canvas Context Mode Conformance Tests + + + + + + + +
+
+ + + + + diff --git a/tests/wpt/webgl/tests/conformance2/rendering/canvas-resizing-with-pbo-bound.html b/tests/wpt/webgl/tests/conformance2/rendering/canvas-resizing-with-pbo-bound.html index bb303081fc8e..78f7f9da2226 100644 --- a/tests/wpt/webgl/tests/conformance2/rendering/canvas-resizing-with-pbo-bound.html +++ b/tests/wpt/webgl/tests/conformance2/rendering/canvas-resizing-with-pbo-bound.html @@ -78,6 +78,8 @@ if (!gl) { testFailed("context does not exist"); + + wtu.requestAnimFrame(nextTest); } else { testPassed("context exists"); diff --git a/tests/wpt/webgl/tests/js/tests/tex-image-and-sub-image-2d-with-webgl-canvas.js b/tests/wpt/webgl/tests/js/tests/tex-image-and-sub-image-2d-with-webgl-canvas.js index 61578ab040f1..8ade197c61c1 100644 --- a/tests/wpt/webgl/tests/js/tests/tex-image-and-sub-image-2d-with-webgl-canvas.js +++ b/tests/wpt/webgl/tests/js/tests/tex-image-and-sub-image-2d-with-webgl-canvas.js @@ -225,6 +225,11 @@ function generateTest(internalFormat, pixelFormat, pixelType, prologue, resource // Note: We use preserveDrawingBuffer:true to prevent canvas // visibility from interfering with the tests. var visibleCtx = wtu.create3DContext(null, { preserveDrawingBuffer:true }); + if (!visibleCtx) { + testFailed("context does not exist"); + finishTest(); + return; + } var visibleCanvas = visibleCtx.canvas; var descriptionNode = document.getElementById("description"); document.body.insertBefore(visibleCanvas, descriptionNode);