mirror of
https://github.com/servo/servo.git
synced 2025-10-02 17:49:16 +01:00
Auto merge of #13208 - MortimerGoro:programinfolog, r=emilio
Fix WebGL tests & Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog, disableVertexAttribArray}.
<!-- Please describe your changes on the following line: -->
Implement WebGLRenderingContext::{validateProgram, getProgramInfoLog} and improve WebGL testcase to show shader link and validation errors.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #13199 (github issue number if applicable).
<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13208)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
fc251384a7
29 changed files with 312 additions and 127 deletions
|
|
@ -1,9 +1,33 @@
|
|||
[gl-vertex-attrib-zero-issues.html]
|
||||
type: testharness
|
||||
expected: ERROR
|
||||
[WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
expected: TIMEOUT
|
||||
[WebGL test #5: at (0, 0) expected: 0,255,0,255 was 0,0,0,0]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
[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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[gl-vertexattribpointer.html]
|
||||
type: testharness
|
||||
expected: CRASH
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[index-validation-with-resized-buffer.html]
|
||||
type: testharness
|
||||
expected: CRASH
|
||||
|
|
@ -1,9 +1,11 @@
|
|||
[index-validation.html]
|
||||
type: testharness
|
||||
expected: ERROR
|
||||
[WebGL test #0: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be 36053. Threw exception TypeError: gl.checkFramebufferStatus is not a function]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
[WebGL test #9: getError expected: INVALID_OPERATION. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #12: getError expected: INVALID_OPERATION. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
[object-deletion-behaviour.html]
|
||||
type: testharness
|
||||
expected:
|
||||
if os == "linux": TIMEOUT
|
||||
if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "webrender"): ERROR
|
||||
expected: ERROR
|
||||
[WebGL test #9: gl.isShader(vertexShader) should be true. Threw exception TypeError: gl.isShader is not a function]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[webGLArrays.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
[drawArrays.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
[WebGL test #0: testDrawElementsVBO]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
[drawArraysOutOfBounds.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
[WebGL test #0: testDrawArraysEmpty]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[drawElements.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
[drawElementsBadArgs.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
[WebGL test #0: testDrawElementsVBO]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
[texImage2DHTML.html]
|
||||
type: testharness
|
||||
[WebGL test #0: testTexImage2D]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[texSubImage2DHTML.html]
|
||||
type: testharness
|
||||
[WebGL test #0: testTexImage2D]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
[vertexAttrib.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
[WebGL test #0: testVertexAttrib]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
[vertexAttribBadArgs.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
[WebGL test #0: testVertexAttrib]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[vertexAttribPointer.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
[vertexAttribPointerBadArgs.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[arrayOutOfBounds.html]
|
||||
type: testharness
|
||||
[WebGL test #0: testOk]
|
||||
expected: FAIL
|
||||
|
||||
|
|
@ -1,33 +1,14 @@
|
|||
[get-active-test.html]
|
||||
type: testharness
|
||||
expected: CRASH
|
||||
[WebGL test #1: context.getActiveUniform(program, 0).name should be u_modelViewProjMatrix. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
[WebGL test #33: context2.getActiveAttrib(program, 0) should be null. Was [object WebGLActiveInfo\].]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #2: context.getActiveUniform(program, 0).type should be 35676. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
[WebGL test #34: getError expected: INVALID_OPERATION. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #3: context.getActiveUniform(program, 0).size should be 1. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
[WebGL test #35: context2.getActiveUniform(program, 0) should be null. Was [object WebGLActiveInfo\].]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #4: context.getActiveUniform(program, 1) should be null. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #5: getError expected: INVALID_VALUE. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #6: context.getActiveUniform(program, -1) should be null. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #7: getError expected: INVALID_VALUE. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #8: context.getActiveUniform(null, 0) should be null. Threw exception TypeError: context.getActiveUniform is not a function]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #9: getError expected: INVALID_VALUE. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #10: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
[WebGL test #36: getError expected: INVALID_OPERATION. Was NO_ERROR : ]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
[gl-bind-attrib-location-long-names-test.html]
|
||||
type: testharness
|
||||
expected: ERROR
|
||||
[WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #4: at (0, 0) expected: 0,255,0,255 was 255,255,255,255]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #5: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
[WebGL test #8: at (0, 0) expected: 255,0,0,255 was 0,0,0,255]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
[gl-bind-attrib-location-test.html]
|
||||
type: testharness
|
||||
expected: ERROR
|
||||
[WebGL test #6: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #7: at (20, 15) expected: 0,255,0,255 was 0,0,0,255]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #9: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
[WebGL test #13: at (20, 15) expected: 255,0,0,255 was 0,0,0,255]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,24 @@
|
|||
[draw-elements-out-of-bounds.html]
|
||||
type: testharness
|
||||
expected: TIMEOUT
|
||||
expected: ERROR
|
||||
[WebGL test #19: getError expected: NO_ERROR. Was INVALID_OPERATION : after evaluating: gl.drawElements(gl.TRIANGLES, 0, gl.UNSIGNED_BYTE, 4)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #25: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_BYTE, 0)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #31: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 12, gl.UNSIGNED_SHORT, 0)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #32: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 15, gl.UNSIGNED_SHORT, 0)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #33: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 18, gl.UNSIGNED_SHORT, 0)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #34: getError expected: INVALID_OPERATION. Was NO_ERROR : after evaluating: gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 30)]
|
||||
expected: FAIL
|
||||
|
||||
[WebGL test #43: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
|
||||
expected: FAIL
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
[more-than-65536-indices.html]
|
||||
type: testharness
|
||||
expected: CRASH
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
[point-no-attributes.html]
|
||||
type: testharness
|
||||
[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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue