Implement most of the unsupported parameters in gl.getParameter()

Fixes #20536.
Fixes #20537.
Fixes #20538.
Fixes #20544.
Fixes #20545.
Fixes #20546.
Fixes #20548.
Fixes #20549.
Fixes #20551.

components/canvas/webgl_thread.rs

@@ -893,6 +893,19 @@ impl WebGLImpl {
                 }
                 sender.send(value[0] != 0).unwrap()
             }
+            WebGLCommand::GetParameterBool4(param, sender) => {
+                let mut value = [0; 4];
+                unsafe {
+                    ctx.gl().get_boolean_v(param as u32, &mut value);
+                }
+                let value = [
+                    value[0] != 0,
+                    value[1] != 0,
+                    value[2] != 0,
+                    value[3] != 0,
+                ];
+                sender.send(value).unwrap()
+            }
             WebGLCommand::GetParameterInt(param, sender) => {
                 let mut value = [0];
                 unsafe {
@@ -921,6 +934,13 @@ impl WebGLImpl {
                 }
                 sender.send(value).unwrap()
             }
+            WebGLCommand::GetParameterFloat4(param, sender) => {
+                let mut value = [0.; 4];
+                unsafe {
+                    ctx.gl().get_float_v(param as u32, &mut value);
+                }
+                sender.send(value).unwrap()
+            }
             WebGLCommand::GetProgramParameterBool(program, param, sender) => {
                 let mut value = [0];
                 unsafe {

components/canvas_traits/webgl.rs

@@ -272,10 +272,12 @@ pub enum WebGLCommand {
     DeleteVertexArray(WebGLVertexArrayId),
     BindVertexArray(Option<WebGLVertexArrayId>),
     GetParameterBool(ParameterBool, WebGLSender<bool>),
+    GetParameterBool4(ParameterBool4, WebGLSender<[bool; 4]>),
     GetParameterInt(ParameterInt, WebGLSender<i32>),
     GetParameterInt4(ParameterInt4, WebGLSender<[i32; 4]>),
     GetParameterFloat(ParameterFloat, WebGLSender<f32>),
     GetParameterFloat2(ParameterFloat2, WebGLSender<[f32; 2]>),
+    GetParameterFloat4(ParameterFloat4, WebGLSender<[f32; 4]>),
     GetProgramParameterBool(WebGLProgramId, ProgramParameterBool, WebGLSender<bool>),
     GetProgramParameterInt(WebGLProgramId, ProgramParameterInt, WebGLSender<i32>),
     GetShaderParameterBool(WebGLShaderId, ShaderParameterBool, WebGLSender<bool>),
@@ -535,10 +537,12 @@ impl fmt::Debug for WebGLCommand {
             DeleteVertexArray(..) => "DeleteVertexArray",
             BindVertexArray(..) => "BindVertexArray",
             GetParameterBool(..) => "GetParameterBool",
+            GetParameterBool4(..) => "GetParameterBool4",
             GetParameterInt(..) => "GetParameterInt",
             GetParameterInt4(..) => "GetParameterInt4",
             GetParameterFloat(..) => "GetParameterFloat",
             GetParameterFloat2(..) => "GetParameterFloat2",
+            GetParameterFloat4(..) => "GetParameterFloat4",
             GetProgramParameterBool(..) => "GetProgramParameterBool",
             GetProgramParameterInt(..) => "GetProgramParameterInt",
             GetShaderParameterBool(..) => "GetShaderParameterBool",
@@ -592,8 +596,12 @@ parameters! {
             Dither = gl::DITHER,
             PolygonOffsetFill = gl::POLYGON_OFFSET_FILL,
             SampleCoverageInvert = gl::SAMPLE_COVERAGE_INVERT,
+            ScissorTest = gl::SCISSOR_TEST,
             StencilTest = gl::STENCIL_TEST,
         }),
+        Bool4(ParameterBool4 {
+            ColorWritemask = gl::COLOR_WRITEMASK,
+        }),
         Int(ParameterInt {
             ActiveTexture = gl::ACTIVE_TEXTURE,
             AlphaBits = gl::ALPHA_BITS,
@@ -607,15 +615,20 @@ parameters! {
             CullFaceMode = gl::CULL_FACE_MODE,
             DepthBits = gl::DEPTH_BITS,
             DepthFunc = gl::DEPTH_FUNC,
+            FragmentShaderDerivativeHint = gl::FRAGMENT_SHADER_DERIVATIVE_HINT,
             FrontFace = gl::FRONT_FACE,
+            GenerateMipmapHint = gl::GENERATE_MIPMAP_HINT,
             GreenBits = gl::GREEN_BITS,
             MaxCombinedTextureImageUnits = gl::MAX_COMBINED_TEXTURE_IMAGE_UNITS,
             MaxCubeMapTextureSize = gl::MAX_CUBE_MAP_TEXTURE_SIZE,
+            MaxFragmentUniformVectors = gl::MAX_FRAGMENT_UNIFORM_VECTORS,
             MaxRenderbufferSize = gl::MAX_RENDERBUFFER_SIZE,
             MaxTextureImageUnits = gl::MAX_TEXTURE_IMAGE_UNITS,
             MaxTextureSize = gl::MAX_TEXTURE_SIZE,
+            MaxVaryingVectors = gl::MAX_VARYING_VECTORS,
             MaxVertexAttribs = gl::MAX_VERTEX_ATTRIBS,
             MaxVertexTextureImageUnits = gl::MAX_VERTEX_TEXTURE_IMAGE_UNITS,
+            MaxVertexUniformVectors = gl::MAX_VERTEX_UNIFORM_VECTORS,
             PackAlignment = gl::PACK_ALIGNMENT,
             RedBits = gl::RED_BITS,
             SampleBuffers = gl::SAMPLE_BUFFERS,
@@ -638,9 +651,9 @@ parameters! {
             StencilWritemask = gl::STENCIL_WRITEMASK,
             SubpixelBits = gl::SUBPIXEL_BITS,
             UnpackAlignment = gl::UNPACK_ALIGNMENT,
-            FragmentShaderDerivativeHint = gl::FRAGMENT_SHADER_DERIVATIVE_HINT,
         }),
         Int4(ParameterInt4 {
+            ScissorBox = gl::SCISSOR_BOX,
             Viewport = gl::VIEWPORT,
         }),
         Float(ParameterFloat {
@@ -653,6 +666,11 @@ parameters! {
         Float2(ParameterFloat2 {
             AliasedPointSizeRange = gl::ALIASED_POINT_SIZE_RANGE,
             AliasedLineWidthRange = gl::ALIASED_LINE_WIDTH_RANGE,
+            DepthRange = gl::DEPTH_RANGE,
+        }),
+        Float4(ParameterFloat4 {
+            BlendColor = gl::BLEND_COLOR,
+            ColorClearValue = gl::COLOR_CLEAR_VALUE,
         }),
     }
 }

components/script/dom/webglrenderingcontext.rs

@@ -1361,6 +1361,13 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
                 self.send_command(WebGLCommand::GetParameterBool(param, sender));
                 BooleanValue(receiver.recv().unwrap())
             }
+            Parameter::Bool4(param) => {
+                let (sender, receiver) = webgl_channel().unwrap();
+                self.send_command(WebGLCommand::GetParameterBool4(param, sender));
+                rooted!(in(cx) let mut rval = UndefinedValue());
+                receiver.recv().unwrap().to_jsval(cx, rval.handle_mut());
+                rval.get()
+            }
             Parameter::Int(param) => {
                 let (sender, receiver) = webgl_channel().unwrap();
                 self.send_command(WebGLCommand::GetParameterInt(param, sender));
@@ -1387,6 +1394,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
                 receiver.recv().unwrap().to_jsval(cx, rval.handle_mut());
                 rval.get()
             }
+            Parameter::Float4(param) => {
+                let (sender, receiver) = webgl_channel().unwrap();
+                self.send_command(WebGLCommand::GetParameterFloat4(param, sender));
+                // FIXME(nox): https://github.com/servo/servo/issues/20655
+                rooted!(in(cx) let mut rval = UndefinedValue());
+                receiver.recv().unwrap().to_jsval(cx, rval.handle_mut());
+                rval.get()
+            }
         }
     }
 

tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-uniform-packing-restrictions.html.ini

@@ -1,272 +0,0 @@
-[shader-uniform-packing-restrictions.html]
-  type: testharness
-  [WebGL test #2: [unexpected link status\] vertex shader with uniform array of bool with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #3: [unexpected link status\] vertex shader with uniform array of bool with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #4: [unexpected link status\] vertex shader with 1 uniforms of bool (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #8: [unexpected link status\] vertex shader with uniform array of float with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #9: [unexpected link status\] vertex shader with uniform array of float with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #10: [unexpected link status\] vertex shader with 1 uniforms of float (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #14: [unexpected link status\] vertex shader with uniform array of int with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #15: [unexpected link status\] vertex shader with uniform array of int with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #16: [unexpected link status\] vertex shader with 1 uniforms of int (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #20: [unexpected link status\] vertex shader with uniform array of vec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #21: [unexpected link status\] vertex shader with uniform array of vec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #22: [unexpected link status\] vertex shader with 1 uniforms of vec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #26: [unexpected link status\] vertex shader with uniform array of ivec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #27: [unexpected link status\] vertex shader with uniform array of ivec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #28: [unexpected link status\] vertex shader with 1 uniforms of ivec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #32: [unexpected link status\] vertex shader with uniform array of bvec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #33: [unexpected link status\] vertex shader with uniform array of bvec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #34: [unexpected link status\] vertex shader with 1 uniforms of bvec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #38: [unexpected link status\] vertex shader with uniform array of vec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #39: [unexpected link status\] vertex shader with uniform array of vec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #40: [unexpected link status\] vertex shader with 1 uniforms of vec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #44: [unexpected link status\] vertex shader with uniform array of ivec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #45: [unexpected link status\] vertex shader with uniform array of ivec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #46: [unexpected link status\] vertex shader with 1 uniforms of ivec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #50: [unexpected link status\] vertex shader with uniform array of bvec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #51: [unexpected link status\] vertex shader with uniform array of bvec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #52: [unexpected link status\] vertex shader with 1 uniforms of bvec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #56: [unexpected link status\] vertex shader with uniform array of vec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #57: [unexpected link status\] vertex shader with uniform array of vec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #58: [unexpected link status\] vertex shader with 1 uniforms of vec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #62: [unexpected link status\] vertex shader with uniform array of ivec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #63: [unexpected link status\] vertex shader with uniform array of ivec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #64: [unexpected link status\] vertex shader with 1 uniforms of ivec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #68: [unexpected link status\] vertex shader with uniform array of bvec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #69: [unexpected link status\] vertex shader with uniform array of bvec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #70: [unexpected link status\] vertex shader with 1 uniforms of bvec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #74: [unexpected link status\] vertex shader with uniform array of mat2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #75: [unexpected link status\] vertex shader with uniform array of mat2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #76: [unexpected link status\] vertex shader with 1 uniforms of mat2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #80: [unexpected link status\] vertex shader with uniform array of mat3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #81: [unexpected link status\] vertex shader with uniform array of mat3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #82: [unexpected link status\] vertex shader with 1 uniforms of mat3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #86: [unexpected link status\] vertex shader with uniform array of mat4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #87: [unexpected link status\] vertex shader with uniform array of mat4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #88: [unexpected link status\] vertex shader with 1 uniforms of mat4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #92: [unexpected link status\] fragment shader with uniform array of bool with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #93: [unexpected link status\] fragment shader with uniform array of bool with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #94: [unexpected link status\] fragment shader with 1 uniforms of bool (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #98: [unexpected link status\] fragment shader with uniform array of float with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #99: [unexpected link status\] fragment shader with uniform array of float with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #100: [unexpected link status\] fragment shader with 1 uniforms of float (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #104: [unexpected link status\] fragment shader with uniform array of int with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #105: [unexpected link status\] fragment shader with uniform array of int with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #106: [unexpected link status\] fragment shader with 1 uniforms of int (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #110: [unexpected link status\] fragment shader with uniform array of vec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #111: [unexpected link status\] fragment shader with uniform array of vec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #112: [unexpected link status\] fragment shader with 1 uniforms of vec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #116: [unexpected link status\] fragment shader with uniform array of ivec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #117: [unexpected link status\] fragment shader with uniform array of ivec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #118: [unexpected link status\] fragment shader with 1 uniforms of ivec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #122: [unexpected link status\] fragment shader with uniform array of bvec2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #123: [unexpected link status\] fragment shader with uniform array of bvec2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #124: [unexpected link status\] fragment shader with 1 uniforms of bvec2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #128: [unexpected link status\] fragment shader with uniform array of vec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #129: [unexpected link status\] fragment shader with uniform array of vec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #130: [unexpected link status\] fragment shader with 1 uniforms of vec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #134: [unexpected link status\] fragment shader with uniform array of ivec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #135: [unexpected link status\] fragment shader with uniform array of ivec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #136: [unexpected link status\] fragment shader with 1 uniforms of ivec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #140: [unexpected link status\] fragment shader with uniform array of bvec3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #141: [unexpected link status\] fragment shader with uniform array of bvec3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #142: [unexpected link status\] fragment shader with 1 uniforms of bvec3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #146: [unexpected link status\] fragment shader with uniform array of vec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #147: [unexpected link status\] fragment shader with uniform array of vec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #148: [unexpected link status\] fragment shader with 1 uniforms of vec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #152: [unexpected link status\] fragment shader with uniform array of ivec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #153: [unexpected link status\] fragment shader with uniform array of ivec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #154: [unexpected link status\] fragment shader with 1 uniforms of ivec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #158: [unexpected link status\] fragment shader with uniform array of bvec4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #159: [unexpected link status\] fragment shader with uniform array of bvec4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #160: [unexpected link status\] fragment shader with 1 uniforms of bvec4 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #164: [unexpected link status\] fragment shader with uniform array of mat2 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #165: [unexpected link status\] fragment shader with uniform array of mat2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #166: [unexpected link status\] fragment shader with 1 uniforms of mat2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #170: [unexpected link status\] fragment shader with uniform array of mat3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #171: [unexpected link status\] fragment shader with uniform array of mat3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #172: [unexpected link status\] fragment shader with 1 uniforms of mat3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #176: [unexpected link status\] fragment shader with uniform array of mat4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #177: [unexpected link status\] fragment shader with uniform array of mat4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #178: [unexpected link status\] fragment shader with 1 uniforms of mat4 (one past maximum) should fail]
-    expected: FAIL
-

tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-varying-packing-restrictions.html.ini

@@ -1,65 +1,40 @@
 [shader-varying-packing-restrictions.html]
-  type: testharness
+  [WebGL test #2: [unexpected link status\] shaders with varying array of float with 33 elements (one past maximum) accessing last element should fail]
-  [WebGL test #2: [unexpected link status\] shaders with varying array of float with 1 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
-  [WebGL test #3: [unexpected link status\] shaders with varying array of float with 1 elements (one past maximum) accessing first element should fail]
+  [WebGL test #3: [unexpected link status\] shaders with varying array of float with 33 elements (one past maximum) accessing first element should fail]
     expected: FAIL
 
-  [WebGL test #4: [unexpected link status\] shaders with 1 varyings of float (one past maximum) should fail]
+  [WebGL test #8: [unexpected link status\] shaders with varying array of vec2 with 33 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
-  [WebGL test #8: [unexpected link status\] shaders with varying array of vec2 with 1 elements (one past maximum) accessing last element should fail]
+  [WebGL test #9: [unexpected link status\] shaders with varying array of vec2 with 33 elements (one past maximum) accessing first element should fail]
     expected: FAIL
 
-  [WebGL test #9: [unexpected link status\] shaders with varying array of vec2 with 1 elements (one past maximum) accessing first element should fail]
+  [WebGL test #14: [unexpected link status\] shaders with varying array of vec3 with 33 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
-  [WebGL test #10: [unexpected link status\] shaders with 1 varyings of vec2 (one past maximum) should fail]
+  [WebGL test #15: [unexpected link status\] shaders with varying array of vec3 with 33 elements (one past maximum) accessing first element should fail]
     expected: FAIL
 
-  [WebGL test #14: [unexpected link status\] shaders with varying array of vec3 with 1 elements (one past maximum) accessing last element should fail]
+  [WebGL test #16: [unexpected link status\] shaders with 33 varyings of vec3 (one past maximum) should fail]
     expected: FAIL
 
-  [WebGL test #15: [unexpected link status\] shaders with varying array of vec3 with 1 elements (one past maximum) accessing first element should fail]
+  [WebGL test #26: [unexpected link status\] shaders with varying array of mat2 with 17 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
-  [WebGL test #16: [unexpected link status\] shaders with 1 varyings of vec3 (one past maximum) should fail]
+  [WebGL test #27: [unexpected link status\] shaders with varying array of mat2 with 17 elements (one past maximum) accessing first element should fail]
     expected: FAIL
 
-  [WebGL test #20: [unexpected link status\] shaders with varying array of vec4 with 1 elements (one past maximum) accessing last element should fail]
+  [WebGL test #28: [unexpected link status\] shaders with 17 varyings of mat2 (one past maximum) should fail]
     expected: FAIL
 
-  [WebGL test #21: [unexpected link status\] shaders with varying array of vec4 with 1 elements (one past maximum) accessing first element should fail]
+  [WebGL test #32: [unexpected link status\] shaders with varying array of mat3 with 11 elements (one past maximum) accessing last element should fail]
     expected: FAIL
 
-  [WebGL test #22: [unexpected link status\] shaders with 1 varyings of vec4 (one past maximum) should fail]
+  [WebGL test #33: [unexpected link status\] shaders with varying array of mat3 with 11 elements (one past maximum) accessing first element should fail]
     expected: FAIL
 
-  [WebGL test #26: [unexpected link status\] shaders with varying array of mat2 with 1 elements (one past maximum) accessing last element should fail]
+  [WebGL test #34: [unexpected link status\] shaders with 11 varyings of mat3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #27: [unexpected link status\] shaders with varying array of mat2 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #28: [unexpected link status\] shaders with 1 varyings of mat2 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #32: [unexpected link status\] shaders with varying array of mat3 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #33: [unexpected link status\] shaders with varying array of mat3 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #34: [unexpected link status\] shaders with 1 varyings of mat3 (one past maximum) should fail]
-    expected: FAIL
-
-  [WebGL test #38: [unexpected link status\] shaders with varying array of mat4 with 1 elements (one past maximum) accessing last element should fail]
-    expected: FAIL
-
-  [WebGL test #39: [unexpected link status\] shaders with varying array of mat4 with 1 elements (one past maximum) accessing first element should fail]
-    expected: FAIL
-
-  [WebGL test #40: [unexpected link status\] shaders with 1 varyings of mat4 (one past maximum) should fail]
     expected: FAIL
 

tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/variables/glsl-built-ins.html.ini

@@ -1,23 +1,16 @@
 [glsl-built-ins.html]
-  type: testharness
   [WebGL test #1: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
   [WebGL test #2: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
-  [WebGL test #3: gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS) >= 128]
-    expected: FAIL
-
   [WebGL test #4: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
   [WebGL test #5: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
-  [WebGL test #6: gl.getParameter(gl.MAX_VARYING_VECTORS) >= 8]
-    expected: FAIL
-
   [WebGL test #7: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
@@ -42,9 +35,6 @@
   [WebGL test #17: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
-  [WebGL test #18: gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS) >= 16]
-    expected: FAIL
-
   [WebGL test #19: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL