diff --git a/Cargo.lock b/Cargo.lock
index 498136047ee..006ed2c3f82 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -403,7 +403,7 @@ dependencies = [
"ipc-channel 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "offscreen_gl_context 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pixels 0.0.1",
"raqote 0.6.5-alpha.0 (git+https://github.com/jrmuizel/raqote)",
"serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2576,7 +2576,7 @@ dependencies = [
"msg 0.0.1",
"net 0.0.1",
"net_traits 0.0.1",
- "offscreen_gl_context 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "offscreen_gl_context 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)",
"profile 0.0.1",
"profile_traits 0.0.1",
"script 0.0.1",
@@ -3203,7 +3203,7 @@ dependencies = [
[[package]]
name = "offscreen_gl_context"
-version = "0.25.0"
+version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cgl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5657,7 +5657,7 @@ dependencies = [
[[package]]
name = "webxr"
version = "0.0.1"
-source = "git+https://github.com/servo/webxr#319b63bd3b4ef1b224b75433ee1c5ecdd28f12a1"
+source = "git+https://github.com/servo/webxr#bf4e5a541bb2fcbace61cb1a071959bab10d9c19"
dependencies = [
"bindgen 0.49.2 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5675,7 +5675,7 @@ dependencies = [
[[package]]
name = "webxr-api"
version = "0.0.1"
-source = "git+https://github.com/servo/webxr#319b63bd3b4ef1b224b75433ee1c5ecdd28f12a1"
+source = "git+https://github.com/servo/webxr#bf4e5a541bb2fcbace61cb1a071959bab10d9c19"
dependencies = [
"euclid 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6137,7 +6137,7 @@ dependencies = [
"checksum objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "31d20fd2b37e07cf5125be68357b588672e8cefe9a96f8c17a9d46053b3e590d"
"checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
"checksum objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4730aa1c64d722db45f7ccc4113a3e2c465d018de6db4d3e7dfe031e8c8a297"
-"checksum offscreen_gl_context 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b3a6c4bb6b3da8b14a280a742ef6b73046b4ad84799e68ebff2fd935e8185edf"
+"checksum offscreen_gl_context 0.25.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8f4df25a3f141e0f7c6e52d4e142879d5cea9b4f7ff2f975d0b9bbac8c60f46b"
"checksum opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51ecbcb821e1bd256d456fe858aaa7f380b63863eab2eb86eee1bd9f33dd6682"
"checksum openssl 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6c24d3508b4fb6da175c10baac54c578b33f09c89ae90c6fe9788b3b4768efdc"
"checksum openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)" = "912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129"
diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json
index a3731db597b..831dbd8c340 100644
--- a/tests/wpt/webgl/meta/MANIFEST.json
+++ b/tests/wpt/webgl/meta/MANIFEST.json
@@ -14690,7 +14690,9 @@
"conformance/rendering/multisample-corruption.html": [
[
"conformance/rendering/multisample-corruption.html",
- {}
+ {
+ "timeout": "long"
+ }
]
],
"conformance/rendering/negative-one-index.html": [
@@ -15452,7 +15454,9 @@
"conformance/textures/misc/tex-video-using-tex-unit-non-zero.html": [
[
"conformance/textures/misc/tex-video-using-tex-unit-non-zero.html",
- {}
+ {
+ "timeout": "long"
+ }
]
],
"conformance/textures/misc/texparameter-test.html": [
@@ -36719,7 +36723,7 @@
"testharness"
],
"conformance/rendering/multisample-corruption.html": [
- "7de9b47f229ac935cdb76b14e6237243ae14ce04",
+ "db9fb69975dfb1acd5e490c756e7221f8d176cb1",
"testharness"
],
"conformance/rendering/negative-one-index.html": [
@@ -37279,7 +37283,7 @@
"testharness"
],
"conformance/textures/misc/tex-video-using-tex-unit-non-zero.html": [
- "9abe3bd71772133857507f18a5a6fcfc95b080da",
+ "288260b019d12a753c0677f5747746545867e5e7",
"testharness"
],
"conformance/textures/misc/texparameter-test.html": [
diff --git a/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini b/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini
new file mode 100644
index 00000000000..d926d27cf37
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/context/context-creation.html.ini
@@ -0,0 +1,2 @@
+[context-creation.html]
+ expected: TIMEOUT
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 5494eb69348..361c95a0427 100644
--- a/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
+++ b/tests/wpt/webgl/meta/conformance/context/premultiplyalpha-test.html.ini
@@ -72,3 +72,21 @@
[WebGL test #12: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL
+ [WebGL test #27: should draw with 64,128,255,128\nat (0, 0) expected: 64,128,255,128 was 0,0,0,255]
+ expected: FAIL
+
+ [WebGL test #20: should draw with 64,128,255,128\nat (0, 0) expected: 64,128,255,128 was 0,0,0,255]
+ expected: FAIL
+
+ [WebGL test #6: should draw with 64,128,255,128\nat (0, 0) expected: 64,128,255,128 was 32,64,128,128]
+ expected: FAIL
+
+ [WebGL test #13: should draw with 64,128,255,128\nat (0, 0) expected: 64,128,255,128 was 32,64,128,128]
+ expected: FAIL
+
+ [WebGL test #48: should draw with 255,192,128,1\nat (0, 0) expected: 255,192,128,1 was 0,0,0,255]
+ expected: FAIL
+
+ [WebGL test #55: should draw with 255,192,128,1\nat (0, 0) expected: 255,192,128,1 was 0,0,0,255]
+ expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini b/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini
new file mode 100644
index 00000000000..67737132496
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/glsl/bugs/complex-glsl-does-not-crash.html.ini
@@ -0,0 +1,5 @@
+[complex-glsl-does-not-crash.html]
+ expected: TIMEOUT
+ [Overall test]
+ expected: NOTRUN
+
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 a9db337a983..2d68d489d35 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/multisample-corruption.html.ini
@@ -1,5 +1,6 @@
[multisample-corruption.html]
bug: https://github.com/servo/servo/issues/21132
+ expected: [OK, TIMEOUT]
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
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 9b47471145c..34ba40a7d3f 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,8 +1,12 @@
[tex-video-using-tex-unit-non-zero.html]
bug: https://github.com/servo/servo/issues/21132
+ expected: TIMEOUT
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL
[WebGL test #1: context does not exist]
expected: FAIL
+ [Overall test]
+ expected: NOTRUN
+
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 12cb8560a34..648a62b052b 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,5 +1,6 @@
[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
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 8f783ef6cd4..bcc4b6d39de 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,8 +1,45 @@
[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
+ [WebGL test #19: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ 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 3740984c243..92891b95b3a 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,8 +1,45 @@
[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
+ [WebGL test #19: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,255,255\nat (0, 0) expected: 255,255,255 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,255,255\nat (0, 16) expected: 255,255,255 was 0,0,0]
+ 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 165188da97a..48a01f62d1f 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,8 +1,81 @@
[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
+ [WebGL test #14: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #19: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #6: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #12: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #20: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #16: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #8: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #22: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #2: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #18: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #24: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #10: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #4: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ 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 3a190189844..5950b95f794 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,8 +1,81 @@
[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
+ [WebGL test #14: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #19: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #6: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #12: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #20: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #16: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #8: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #22: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #2: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #18: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #24: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #10: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #4: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ 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 6ce29315c67..8c91bdbd790 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,8 +1,81 @@
[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
+ [WebGL test #14: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #19: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #6: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #12: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #20: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #16: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #8: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #22: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #2: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #18: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #24: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #10: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #4: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ 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 7e33894a200..49c1d39352e 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,8 +1,81 @@
[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
+ [WebGL test #14: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #19: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #6: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #12: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #20: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #16: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #8: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #22: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #2: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #18: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #24: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #10: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #4: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ 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 40496fcde9c..0b1ca0c6ca2 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,8 +1,81 @@
[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
+ [WebGL test #14: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #19: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #6: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #9: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #12: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #20: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #17: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #16: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #7: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #8: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #11: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #22: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #23: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #2: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #18: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #5: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #24: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #1: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #10: shouldBe 0,255,0\nat (0, 16) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #3: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #15: shouldBe 255,0,0\nat (0, 16) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #4: shouldBe 0,255,0\nat (0, 0) expected: 0,255,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #13: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
+ [WebGL test #21: shouldBe 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
+ expected: FAIL
+
diff --git a/tests/wpt/webgl/meta/conformance2/attribs/gl-vertex-attrib-i-render.html.ini b/tests/wpt/webgl/meta/conformance2/attribs/gl-vertex-attrib-i-render.html.ini
index a79c293f5e9..ed32e705993 100644
--- a/tests/wpt/webgl/meta/conformance2/attribs/gl-vertex-attrib-i-render.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/attribs/gl-vertex-attrib-i-render.html.ini
@@ -1,7 +1,11 @@
[gl-vertex-attrib-i-render.html]
+ expected: ERROR
[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
expected: FAIL
[WebGL test #1: could not create context]
expected: FAIL
+ [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+ 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 dddb52a9724..0e7c48f1481 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
@@ -29,3 +29,51 @@
[WebGL test #14: Pixel unpack buffer binding was lost]
expected: FAIL
+ [WebGL test #12: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #11: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #43: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #42: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #30: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #5: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #48: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #36: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #24: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #17: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #18: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #37: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #6: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #49: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
+ [WebGL test #23: getError expected: NO_ERROR. Was INVALID_ENUM : No GL error]
+ expected: FAIL
+
+ [WebGL test #31: Pixel unpack buffer binding was lost]
+ expected: FAIL
+
diff --git a/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html b/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html
index 7de9b47f229..db9fb69975d 100644
--- a/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html
+++ b/tests/wpt/webgl/tests/conformance/rendering/multisample-corruption.html
@@ -29,6 +29,7 @@
+
WebGL Multisample Renderbuffer Corruption Test
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 9abe3bd7177..288260b019d 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
@@ -29,6 +29,7 @@
+
Texture uploading from video through tex unit 1 bug