Diff
Modified: trunk/LayoutTests/ChangeLog (265710 => 265711)
--- trunk/LayoutTests/ChangeLog 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/ChangeLog 2020-08-14 22:33:47 UTC (rev 265711)
@@ -1,5 +1,16 @@
2020-08-14 James Darpinian <[email protected]>
+ [WebGL2] releaseShaderCompiler is not allowed to be supported in WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=215432
+
+ Reviewed by Dean Jackson.
+
+ * webgl/1.0.3/conformance/context/methods-expected.txt:
+ * webgl/2.0.0/conformance/context/methods-expected.txt:
+ * webgl/2.0.0/conformance2/context/methods-2-expected.txt:
+
+2020-08-14 James Darpinian <[email protected]>
+
[WebGL2] Skip buggy conformance tests
https://bugs.webkit.org/show_bug.cgi?id=215466
Modified: trunk/LayoutTests/inspector/canvas/recording-webgl-full-expected.txt (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/recording-webgl-full-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/recording-webgl-full-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -652,12 +652,6 @@
1: (anonymous function)
2: executeFrameFunction
91: (duration)
- 0: releaseShaderCompiler()
- trace:
- 0: releaseShaderCompiler
- 1: (anonymous function)
- 2: executeFrameFunction
- 92: (duration)
0: renderbufferStorage(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -664,7 +658,7 @@
0: renderbufferStorage
1: (anonymous function)
2: executeFrameFunction
- 93: (duration)
+ 92: (duration)
0: sampleCoverage(1, true)
swizzleTypes: [Number, Boolean]
trace:
@@ -671,7 +665,7 @@
0: sampleCoverage
1: (anonymous function)
2: executeFrameFunction
- 94: (duration)
+ 93: (duration)
0: scissor(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -678,7 +672,7 @@
0: scissor
1: (anonymous function)
2: executeFrameFunction
- 95: (duration)
+ 94: (duration)
0: shaderSource(0, "test")
swizzleTypes: [WebGLShader, String]
trace:
@@ -685,7 +679,7 @@
0: shaderSource
1: (anonymous function)
2: executeFrameFunction
- 96: (duration)
+ 95: (duration)
0: stencilFunc(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -692,7 +686,7 @@
0: stencilFunc
1: (anonymous function)
2: executeFrameFunction
- 97: (duration)
+ 96: (duration)
0: stencilFuncSeparate(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -699,7 +693,7 @@
0: stencilFuncSeparate
1: (anonymous function)
2: executeFrameFunction
- 98: (duration)
+ 97: (duration)
0: stencilMask(1)
swizzleTypes: [Number]
trace:
@@ -706,7 +700,7 @@
0: stencilMask
1: (anonymous function)
2: executeFrameFunction
- 99: (duration)
+ 98: (duration)
0: stencilMaskSeparate(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -713,7 +707,7 @@
0: stencilMaskSeparate
1: (anonymous function)
2: executeFrameFunction
- 100: (duration)
+ 99: (duration)
0: stencilOp(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -720,7 +714,7 @@
0: stencilOp
1: (anonymous function)
2: executeFrameFunction
- 101: (duration)
+ 100: (duration)
0: stencilOpSeparate(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -727,7 +721,7 @@
0: stencilOpSeparate
1: (anonymous function)
2: executeFrameFunction
- 102: (duration)
+ 101: (duration)
0: texImage2D(1, 2, 3, 4, 5, [object HTMLImageElement])
swizzleTypes: [Number, Number, Number, Number, Number, Image]
trace:
@@ -740,7 +734,7 @@
0: texImage2D
1: (anonymous function)
2: executeFrameFunction
- 103: (duration)
+ 102: (duration)
0: texParameterf(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -747,7 +741,7 @@
0: texParameterf
1: (anonymous function)
2: executeFrameFunction
- 104: (duration)
+ 103: (duration)
0: texParameteri(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -754,7 +748,7 @@
0: texParameteri
1: (anonymous function)
2: executeFrameFunction
- 105: (duration)
+ 104: (duration)
0: texSubImage2D(1, 2, 3, 4, 5, 6, [object HTMLImageElement])
swizzleTypes: [Number, Number, Number, Number, Number, Number, Image]
trace:
@@ -767,7 +761,7 @@
0: texSubImage2D
1: (anonymous function)
2: executeFrameFunction
- 106: (duration)
+ 105: (duration)
0: uniform1f(1)
swizzleTypes: [Number]
trace:
@@ -774,7 +768,7 @@
0: uniform1f
1: (anonymous function)
2: executeFrameFunction
- 107: (duration)
+ 106: (duration)
0: uniform1fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -781,7 +775,7 @@
0: uniform1fv
1: (anonymous function)
2: executeFrameFunction
- 108: (duration)
+ 107: (duration)
0: uniform1i(1)
swizzleTypes: [Number]
trace:
@@ -788,7 +782,7 @@
0: uniform1i
1: (anonymous function)
2: executeFrameFunction
- 109: (duration)
+ 108: (duration)
0: uniform1iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -795,7 +789,7 @@
0: uniform1iv
1: (anonymous function)
2: executeFrameFunction
- 110: (duration)
+ 109: (duration)
0: uniform2f(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -802,7 +796,7 @@
0: uniform2f
1: (anonymous function)
2: executeFrameFunction
- 111: (duration)
+ 110: (duration)
0: uniform2fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -809,7 +803,7 @@
0: uniform2fv
1: (anonymous function)
2: executeFrameFunction
- 112: (duration)
+ 111: (duration)
0: uniform2i(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -816,7 +810,7 @@
0: uniform2i
1: (anonymous function)
2: executeFrameFunction
- 113: (duration)
+ 112: (duration)
0: uniform2iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -823,7 +817,7 @@
0: uniform2iv
1: (anonymous function)
2: executeFrameFunction
- 114: (duration)
+ 113: (duration)
0: uniform3f(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -830,7 +824,7 @@
0: uniform3f
1: (anonymous function)
2: executeFrameFunction
- 115: (duration)
+ 114: (duration)
0: uniform3fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -837,7 +831,7 @@
0: uniform3fv
1: (anonymous function)
2: executeFrameFunction
- 116: (duration)
+ 115: (duration)
0: uniform3i(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -844,7 +838,7 @@
0: uniform3i
1: (anonymous function)
2: executeFrameFunction
- 117: (duration)
+ 116: (duration)
0: uniform3iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -851,7 +845,7 @@
0: uniform3iv
1: (anonymous function)
2: executeFrameFunction
- 118: (duration)
+ 117: (duration)
0: uniform4f(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -858,7 +852,7 @@
0: uniform4f
1: (anonymous function)
2: executeFrameFunction
- 119: (duration)
+ 118: (duration)
0: uniform4fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -865,7 +859,7 @@
0: uniform4fv
1: (anonymous function)
2: executeFrameFunction
- 120: (duration)
+ 119: (duration)
0: uniform4i(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -872,7 +866,7 @@
0: uniform4i
1: (anonymous function)
2: executeFrameFunction
- 121: (duration)
+ 120: (duration)
0: uniform4iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -879,7 +873,7 @@
0: uniform4iv
1: (anonymous function)
2: executeFrameFunction
- 122: (duration)
+ 121: (duration)
0: uniformMatrix2fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -886,7 +880,7 @@
0: uniformMatrix2fv
1: (anonymous function)
2: executeFrameFunction
- 123: (duration)
+ 122: (duration)
0: uniformMatrix3fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -893,7 +887,7 @@
0: uniformMatrix3fv
1: (anonymous function)
2: executeFrameFunction
- 124: (duration)
+ 123: (duration)
0: uniformMatrix4fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -900,7 +894,7 @@
0: uniformMatrix4fv
1: (anonymous function)
2: executeFrameFunction
- 125: (duration)
+ 124: (duration)
0: useProgram(0)
swizzleTypes: [WebGLProgram]
trace:
@@ -907,7 +901,7 @@
0: useProgram
1: (anonymous function)
2: executeFrameFunction
- 126: (duration)
+ 125: (duration)
0: validateProgram(0)
swizzleTypes: [WebGLProgram]
trace:
@@ -914,7 +908,7 @@
0: validateProgram
1: (anonymous function)
2: executeFrameFunction
- 127: (duration)
+ 126: (duration)
0: vertexAttrib1f(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -921,7 +915,7 @@
0: vertexAttrib1f
1: (anonymous function)
2: executeFrameFunction
- 128: (duration)
+ 127: (duration)
0: vertexAttrib1fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -928,7 +922,7 @@
0: vertexAttrib1fv
1: (anonymous function)
2: executeFrameFunction
- 129: (duration)
+ 128: (duration)
0: vertexAttrib2f(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -935,7 +929,7 @@
0: vertexAttrib2f
1: (anonymous function)
2: executeFrameFunction
- 130: (duration)
+ 129: (duration)
0: vertexAttrib2fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -942,7 +936,7 @@
0: vertexAttrib2fv
1: (anonymous function)
2: executeFrameFunction
- 131: (duration)
+ 130: (duration)
0: vertexAttrib3f(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -949,7 +943,7 @@
0: vertexAttrib3f
1: (anonymous function)
2: executeFrameFunction
- 132: (duration)
+ 131: (duration)
0: vertexAttrib3fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -956,7 +950,7 @@
0: vertexAttrib3fv
1: (anonymous function)
2: executeFrameFunction
- 133: (duration)
+ 132: (duration)
0: vertexAttrib4f(1, 2, 3, 4, 5)
swizzleTypes: [Number, Number, Number, Number, Number]
trace:
@@ -963,7 +957,7 @@
0: vertexAttrib4f
1: (anonymous function)
2: executeFrameFunction
- 134: (duration)
+ 133: (duration)
0: vertexAttrib4fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -970,7 +964,7 @@
0: vertexAttrib4fv
1: (anonymous function)
2: executeFrameFunction
- 135: (duration)
+ 134: (duration)
0: vertexAttribPointer(1, 2, 3, true, 5, 6)
swizzleTypes: [Number, Number, Number, Boolean, Number, Number]
trace:
@@ -977,7 +971,7 @@
0: vertexAttribPointer
1: (anonymous function)
2: executeFrameFunction
- 136: (duration)
+ 135: (duration)
0: viewport(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -984,7 +978,7 @@
0: viewport
1: (anonymous function)
2: executeFrameFunction
- 137: (duration)
+ 136: (duration)
0: width
trace:
0: (anonymous function)
@@ -994,7 +988,7 @@
trace:
0: (anonymous function)
1: executeFrameFunction
- 138: (duration)
+ 137: (duration)
0: height
trace:
0: (anonymous function)
Modified: trunk/LayoutTests/inspector/canvas/recording-webgl2-frameCount-expected.txt (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/recording-webgl2-frameCount-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/recording-webgl2-frameCount-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -8,7 +8,7 @@
width: 2
height: 2
parameters:
- 0: {"alpha":true,"depth":true,"stencil":false,"antialias":false,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
+ 0: {"alpha":true,"depth":true,"stencil":false,"antialias":true,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
content: <filtered>
frames:
0: (duration)
Modified: trunk/LayoutTests/inspector/canvas/recording-webgl2-full-expected.txt (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/recording-webgl2-full-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/recording-webgl2-full-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -8,7 +8,7 @@
width: 2
height: 2
parameters:
- 0: {"alpha":true,"depth":true,"stencil":false,"antialias":false,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
+ 0: {"alpha":true,"depth":true,"stencil":false,"antialias":true,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
content: <filtered>
frames:
0: (duration)
@@ -645,12 +645,6 @@
1: (anonymous function)
2: executeFrameFunction
90: (duration)
- 0: releaseShaderCompiler()
- trace:
- 0: releaseShaderCompiler
- 1: (anonymous function)
- 2: executeFrameFunction
- 91: (duration)
0: renderbufferStorage(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -657,7 +651,7 @@
0: renderbufferStorage
1: (anonymous function)
2: executeFrameFunction
- 92: (duration)
+ 91: (duration)
0: sampleCoverage(1, true)
swizzleTypes: [Number, Boolean]
trace:
@@ -664,7 +658,7 @@
0: sampleCoverage
1: (anonymous function)
2: executeFrameFunction
- 93: (duration)
+ 92: (duration)
0: scissor(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -671,7 +665,7 @@
0: scissor
1: (anonymous function)
2: executeFrameFunction
- 94: (duration)
+ 93: (duration)
0: shaderSource(0, "test")
swizzleTypes: [WebGLShader, String]
trace:
@@ -678,7 +672,7 @@
0: shaderSource
1: (anonymous function)
2: executeFrameFunction
- 95: (duration)
+ 94: (duration)
0: stencilFunc(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -685,7 +679,7 @@
0: stencilFunc
1: (anonymous function)
2: executeFrameFunction
- 96: (duration)
+ 95: (duration)
0: stencilFuncSeparate(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -692,7 +686,7 @@
0: stencilFuncSeparate
1: (anonymous function)
2: executeFrameFunction
- 97: (duration)
+ 96: (duration)
0: stencilMask(1)
swizzleTypes: [Number]
trace:
@@ -699,7 +693,7 @@
0: stencilMask
1: (anonymous function)
2: executeFrameFunction
- 98: (duration)
+ 97: (duration)
0: stencilMaskSeparate(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -706,7 +700,7 @@
0: stencilMaskSeparate
1: (anonymous function)
2: executeFrameFunction
- 99: (duration)
+ 98: (duration)
0: stencilOp(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -713,7 +707,7 @@
0: stencilOp
1: (anonymous function)
2: executeFrameFunction
- 100: (duration)
+ 99: (duration)
0: stencilOpSeparate(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -720,7 +714,7 @@
0: stencilOpSeparate
1: (anonymous function)
2: executeFrameFunction
- 101: (duration)
+ 100: (duration)
0: texParameterf(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -727,7 +721,7 @@
0: texParameterf
1: (anonymous function)
2: executeFrameFunction
- 102: (duration)
+ 101: (duration)
0: texParameteri(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -734,7 +728,7 @@
0: texParameteri
1: (anonymous function)
2: executeFrameFunction
- 103: (duration)
+ 102: (duration)
0: uniform1f(1)
swizzleTypes: [Number]
trace:
@@ -741,7 +735,7 @@
0: uniform1f
1: (anonymous function)
2: executeFrameFunction
- 104: (duration)
+ 103: (duration)
0: uniform1fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -748,7 +742,7 @@
0: uniform1fv
1: (anonymous function)
2: executeFrameFunction
- 105: (duration)
+ 104: (duration)
0: uniform1i(1)
swizzleTypes: [Number]
trace:
@@ -755,7 +749,7 @@
0: uniform1i
1: (anonymous function)
2: executeFrameFunction
- 106: (duration)
+ 105: (duration)
0: uniform1iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -762,7 +756,7 @@
0: uniform1iv
1: (anonymous function)
2: executeFrameFunction
- 107: (duration)
+ 106: (duration)
0: uniform2f(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -769,7 +763,7 @@
0: uniform2f
1: (anonymous function)
2: executeFrameFunction
- 108: (duration)
+ 107: (duration)
0: uniform2fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -776,7 +770,7 @@
0: uniform2fv
1: (anonymous function)
2: executeFrameFunction
- 109: (duration)
+ 108: (duration)
0: uniform2i(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -783,7 +777,7 @@
0: uniform2i
1: (anonymous function)
2: executeFrameFunction
- 110: (duration)
+ 109: (duration)
0: uniform2iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -790,7 +784,7 @@
0: uniform2iv
1: (anonymous function)
2: executeFrameFunction
- 111: (duration)
+ 110: (duration)
0: uniform3f(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -797,7 +791,7 @@
0: uniform3f
1: (anonymous function)
2: executeFrameFunction
- 112: (duration)
+ 111: (duration)
0: uniform3fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -804,7 +798,7 @@
0: uniform3fv
1: (anonymous function)
2: executeFrameFunction
- 113: (duration)
+ 112: (duration)
0: uniform3i(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -811,7 +805,7 @@
0: uniform3i
1: (anonymous function)
2: executeFrameFunction
- 114: (duration)
+ 113: (duration)
0: uniform3iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -818,7 +812,7 @@
0: uniform3iv
1: (anonymous function)
2: executeFrameFunction
- 115: (duration)
+ 114: (duration)
0: uniform4f(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -825,7 +819,7 @@
0: uniform4f
1: (anonymous function)
2: executeFrameFunction
- 116: (duration)
+ 115: (duration)
0: uniform4fv(0)
swizzleTypes: [TypedArray]
trace:
@@ -832,7 +826,7 @@
0: uniform4fv
1: (anonymous function)
2: executeFrameFunction
- 117: (duration)
+ 116: (duration)
0: uniform4i(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -839,7 +833,7 @@
0: uniform4i
1: (anonymous function)
2: executeFrameFunction
- 118: (duration)
+ 117: (duration)
0: uniform4iv(0)
swizzleTypes: [TypedArray]
trace:
@@ -846,7 +840,7 @@
0: uniform4iv
1: (anonymous function)
2: executeFrameFunction
- 119: (duration)
+ 118: (duration)
0: uniformMatrix2fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -853,7 +847,7 @@
0: uniformMatrix2fv
1: (anonymous function)
2: executeFrameFunction
- 120: (duration)
+ 119: (duration)
0: uniformMatrix3fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -860,7 +854,7 @@
0: uniformMatrix3fv
1: (anonymous function)
2: executeFrameFunction
- 121: (duration)
+ 120: (duration)
0: uniformMatrix4fv(true, 0)
swizzleTypes: [Boolean, TypedArray]
trace:
@@ -867,7 +861,7 @@
0: uniformMatrix4fv
1: (anonymous function)
2: executeFrameFunction
- 122: (duration)
+ 121: (duration)
0: useProgram(0)
swizzleTypes: [WebGLProgram]
trace:
@@ -874,7 +868,7 @@
0: useProgram
1: (anonymous function)
2: executeFrameFunction
- 123: (duration)
+ 122: (duration)
0: validateProgram(0)
swizzleTypes: [WebGLProgram]
trace:
@@ -881,7 +875,7 @@
0: validateProgram
1: (anonymous function)
2: executeFrameFunction
- 124: (duration)
+ 123: (duration)
0: vertexAttrib1f(1, 2)
swizzleTypes: [Number, Number]
trace:
@@ -888,7 +882,7 @@
0: vertexAttrib1f
1: (anonymous function)
2: executeFrameFunction
- 125: (duration)
+ 124: (duration)
0: vertexAttrib1fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -895,7 +889,7 @@
0: vertexAttrib1fv
1: (anonymous function)
2: executeFrameFunction
- 126: (duration)
+ 125: (duration)
0: vertexAttrib2f(1, 2, 3)
swizzleTypes: [Number, Number, Number]
trace:
@@ -902,7 +896,7 @@
0: vertexAttrib2f
1: (anonymous function)
2: executeFrameFunction
- 127: (duration)
+ 126: (duration)
0: vertexAttrib2fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -909,7 +903,7 @@
0: vertexAttrib2fv
1: (anonymous function)
2: executeFrameFunction
- 128: (duration)
+ 127: (duration)
0: vertexAttrib3f(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -916,7 +910,7 @@
0: vertexAttrib3f
1: (anonymous function)
2: executeFrameFunction
- 129: (duration)
+ 128: (duration)
0: vertexAttrib3fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -923,7 +917,7 @@
0: vertexAttrib3fv
1: (anonymous function)
2: executeFrameFunction
- 130: (duration)
+ 129: (duration)
0: vertexAttrib4f(1, 2, 3, 4, 5)
swizzleTypes: [Number, Number, Number, Number, Number]
trace:
@@ -930,7 +924,7 @@
0: vertexAttrib4f
1: (anonymous function)
2: executeFrameFunction
- 131: (duration)
+ 130: (duration)
0: vertexAttrib4fv(1, 0)
swizzleTypes: [Number, TypedArray]
trace:
@@ -937,7 +931,7 @@
0: vertexAttrib4fv
1: (anonymous function)
2: executeFrameFunction
- 132: (duration)
+ 131: (duration)
0: vertexAttribPointer(1, 2, 3, true, 5, 6)
swizzleTypes: [Number, Number, Number, Boolean, Number, Number]
trace:
@@ -944,7 +938,7 @@
0: vertexAttribPointer
1: (anonymous function)
2: executeFrameFunction
- 133: (duration)
+ 132: (duration)
0: viewport(1, 2, 3, 4)
swizzleTypes: [Number, Number, Number, Number]
trace:
@@ -951,7 +945,7 @@
0: viewport
1: (anonymous function)
2: executeFrameFunction
- 134: (duration)
+ 133: (duration)
0: width
trace:
0: (anonymous function)
@@ -961,7 +955,7 @@
trace:
0: (anonymous function)
1: executeFrameFunction
- 135: (duration)
+ 134: (duration)
0: height
trace:
0: (anonymous function)
Modified: trunk/LayoutTests/inspector/canvas/recording-webgl2-memoryLimit-expected.txt (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/recording-webgl2-memoryLimit-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/recording-webgl2-memoryLimit-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -8,7 +8,7 @@
width: 2
height: 2
parameters:
- 0: {"alpha":true,"depth":true,"stencil":false,"antialias":false,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
+ 0: {"alpha":true,"depth":true,"stencil":false,"antialias":true,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
content: <filtered>
frames:
0: (duration) (incomplete)
Modified: trunk/LayoutTests/inspector/canvas/recording-webgl2-snapshots-expected.txt (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/recording-webgl2-snapshots-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/recording-webgl2-snapshots-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -8,7 +8,7 @@
width: 300
height: 150
parameters:
- 0: {"alpha":true,"depth":true,"stencil":false,"antialias":false,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
+ 0: {"alpha":true,"depth":true,"stencil":false,"antialias":true,"premultipliedAlpha":true,"preserveDrawingBuffer":false,"failIfMajorPerformanceCaveat":false}
content: <filtered>
frames:
0: (duration)
Modified: trunk/LayoutTests/inspector/canvas/resources/recording-webgl.js (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/resources/recording-webgl.js 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/resources/recording-webgl.js 2020-08-14 22:33:47 UTC (rev 265711)
@@ -327,9 +327,6 @@
context.readPixels(1, 2, 3, 4, 5, 6, float32Array);
},
() => {
- context.releaseShaderCompiler();
- },
- () => {
context.renderbufferStorage(1, 2, 3, 4);
},
() => {
Modified: trunk/LayoutTests/inspector/canvas/resources/recording-webgl2.js (265710 => 265711)
--- trunk/LayoutTests/inspector/canvas/resources/recording-webgl2.js 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/inspector/canvas/resources/recording-webgl2.js 2020-08-14 22:33:47 UTC (rev 265711)
@@ -326,9 +326,6 @@
context.readPixels(1, 2, 3, 4, 5, 6, float32Array);
},
() => {
- context.releaseShaderCompiler();
- },
- () => {
context.renderbufferStorage(1, 2, 3, 4);
},
() => {
Modified: trunk/LayoutTests/webgl/1.0.3/conformance/context/methods-expected.txt (265710 => 265711)
--- trunk/LayoutTests/webgl/1.0.3/conformance/context/methods-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/webgl/1.0.3/conformance/context/methods-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -1,9 +1,5 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
Test: ../../resources/webgl_test_files/conformance/context/methods.html
-[ 1: PASS ] All WebGL methods found.
-[ 2: FAIL ] Also found the following extra methods:
-[ 3: FAIL ] releaseShaderCompiler
-[ 4: PASS ] successfullyParsed is true
-[ FAIL ] 2 failures reported
+[ PASS ] All tests passed
Modified: trunk/LayoutTests/webgl/2.0.0/conformance/context/methods-expected.txt (265710 => 265711)
--- trunk/LayoutTests/webgl/2.0.0/conformance/context/methods-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/webgl/2.0.0/conformance/context/methods-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -1,9 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
Test: ../../resources/webgl_test_files/conformance/context/methods.html
-
-[ 1: PASS ] All WebGL methods found.
-[ 2: FAIL ] Also found the following extra methods:
-[ 3: FAIL ] releaseShaderCompiler
-[ 4: PASS ] successfullyParsed is true
-[ FAIL ] 2 failures reported
+[ PASS ] All tests passed
Modified: trunk/LayoutTests/webgl/2.0.0/conformance2/context/methods-2-expected.txt (265710 => 265711)
--- trunk/LayoutTests/webgl/2.0.0/conformance2/context/methods-2-expected.txt 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/LayoutTests/webgl/2.0.0/conformance2/context/methods-2-expected.txt 2020-08-14 22:33:47 UTC (rev 265711)
@@ -1,9 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
Test: ../../resources/webgl_test_files/conformance2/context/methods-2.html
-
-[ 1: PASS ] All WebGL methods found.
-[ 2: FAIL ] Also found the following extra methods:
-[ 3: FAIL ] releaseShaderCompiler
-[ 4: PASS ] successfullyParsed is true
-[ FAIL ] 2 failures reported
+[ PASS ] All tests passed
Modified: trunk/Source/WebCore/ChangeLog (265710 => 265711)
--- trunk/Source/WebCore/ChangeLog 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/ChangeLog 2020-08-14 22:33:47 UTC (rev 265711)
@@ -1,3 +1,24 @@
+2020-08-14 James Darpinian <[email protected]>
+
+ [WebGL2] releaseShaderCompiler is not allowed to be supported in WebGL
+ https://bugs.webkit.org/show_bug.cgi?id=215432
+
+ Reviewed by Dean Jackson.
+
+ Fixes WebGL conformance tests methods.html and methods-2.html
+
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::releaseShaderCompiler): Deleted.
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/canvas/WebGLRenderingContextBase.idl:
+ * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+ (WebCore::GraphicsContextGLOpenGL::releaseShaderCompiler): Deleted.
+ * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+ * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+ (WebCore::GraphicsContextGLOpenGL::releaseShaderCompiler): Deleted.
+ * platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
+ (WebCore::GraphicsContextGLOpenGL::releaseShaderCompiler): Deleted.
+
2020-08-14 Devin Rousso <[email protected]>
RTL: volume slider and icons are backwards
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (265710 => 265711)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2020-08-14 22:33:47 UTC (rev 265711)
@@ -4346,13 +4346,6 @@
#endif
}
-void WebGLRenderingContextBase::releaseShaderCompiler()
-{
- if (isContextLostOrPending())
- return;
- m_context->releaseShaderCompiler();
-}
-
void WebGLRenderingContextBase::renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
{
const char* functionName = "renderbufferStorage";
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (265710 => 265711)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2020-08-14 22:33:47 UTC (rev 265711)
@@ -255,7 +255,6 @@
// This must be virtual so more validation can be added in WebGL 2.0.
virtual void readPixels(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, ArrayBufferView& pixels);
void renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height);
- void releaseShaderCompiler();
virtual void renderbufferStorageImpl(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, const char* functionName);
void sampleCoverage(GCGLfloat value, GCGLboolean invert);
void scissor(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height);
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (265710 => 265711)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2020-08-14 22:33:47 UTC (rev 265711)
@@ -610,7 +610,6 @@
void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);
- void releaseShaderCompiler();
void renderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
void sampleCoverage(GLclampf value, GLboolean invert);
void scissor(GLint x, GLint y, GLsizei width, GLsizei height);
Modified: trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (265710 => 265711)
--- trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp 2020-08-14 22:33:47 UTC (rev 265711)
@@ -102,12 +102,6 @@
} // namespace anonymous
-void GraphicsContextGLOpenGL::releaseShaderCompiler()
-{
- makeContextCurrent();
- notImplemented();
-}
-
#if PLATFORM(MAC) || PLATFORM(IOS_FAMILY)
static void wipeAlphaChannelFromPixels(int width, int height, unsigned char* pixels)
{
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (265710 => 265711)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2020-08-14 22:33:47 UTC (rev 265711)
@@ -315,8 +315,6 @@
void readPixels(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, void* data) final;
- void releaseShaderCompiler();
-
void renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height) final;
void sampleCoverage(GCGLclampf value, GCGLboolean invert) final;
void scissor(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height) final;
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (265710 => 265711)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp 2020-08-14 22:33:47 UTC (rev 265711)
@@ -62,12 +62,6 @@
namespace WebCore {
-void GraphicsContextGLOpenGL::releaseShaderCompiler()
-{
- makeContextCurrent();
- notImplemented();
-}
-
#if PLATFORM(MAC)
static void wipeAlphaChannelFromPixels(int width, int height, unsigned char* pixels)
{
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp (265710 => 265711)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2020-08-14 22:30:34 UTC (rev 265710)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp 2020-08-14 22:33:47 UTC (rev 265711)
@@ -40,12 +40,6 @@
namespace WebCore {
-void GraphicsContextGLOpenGL::releaseShaderCompiler()
-{
- makeContextCurrent();
- ::glReleaseShaderCompiler();
-}
-
void GraphicsContextGLOpenGL::readPixels(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, void* data)
{
makeContextCurrent();
