Properly support gl_PointSize and gl_PointCoord

Fixes #21719.
Fixes #20993.
Fixes #20992.
Fixes #21007.
Fixes #20979.

5 files changed, 8 insertions, 202 deletions

diff --git a/tests/wpt/webgl/meta/MANIFEST.json b/tests/wpt/webgl/meta/MANIFEST.json
index c1b1f57adf1..0b5fc056370 100644
--- a/tests/wpt/webgl/meta/MANIFEST.json
+++ b/tests/wpt/webgl/meta/MANIFEST.json
@@ -15637,9 +15637,7 @@
    "conformance/uniforms/out-of-bounds-uniform-array-access.html": [
     [
      "/_webgl/conformance/uniforms/out-of-bounds-uniform-array-access.html",
-     {
-      "timeout": "long"
-     }
+     {}
     ]
    ],
    "conformance/uniforms/uniform-default-values.html": [
@@ -37324,7 +37322,7 @@
    "testharness"
   ],
   "conformance/uniforms/out-of-bounds-uniform-array-access.html": [
-   "a096b5ac7f771ab9b4aa1e5f046de301d22d9c93",
+   "6963b053b79d9e45507f6af10ab50a21240723b0",
    "testharness"
   ],
   "conformance/uniforms/uniform-default-values.html": [
diff --git a/tests/wpt/webgl/meta/conformance/glsl/variables/gl-pointcoord.html.ini b/tests/wpt/webgl/meta/conformance/glsl/variables/gl-pointcoord.html.ini
deleted file mode 100644
index aa794bc8d38..00000000000
--- a/tests/wpt/webgl/meta/conformance/glsl/variables/gl-pointcoord.html.ini
+++ /dev/null
@@ -1,194 +0,0 @@
-[gl-pointcoord.html]
-  bug: https://github.com/servo/servo/issues/21719
-  [WebGL test #48: pixel 48,192 should be 65,125,0\nat (48, 192) expected: 65,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #67: pixel 160,208 should be 1,61,0\nat (160, 208) expected: 1,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #15: pixel 32,64 should be 1,125,0\nat (32, 64) expected: 1,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #45: pixel 64,176 should be 129,189,0\nat (64, 176) expected: 129,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #18: pixel 80,64 should be 193,125,0\nat (80, 64) expected: 193,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #47: pixel 32,192 should be 1,125,0\nat (32, 192) expected: 1,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #42: pixel 80,160 should be 193,253,0\nat (80, 160) expected: 193,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #34: pixel 208,64 should be 193,125,0\nat (208, 64) expected: 193,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #53: pixel 64,208 should be 129,61,0\nat (64, 208) expected: 129,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #29: pixel 192,48 should be 129,189,0\nat (192, 48) expected: 129,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #40: pixel 48,160 should be 65,253,0\nat (48, 160) expected: 65,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #59: pixel 160,176 should be 1,189,0\nat (160, 176) expected: 1,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #26: pixel 208,32 should be 193,253,0\nat (208, 32) expected: 193,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #62: pixel 208,176 should be 193,189,0\nat (208, 176) expected: 193,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #8: pixel 48,32 should be 65,253,0\nat (48, 32) expected: 65,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #31: pixel 160,64 should be 1,125,0\nat (160, 64) expected: 1,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #65: pixel 192,192 should be 129,125,0\nat (192, 192) expected: 129,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #55: pixel 160,160 should be 1,253,0\nat (160, 160) expected: 1,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #10: pixel 80,32 should be 193,253,0\nat (80, 32) expected: 193,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #11: pixel 32,48 should be 1,189,0\nat (32, 48) expected: 1,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #50: pixel 80,192 should be 193,125,0\nat (80, 192) expected: 193,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #51: pixel 32,208 should be 1,61,0\nat (32, 208) expected: 1,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #21: pixel 64,80 should be 129,61,0\nat (64, 80) expected: 129,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #54: pixel 80,208 should be 193,61,0\nat (80, 208) expected: 193,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #33: pixel 192,64 should be 129,125,0\nat (192, 64) expected: 129,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #17: pixel 64,64 should be 129,125,0\nat (64, 64) expected: 129,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #38: pixel 208,80 should be 193,61,0\nat (208, 80) expected: 193,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #49: pixel 64,192 should be 129,125,0\nat (64, 192) expected: 129,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #7: pixel 32,32 should be 1,253,0\nat (32, 32) expected: 1,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #13: pixel 64,48 should be 129,189,0\nat (64, 48) expected: 129,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #46: pixel 80,176 should be 193,189,0\nat (80, 176) expected: 193,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #9: pixel 64,32 should be 129,253,0\nat (64, 32) expected: 129,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #28: pixel 176,48 should be 65,189,0\nat (176, 48) expected: 65,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #25: pixel 192,32 should be 129,253,0\nat (192, 32) expected: 129,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #20: pixel 48,80 should be 65,61,0\nat (48, 80) expected: 65,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #57: pixel 192,160 should be 129,253,0\nat (192, 160) expected: 129,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #30: pixel 208,48 should be 193,189,0\nat (208, 48) expected: 193,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #36: pixel 176,80 should be 65,61,0\nat (176, 80) expected: 65,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #37: pixel 192,80 should be 129,61,0\nat (192, 80) expected: 129,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #52: pixel 48,208 should be 65,61,0\nat (48, 208) expected: 65,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #23: pixel 160,32 should be 1,253,0\nat (160, 32) expected: 1,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #16: pixel 48,64 should be 65,125,0\nat (48, 64) expected: 65,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #32: pixel 176,64 should be 65,125,0\nat (176, 64) expected: 65,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #24: pixel 176,32 should be 65,253,0\nat (176, 32) expected: 65,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #60: pixel 176,176 should be 65,189,0\nat (176, 176) expected: 65,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #43: pixel 32,176 should be 1,189,0\nat (32, 176) expected: 1,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #63: pixel 160,192 should be 1,125,0\nat (160, 192) expected: 1,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #64: pixel 176,192 should be 65,125,0\nat (176, 192) expected: 65,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #44: pixel 48,176 should be 65,189,0\nat (48, 176) expected: 65,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #56: pixel 176,160 should be 65,253,0\nat (176, 160) expected: 65,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #19: pixel 32,80 should be 1,61,0\nat (32, 80) expected: 1,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #35: pixel 160,80 should be 1,61,0\nat (160, 80) expected: 1,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #70: pixel 208,208 should be 193,61,0\nat (208, 208) expected: 193,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #58: pixel 208,160 should be 193,253,0\nat (208, 160) expected: 193,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #68: pixel 176,208 should be 65,61,0\nat (176, 208) expected: 65,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #22: pixel 80,80 should be 193,61,0\nat (80, 80) expected: 193,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #66: pixel 208,192 should be 193,125,0\nat (208, 192) expected: 193,125,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #69: pixel 192,208 should be 129,61,0\nat (192, 208) expected: 129,61,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #39: pixel 32,160 should be 1,253,0\nat (32, 160) expected: 1,253,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #14: pixel 80,48 should be 193,189,0\nat (80, 48) expected: 193,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #12: pixel 48,48 should be 65,189,0\nat (48, 48) expected: 65,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #61: pixel 192,176 should be 129,189,0\nat (192, 176) expected: 129,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #27: pixel 160,48 should be 1,189,0\nat (160, 48) expected: 1,189,0 was 0,0,0]
-    expected: FAIL
-
-  [WebGL test #41: pixel 64,160 should be 129,253,0\nat (64, 160) expected: 129,253,0 was 0,0,0]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/rendering/point-size.html.ini b/tests/wpt/webgl/meta/conformance/rendering/point-size.html.ini
index 08ac9e564ff..92979f6e32c 100644
--- a/tests/wpt/webgl/meta/conformance/rendering/point-size.html.ini
+++ b/tests/wpt/webgl/meta/conformance/rendering/point-size.html.ini
@@ -1,4 +1,5 @@
 [point-size.html]
+  bug: https://github.com/servo/servo/issues/21981
   [WebGL test #9: should be 255,0,0\nat (0, 0) expected: 255,0,0 was 0,0,0]
     expected: FAIL
 
diff --git a/tests/wpt/webgl/meta/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini b/tests/wpt/webgl/meta/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini
deleted file mode 100644
index f37a16c994a..00000000000
--- a/tests/wpt/webgl/meta/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[point-with-gl-pointcoord-in-fragment-shader.html]
-  [WebGL test #0: Center pixel should be green\nat (32, 32) expected: 0,255,0,255 was 0,0,0,255]
-    expected: FAIL
-
diff --git a/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini b/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
new file mode 100644
index 00000000000..eced269a4fe
--- /dev/null
+++ b/tests/wpt/webgl/meta/conformance/uniforms/out-of-bounds-uniform-array-access.html.ini
@@ -0,0 +1,5 @@
+[out-of-bounds-uniform-array-access.html]
+  expected: TIMEOUT
+  [Overall test]
+    expected: NOTRUN
+