Auto merge of #24333 - mmatyas:webgl_fns_samplers, r=jdm

Add WebGLSampler support

Reference: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.13

<!-- Please describe your changes on the following line: -->

cc @jdm @zakorgy

---
<!-- 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
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because ___

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/24333)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-08 11:56:11 -04:00 committed by GitHub
commit a7d48dca80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 394 additions and 88 deletions

View file

@ -1,16 +1,16 @@
[methods-2.html]
[WebGL test #46: Property either does not exist or is not a function: bindTransformFeedback]
expected: FAIL
[WebGL test #25: Property either does not exist or is not a function: uniform4uiv]
expected: FAIL
[WebGL test #72: Property either does not exist or is not a function: bindVertexArray]
[WebGL test #48: Property either does not exist or is not a function: endTransformFeedback]
expected: FAIL
[WebGL test #28: Property either does not exist or is not a function: uniformMatrix2x4fv]
expected: FAIL
[WebGL test #48: Property either does not exist or is not a function: samplerParameterf]
expected: FAIL
[WebGL test #1: Property either does not exist or is not a function: getBufferSubData]
expected: FAIL
@ -23,16 +23,7 @@
[WebGL test #27: Property either does not exist or is not a function: uniformMatrix3x2fv]
expected: FAIL
[WebGL test #60: Property either does not exist or is not a function: bindBufferBase]
expected: FAIL
[WebGL test #63: Property either does not exist or is not a function: getUniformIndices]
expected: FAIL
[WebGL test #57: Property either does not exist or is not a function: getTransformFeedbackVarying]
expected: FAIL
[WebGL test #64: Property either does not exist or is not a function: getActiveUniforms]
[WebGL test #53: Property either does not exist or is not a function: bindBufferBase]
expected: FAIL
[WebGL test #3: Property either does not exist or is not a function: blitFramebuffer]
@ -41,13 +32,13 @@
[WebGL test #33: Property either does not exist or is not a function: vertexAttribI4iv]
expected: FAIL
[WebGL test #58: Property either does not exist or is not a function: pauseTransformFeedback]
[WebGL test #44: Property either does not exist or is not a function: deleteTransformFeedback]
expected: FAIL
[WebGL test #62: Property either does not exist or is not a function: getIndexedParameter]
[WebGL test #51: Property either does not exist or is not a function: pauseTransformFeedback]
expected: FAIL
[WebGL test #56: Property either does not exist or is not a function: transformFeedbackVaryings]
[WebGL test #49: Property either does not exist or is not a function: transformFeedbackVaryings]
expected: FAIL
[WebGL test #2: Property either does not exist or is not a function: copyBufferSubData]
@ -56,15 +47,15 @@
[WebGL test #23: Property either does not exist or is not a function: uniform2uiv]
expected: FAIL
[WebGL test #55: Property either does not exist or is not a function: getIndexedParameter]
expected: FAIL
[WebGL test #31: Property either does not exist or is not a function: uniformMatrix4x3fv]
expected: FAIL
[WebGL test #36: Property either does not exist or is not a function: vertexAttribIPointer]
expected: FAIL
[WebGL test #54: Property either does not exist or is not a function: beginTransformFeedback]
expected: FAIL
[WebGL test #8: Property either does not exist or is not a function: readBuffer]
expected: FAIL
@ -74,22 +65,19 @@
[WebGL test #5: Property either does not exist or is not a function: getInternalformatParameter]
expected: FAIL
[WebGL test #47: Property either does not exist or is not a function: samplerParameteri]
[WebGL test #60: Property either does not exist or is not a function: getActiveUniformBlockName]
expected: FAIL
[WebGL test #47: Property either does not exist or is not a function: beginTransformFeedback]
expected: FAIL
[WebGL test #32: Property either does not exist or is not a function: vertexAttribI4i]
expected: FAIL
[WebGL test #68: Property either does not exist or is not a function: uniformBlockBinding]
[WebGL test #43: Property either does not exist or is not a function: createTransformFeedback]
expected: FAIL
[WebGL test #55: Property either does not exist or is not a function: endTransformFeedback]
expected: FAIL
[WebGL test #69: Property either does not exist or is not a function: createVertexArray]
expected: FAIL
[WebGL test #70: Property either does not exist or is not a function: deleteVertexArray]
[WebGL test #59: Property either does not exist or is not a function: getActiveUniformBlockParameter]
expected: FAIL
[WebGL test #41: Property either does not exist or is not a function: clearBufferfv]
@ -101,19 +89,16 @@
[WebGL test #15: Property either does not exist or is not a function: compressedTexImage3D]
expected: FAIL
[WebGL test #43: Property either does not exist or is not a function: createSampler]
[WebGL test #65: Property either does not exist or is not a function: bindVertexArray]
expected: FAIL
[WebGL test #34: Property either does not exist or is not a function: vertexAttribI4ui]
expected: FAIL
[WebGL test #51: Property either does not exist or is not a function: deleteTransformFeedback]
expected: FAIL
[WebGL test #6: Property either does not exist or is not a function: invalidateFramebuffer]
expected: FAIL
[WebGL test #61: Property either does not exist or is not a function: bindBufferRange]
[WebGL test #62: Property either does not exist or is not a function: createVertexArray]
expected: FAIL
[WebGL test #42: Property either does not exist or is not a function: clearBufferfi]
@ -128,13 +113,10 @@
[WebGL test #39: Property either does not exist or is not a function: clearBufferiv]
expected: FAIL
[WebGL test #71: Property either does not exist or is not a function: isVertexArray]
[WebGL test #58: Property either does not exist or is not a function: getUniformBlockIndex]
expected: FAIL
[WebGL test #52: Property either does not exist or is not a function: isTransformFeedback]
expected: FAIL
[WebGL test #46: Property either does not exist or is not a function: bindSampler]
[WebGL test #56: Property either does not exist or is not a function: getUniformIndices]
expected: FAIL
[WebGL test #16: Property either does not exist or is not a function: compressedTexSubImage3D]
@ -143,12 +125,18 @@
[WebGL test #38: Property either does not exist or is not a function: drawBuffers]
expected: FAIL
[WebGL test #54: Property either does not exist or is not a function: bindBufferRange]
expected: FAIL
[WebGL test #0: Property either does not exist or is not a function: isContextLost]
expected: FAIL
[WebGL test #9: Property either does not exist or is not a function: renderbufferStorageMultisample]
expected: FAIL
[WebGL test #45: Property either does not exist or is not a function: isTransformFeedback]
expected: FAIL
[WebGL test #18: Property either does not exist or is not a function: uniform1ui]
expected: FAIL
@ -158,40 +146,28 @@
[WebGL test #40: Property either does not exist or is not a function: clearBufferuiv]
expected: FAIL
[WebGL test #66: Property either does not exist or is not a function: getActiveUniformBlockParameter]
expected: FAIL
[WebGL test #53: Property either does not exist or is not a function: bindTransformFeedback]
[WebGL test #64: Property either does not exist or is not a function: isVertexArray]
expected: FAIL
[WebGL test #21: Property either does not exist or is not a function: uniform4ui]
expected: FAIL
[WebGL test #50: Property either does not exist or is not a function: createTransformFeedback]
expected: FAIL
[WebGL test #11: Property either does not exist or is not a function: texStorage2D]
expected: FAIL
[WebGL test #59: Property either does not exist or is not a function: resumeTransformFeedback]
expected: FAIL
[WebGL test #19: Property either does not exist or is not a function: uniform2ui]
expected: FAIL
[WebGL test #26: Property either does not exist or is not a function: uniformMatrix2x3fv]
expected: FAIL
[WebGL test #67: Property either does not exist or is not a function: getActiveUniformBlockName]
expected: FAIL
[WebGL test #49: Property either does not exist or is not a function: getSamplerParameter]
[WebGL test #52: Property either does not exist or is not a function: resumeTransformFeedback]
expected: FAIL
[WebGL test #29: Property either does not exist or is not a function: uniformMatrix4x2fv]
expected: FAIL
[WebGL test #65: Property either does not exist or is not a function: getUniformBlockIndex]
[WebGL test #57: Property either does not exist or is not a function: getActiveUniforms]
expected: FAIL
[WebGL test #20: Property either does not exist or is not a function: uniform3ui]
@ -203,16 +179,19 @@
[WebGL test #4: Property either does not exist or is not a function: framebufferTextureLayer]
expected: FAIL
[WebGL test #44: Property either does not exist or is not a function: deleteSampler]
[WebGL test #61: Property either does not exist or is not a function: uniformBlockBinding]
expected: FAIL
[WebGL test #50: Property either does not exist or is not a function: getTransformFeedbackVarying]
expected: FAIL
[WebGL test #12: Property either does not exist or is not a function: texStorage3D]
expected: FAIL
[WebGL test #10: Property either does not exist or is not a function: texImage3D]
[WebGL test #63: Property either does not exist or is not a function: deleteVertexArray]
expected: FAIL
[WebGL test #45: Property either does not exist or is not a function: isSampler]
[WebGL test #10: Property either does not exist or is not a function: texImage3D]
expected: FAIL
[WebGL test #13: Property either does not exist or is not a function: texSubImage3D]

View file

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

View file

@ -51,3 +51,9 @@
[WebGL test #32: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL
[WebGL test #33: getError expected: NO_ERROR. Was INVALID_ENUM : after evaluating: gl.bindSampler(0, sampler)]
expected: FAIL
[WebGL test #40: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL

View file

@ -1,5 +1,7 @@
[multi-context-sampler-test.html]
expected: ERROR
[WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
[WebGL test #2: should be green\nat (0, 0) expected: 0,255,0,255 was 0,0,0,255]
expected: FAIL
[WebGL test #3: getError expected: NO_ERROR. Was INVALID_ENUM : there should be no errors]
expected: FAIL

View file

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

View file

@ -1,8 +0,0 @@
[samplers.html]
expected: ERROR
[WebGL test #3: getError expected: NO_ERROR. Was INVALID_ENUM : SAMPLER_BINDING query should succeed]
expected: FAIL
[WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL