Add configuration for webgl2 tests and update test expectations

components/script/dom/webgl2renderingcontext.rs

@@ -909,6 +909,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
 impl LayoutCanvasWebGLRenderingContextHelpers for LayoutDom<WebGL2RenderingContext> {
     #[allow(unsafe_code)]
     unsafe fn canvas_data_source(&self) -> HTMLCanvasDataSource {
-        HTMLCanvasDataSource::WebGL((*self.unsafe_get()).base.layout_handle())
+        let this = &*self.unsafe_get();
+        HTMLCanvasDataSource::WebGL((*this.base.to_layout().unsafe_get()).layout_handle())
     }
 }

resources/prefs.json

@@ -16,7 +16,7 @@
   "dom.testable_crash.enabled": false,
   "dom.testbinding.enabled": false,
   "dom.webgl.dom_to_texture.enabled": false,
-  "dom.webgl2.enabled.enabled": false,
+  "dom.webgl2.enabled": false,
   "dom.webvr.enabled": false,
   "dom.webvr.event_polling_interval": 500,
   "js.asmjs.enabled": true,

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance/__dir__.ini

@@ -0,0 +1 @@
+disabled: for now

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/__dir__.ini

@@ -0,0 +1,2 @@
+prefs: ["dom.webgl2.enabled:true"]
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/attribs/gl-vertex-attrib-i-render.html.ini

@@ -0,0 +1,7 @@
+[gl-vertex-attrib-i-render.html]
+  [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
+    expected: FAIL
+
+  [WebGL test #1: could not create context]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/attribs/gl-vertex-attrib.html.ini

@@ -0,0 +1,41 @@
+[gl-vertex-attrib.html]
+  expected: ERROR
+  [WebGL test #1: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #6: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #11: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #16: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #21: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #26: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #31: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #36: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #41: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #46: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #51: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #56: gl.getVertexAttrib(0, gl.CURRENT_VERTEX_ATTRIB) is not an instance of Float32Array]
+    expected: FAIL
+
+  [WebGL test #61: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/attribs/gl-vertexattribipointer-offsets.html.ini

@@ -0,0 +1,5 @@
+[gl-vertexattribipointer-offsets.html]
+  expected: ERROR
+  [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/attribs/gl-vertexattribipointer.html.ini

@@ -0,0 +1,5 @@
+[gl-vertexattribipointer.html]
+  expected: ERROR
+  [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/bound-buffer-size-change-test.html.ini

@@ -0,0 +1,5 @@
+[bound-buffer-size-change-test.html]
+  expected: ERROR
+  [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/buffer-copying-contents.html.ini

@@ -0,0 +1,5 @@
+[buffer-copying-contents.html]
+  expected: ERROR
+  [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/buffer-copying-restrictions.html.ini

@@ -0,0 +1,5 @@
+[buffer-copying-restrictions.html]
+  expected: ERROR
+  [Overall test]
+    expected: NOTRUN
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/buffer-data-and-buffer-sub-data-sub-source.html.ini

@@ -0,0 +1,14 @@
+[buffer-data-and-buffer-sub-data-sub-source.html]
+  expected: ERROR
+  [WebGL test #3: getError expected: INVALID_VALUE. Was NO_ERROR : calling bufferData when srcOffset + length is larger than source size]
+    expected: FAIL
+
+  [WebGL test #4: getError expected: INVALID_VALUE. Was NO_ERROR : calling bufferData when srcOffset + length is larger than source size]
+    expected: FAIL
+
+  [WebGL test #5: getError expected: INVALID_VALUE. Was NO_ERROR : calling bufferData when srcOffset + length is larger than source size]
+    expected: FAIL
+
+  [WebGL test #7: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/buffer-overflow-test.html.ini

@@ -0,0 +1,5 @@
+[buffer-overflow-test.html]
+  expected: ERROR
+  [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/buffer-type-restrictions.html.ini

@@ -0,0 +1,5 @@
+[buffer-type-restrictions.html]
+  expected: ERROR
+  [Overall test]
+    expected: NOTRUN
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/get-buffer-sub-data.html.ini

@@ -0,0 +1,38 @@
+[get-buffer-sub-data.html]
+  expected: ERROR
+  [Overall test]
+    expected: NOTRUN
+
+  [WebGL test #2: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #7: The returned array buffer fails to match original data]
+    expected: FAIL
+
+  [WebGL test #8: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, 2) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #10: areArraysEqual(retArray.slice(2), floatArray.slice(0, floatArray.length - 2)) should be true. Was false.]
+    expected: FAIL
+
+  [WebGL test #11: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, retArray.length) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #13: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, retArray.length + 1) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #14: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, 2, 2) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #16: areArraysEqual(retArray.slice(2, 4), floatArray.slice(0, 2)) should be true. Was false.]
+    expected: FAIL
+
+  [WebGL test #18: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, retArray.length - 1, 1) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+
+  [WebGL test #20: areArraysEqual(retArray.slice(8), floatArray.slice(0, 1)) should be true. Was false.]
+    expected: FAIL
+
+  [WebGL test #21: gl.getBufferSubData(gl.ARRAY_BUFFER, 0, retArray, retArray.length - 1, 2) threw exception TypeError: gl.getBufferSubData is not a function]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/one-large-uniform-buffer.html.ini

@@ -0,0 +1,4 @@
+[one-large-uniform-buffer.html]
+  [WebGL test #1: Failed to set up the program]
+    expected: FAIL
+

tests/wpt/mozilla/meta/webgl/conformance-2.0.0/conformance2/buffers/uniform-buffers.html.ini

@@ -0,0 +1,32 @@
+[uniform-buffers.html]
+  expected: ERROR
+  [WebGL test #2: getError expected: NO_ERROR. Was INVALID_ENUM : UNIFORM_BUFFER_BINDING query should succeed]
+    expected: FAIL
+
+  [WebGL test #6: getError expected: NO_ERROR. Was INVALID_ENUM : should be able to bind uniform buffer]
+    expected: FAIL
+
+  [WebGL test #7: gl.getParameter(gl.UNIFORM_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
+    expected: FAIL
+
+  [WebGL test #8: getError expected: NO_ERROR. Was INVALID_ENUM : should be able to update uniform buffer binding]
+    expected: FAIL
+
+  [WebGL test #9: gl.getParameter(gl.UNIFORM_BUFFER_BINDING) should be [object WebGLBuffer\]. Was null.]
+    expected: FAIL
+
+  [WebGL test #10: getError expected: NO_ERROR. Was INVALID_ENUM : should be able to unbind uniform buffer]
+    expected: FAIL
+
+  [WebGL test #12: getError expected: INVALID_OPERATION. Was INVALID_ENUM : binding a deleted buffer should generate INVALID_OPERATION]
+    expected: FAIL
+
+  [WebGL test #15: Could not compile shader with uniform blocks without error]
+    expected: FAIL
+
+  [WebGL test #16: Could not compile shader with named uniform blocks without error]
+    expected: FAIL
+
+  [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
+    expected: FAIL
+