From 9a8784c04d2e0691fcda24d99fd557c35f67e31f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Jan 2017 17:31:22 -0800 Subject: [PATCH 1/5] webgl: Remove some expected-fails for gl-vertex-attrib-zero-issues.html. These expecteds were added in a07d6b37cc9baf0896e4a6721da535fbcea4a186 with the addition of disableVertexAttribArray(), but they haven't been happening in my test runs. --- .../gl-vertex-attrib-zero-issues.html.ini | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini index 940ca3b5e98a..b5291d6078bd 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini @@ -1,33 +1,3 @@ [gl-vertex-attrib-zero-issues.html] type: testharness expected: TIMEOUT - [WebGL test #5: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #7: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #11: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #13: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #17: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #19: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #23: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #25: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #29: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - - [WebGL test #31: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] - expected: FAIL - From 190e56c7c788ca2c7639fbaf7ff30aba4a1a8635 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Jan 2017 17:36:00 -0800 Subject: [PATCH 2/5] webgl: Drop some expected parsing failures. I believe these were fixed with the getParameter(GL_FRAMEBUFFER_BINDING) support. --- .../buffers/element-array-buffer-delete-recreate.html.ini | 3 --- .../conformance/rendering/gl-scissor-test.html.ini | 3 --- .../conformance/rendering/gl-viewport-test.html.ini | 3 --- .../conformance/textures/texture-fakeblack.html.ini | 3 --- .../textures/texture-sub-image-cube-maps.html.ini | 6 ------ 5 files changed, 18 deletions(-) diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini index 1b6e72c7a6ee..611bba421bcb 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/element-array-buffer-delete-recreate.html.ini @@ -3,9 +3,6 @@ [WebGL test #0: getError expected: NO_ERROR. Was INVALID_ENUM : no errors from draw] expected: FAIL - [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #1: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini index ca111c4b26f7..b8656e553da2 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-test.html.ini @@ -1,8 +1,5 @@ [gl-scissor-test.html] type: testharness - [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #50: at (0, 0) expected: 0,255,0,255 was 0,0,0,0] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini index 233a86900b83..10d88950ce04 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-viewport-test.html.ini @@ -1,8 +1,5 @@ [gl-viewport-test.html] type: testharness - [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #1: at (16, 32) expected: 0,0,255,255 was 0,0,0,0] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini index 977f4e4481f5..e3213f8a1f9c 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini @@ -1,8 +1,5 @@ [texture-fakeblack.html] type: testharness - [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #1: at (0, 0) expected: 0,0,0,255 was 255,0,0,255] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini index d7ebca198b2c..4f8e34db0529 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini @@ -1,14 +1,8 @@ [texture-sub-image-cube-maps.html] type: testharness - [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #0: unexpected gl error: INVALID_VALUE] expected: FAIL - [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #1: at (0, 0) expected: 255,0,0,255 was 0,0,0,0] expected: FAIL From 1b84e633ff959914e19e503cb5a4a8cc80388d5d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Jan 2017 17:42:02 -0800 Subject: [PATCH 3/5] webgl: Drop more expected parsing failures from missing FBO support. At least, it looks to me like that's what these were from -- they're in about the right places to be from us previously missing checkFramebufferStatus(). --- .../conformance/textures/copy-tex-image-2d-formats.html.ini | 3 --- .../textures/texture-copying-feedback-loops.html.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini index 46c6fe813904..0d115512ec1e 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini @@ -1,8 +1,5 @@ [copy-tex-image-2d-formats.html] type: testharness - [WebGL test #16: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #16: Creating framebuffer from ALPHA texture succeeded even though it is not a renderable format] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini index d6cc3560606f..541316f22976 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini @@ -1,8 +1,5 @@ [texture-copying-feedback-loops.html] type: testharness - [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).] - expected: FAIL - [WebGL test #3: getError expected: INVALID_OPERATION. Was NO_ERROR : after copyTexImage2D to same texture same level, invalid feedback loop] expected: FAIL From b5fa219f5a75737779b1e85cc669618c97059a1a Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Jan 2017 18:03:04 -0800 Subject: [PATCH 4/5] webgl: Drop expecteds for more calls to now-implemented functions. --- .../misc/bad-arguments-test.html.ini | 36 ------------------- .../misc/functions-returning-strings.html.ini | 6 ---- 2 files changed, 42 deletions(-) diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/bad-arguments-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/bad-arguments-test.html.ini index 814488f2b9ac..9caac9fee7c8 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/bad-arguments-test.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/bad-arguments-test.html.ini @@ -1,47 +1,11 @@ [bad-arguments-test.html] type: testharness - [WebGL test #59: context.detachShader(program, argument) should be undefined. Threw exception TypeError: context.detachShader is not a function] - expected: FAIL - - [WebGL test #60: context.detachShader(argument, shader) should be undefined. Threw exception TypeError: context.detachShader is not a function] - expected: FAIL - - [WebGL test #70: context.uniform2fv(argument, new Float32Array([0.0, 0.0\])) should be undefined. Threw exception TypeError: context.uniform2fv is not a function] - expected: FAIL - - [WebGL test #71: context.uniform2iv(argument, new Int32Array([0, 0\])) should be undefined. Threw exception TypeError: context.uniform2iv is not a function] - expected: FAIL - - [WebGL test #72: context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0\])) should be undefined. Threw exception TypeError: context.uniformMatrix2fv is not a function] - expected: FAIL - - [WebGL test #73: context.getProgramInfoLog(argument) should be null. Threw exception TypeError: context.getProgramInfoLog is not a function] - expected: FAIL - [WebGL test #78: context.getUniform(argument, loc) should be null. Threw exception TypeError: context.getUniform is not a function] expected: FAIL [WebGL test #79: context.getUniform(program, argument) should be null. Threw exception TypeError: context.getUniform is not a function] expected: FAIL - [WebGL test #85: context.detachShader(program, argument) should be undefined. Threw exception TypeError: context.detachShader is not a function] - expected: FAIL - - [WebGL test #86: context.detachShader(argument, shader) should be undefined. Threw exception TypeError: context.detachShader is not a function] - expected: FAIL - - [WebGL test #96: context.uniform2fv(argument, new Float32Array([0.0, 0.0\])) should be undefined. Threw exception TypeError: context.uniform2fv is not a function] - expected: FAIL - - [WebGL test #97: context.uniform2iv(argument, new Int32Array([0, 0\])) should be undefined. Threw exception TypeError: context.uniform2iv is not a function] - expected: FAIL - - [WebGL test #98: context.uniformMatrix2fv(argument, false, new Float32Array([0.0, 0.0, 0.0, 0.0\])) should be undefined. Threw exception TypeError: context.uniformMatrix2fv is not a function] - expected: FAIL - - [WebGL test #99: context.getProgramInfoLog(argument) should be null. Threw exception TypeError: context.getProgramInfoLog is not a function] - expected: FAIL - [WebGL test #104: context.getUniform(argument, loc) should be null. Threw exception TypeError: context.getUniform is not a function] expected: FAIL diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/functions-returning-strings.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/functions-returning-strings.html.ini index 420e20ce5ab9..a3228d706a47 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/functions-returning-strings.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/functions-returning-strings.html.ini @@ -12,9 +12,3 @@ [WebGL test #5: gl.getShaderInfoLog(fs) should return a string. Returns: "null"] expected: FAIL - [WebGL test #8: gl.getProgramInfoLog(prog) should return a string. Threw exception TypeError: gl.getProgramInfoLog is not a function] - expected: FAIL - - [WebGL test #9: gl.getProgramInfoLog(prog) should return a string. Threw exception TypeError: gl.getProgramInfoLog is not a function] - expected: FAIL - From d020638ae4de7806db3f9e40bee3ee685815cbec Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 5 Jan 2017 18:05:35 -0800 Subject: [PATCH 5/5] webgl: Update expecteds for webgl-specific.html This one is a combination of the new stencil* function support, and the depthRange() validation I had added. --- .../conformance/misc/webgl-specific.html.ini | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini index d10c4d73ba3b..6b9166e8cf29 100644 --- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini +++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/webgl-specific.html.ini @@ -48,42 +48,15 @@ [WebGL test #16: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.blendFuncSeparate(gl.ONE_MINUS_CONSTANT_ALPHA, gl.ONE_MINUS_CONSTANT_COLOR, gl.ONE, gl.ZERO)] expected: FAIL - [WebGL test #17: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.depthRange(20, 10)] - expected: FAIL - - [WebGL test #18: gl.stencilMask(255) threw exception TypeError: gl.stencilMask is not a function] - expected: FAIL - - [WebGL test #20: gl.stencilMaskSeparate(gl.FRONT, 1) threw exception TypeError: gl.stencilMaskSeparate is not a function] - expected: FAIL - [WebGL test #21: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)] expected: FAIL - [WebGL test #22: gl.stencilMaskSeparate(gl.BACK, 1) threw exception TypeError: gl.stencilMaskSeparate is not a function] - expected: FAIL - - [WebGL test #24: gl.stencilFunc(gl.ALWAYS, 0, 255) threw exception TypeError: gl.stencilFunc is not a function] - expected: FAIL - - [WebGL test #26: gl.stencilFuncSeparate(gl.BACK, gl.ALWAYS, 1, 255) threw exception TypeError: gl.stencilFuncSeparate is not a function] - expected: FAIL - [WebGL test #27: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)] expected: FAIL - [WebGL test #28: gl.stencilFuncSeparate(gl.FRONT, gl.ALWAYS, 1, 255) threw exception TypeError: gl.stencilFuncSeparate is not a function] - expected: FAIL - - [WebGL test #30: gl.stencilFuncSeparate(gl.BACK, gl.ALWAYS, 1, 1) threw exception TypeError: gl.stencilFuncSeparate is not a function] - expected: FAIL - [WebGL test #31: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawArrays(gl.TRIANGLES, 0, 0)] expected: FAIL - [WebGL test #32: gl.stencilFuncSeparate(gl.FRONT, gl.ALWAYS, 1, 1) threw exception TypeError: gl.stencilFuncSeparate is not a function] - expected: FAIL - [WebGL test #39: gl.getParameter(gl.UNPACK_COLORSPACE_CONVERSION_WEBGL) should be 37444 (of type number). Was null (of type object).] expected: FAIL