Title: [284941] branches/safari-612-branch
- Revision
- 284941
- Author
- [email protected]
- Date
- 2021-10-27 14:05:20 -0700 (Wed, 27 Oct 2021)
Log Message
Cherry-pick r282132. rdar://problem/84629639
webgl/2.0.y/deqp/functional/gles3/rbostatequery.html fails on Metal
https://bugs.webkit.org/show_bug.cgi?id=229950
Patch by Kimmo Kinnunen <[email protected]> on 2021-09-08
Reviewed by Dean Jackson.
Source/WebCore:
Request ANGLE_framebuffer_multisample when creating WebGL2 context.
WebGL2 spec requires multisampled framebuffers.
The test that would fail is:
gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, 128, 128);
var value = /** @type {number} */ (gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_SAMPLES));
this.check(value >= samples, 'Expected greater or equal to ' + samples + ' got ' + value);
for `samples == 1` the test would have `value == 0` with INVALID_OPERATION from ANGLE due to
the extension not being enabled.
Fixes tests:
webgl/2.0.0/deqp/functional/gles3/rbostatequery.html
webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
* platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
LayoutTests:
Enable webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
explicitly until 2.0.y is activated.
* webgl/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282132 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (284940 => 284941)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-10-27 21:05:15 UTC (rev 284940)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2021-10-27 21:05:20 UTC (rev 284941)
@@ -1,5 +1,55 @@
2021-10-26 Alan Coon <[email protected]>
+ Cherry-pick r282132. rdar://problem/84629639
+
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html fails on Metal
+ https://bugs.webkit.org/show_bug.cgi?id=229950
+
+ Patch by Kimmo Kinnunen <[email protected]> on 2021-09-08
+ Reviewed by Dean Jackson.
+
+ Source/WebCore:
+
+ Request ANGLE_framebuffer_multisample when creating WebGL2 context.
+ WebGL2 spec requires multisampled framebuffers.
+
+ The test that would fail is:
+ gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, 128, 128);
+ var value = /** @type {number} */ (gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_SAMPLES));
+ this.check(value >= samples, 'Expected greater or equal to ' + samples + ' got ' + value);
+ for `samples == 1` the test would have `value == 0` with INVALID_OPERATION from ANGLE due to
+ the extension not being enabled.
+
+ Fixes tests:
+ webgl/2.0.0/deqp/functional/gles3/rbostatequery.html
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+
+ * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+ (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+
+ LayoutTests:
+
+ Enable webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+ explicitly until 2.0.y is activated.
+
+ * webgl/TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282132 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-08 Kimmo Kinnunen <[email protected]>
+
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html fails on Metal
+ https://bugs.webkit.org/show_bug.cgi?id=229950
+
+ Reviewed by Dean Jackson.
+
+ Enable webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+ explicitly until 2.0.y is activated.
+
+ * webgl/TestExpectations:
+
+2021-10-26 Alan Coon <[email protected]>
+
Cherry-pick r281794. rdar://problem/84625240
webgl/1.0.x/conformance/glsl/misc/fragcolor-fragdata-invariant.html fails
Modified: branches/safari-612-branch/LayoutTests/webgl/2.0.0/deqp/functional/gles3/rbostatequery-expected.txt (284940 => 284941)
--- branches/safari-612-branch/LayoutTests/webgl/2.0.0/deqp/functional/gles3/rbostatequery-expected.txt 2021-10-27 21:05:15 UTC (rev 284940)
+++ branches/safari-612-branch/LayoutTests/webgl/2.0.0/deqp/functional/gles3/rbostatequery-expected.txt 2021-10-27 21:05:20 UTC (rev 284941)
@@ -1,11 +1,4 @@
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
Test: ../../../resources/webgl_test_files/deqp/functional/gles3/rbostatequery.html
-
-[ 1: PASS ] rbo.renderbuffer_size: Passed
-[ 2: PASS ] rbo.renderbuffer_internal_format: Passed
-[ 3: PASS ] rbo.renderbuffer_component_size_color: Passed
-[ 4: PASS ] rbo.renderbuffer_component_size_depth: Passed
-[ 5: FAIL ] rbo.renderbuffer_samples: Expected greater or equal to 1 got 0
-[ 6: PASS ] successfullyParsed is true
-[ FAIL ] 1 failures reported
+[ PASS ] All tests passed
Modified: branches/safari-612-branch/LayoutTests/webgl/TestExpectations (284940 => 284941)
--- branches/safari-612-branch/LayoutTests/webgl/TestExpectations 2021-10-27 21:05:15 UTC (rev 284940)
+++ branches/safari-612-branch/LayoutTests/webgl/TestExpectations 2021-10-27 21:05:20 UTC (rev 284941)
@@ -19,4 +19,7 @@
# Incorrect tests
webgl/2.0.0/deqp/functional/gles3/builtinprecision/ [ Skip ]
-webgl/2.0.0/conformance2/textures/misc/tex-srgb-mipmap.html [ Skip ]
\ No newline at end of file
+webgl/2.0.0/conformance2/textures/misc/tex-srgb-mipmap.html [ Skip ]
+
+# Explicitly enable tests which we have fixed. These expectations will be removed when 1.0.x/2.0.y is enabled.
+webgl/2.0.y/deqp/functional/gles3/rbostatequery.html [ Pass ]
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (284940 => 284941)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-10-27 21:05:15 UTC (rev 284940)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-10-27 21:05:20 UTC (rev 284941)
@@ -1,3 +1,65 @@
+2021-10-26 Alan Coon <[email protected]>
+
+ Cherry-pick r282132. rdar://problem/84629639
+
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html fails on Metal
+ https://bugs.webkit.org/show_bug.cgi?id=229950
+
+ Patch by Kimmo Kinnunen <[email protected]> on 2021-09-08
+ Reviewed by Dean Jackson.
+
+ Source/WebCore:
+
+ Request ANGLE_framebuffer_multisample when creating WebGL2 context.
+ WebGL2 spec requires multisampled framebuffers.
+
+ The test that would fail is:
+ gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, 128, 128);
+ var value = /** @type {number} */ (gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_SAMPLES));
+ this.check(value >= samples, 'Expected greater or equal to ' + samples + ' got ' + value);
+ for `samples == 1` the test would have `value == 0` with INVALID_OPERATION from ANGLE due to
+ the extension not being enabled.
+
+ Fixes tests:
+ webgl/2.0.0/deqp/functional/gles3/rbostatequery.html
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+
+ * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+ (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+
+ LayoutTests:
+
+ Enable webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+ explicitly until 2.0.y is activated.
+
+ * webgl/TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282132 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-08 Kimmo Kinnunen <[email protected]>
+
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html fails on Metal
+ https://bugs.webkit.org/show_bug.cgi?id=229950
+
+ Reviewed by Dean Jackson.
+
+ Request ANGLE_framebuffer_multisample when creating WebGL2 context.
+ WebGL2 spec requires multisampled framebuffers.
+
+ The test that would fail is:
+ gl.renderbufferStorageMultisample(gl.RENDERBUFFER, samples, gl.RGBA8, 128, 128);
+ var value = /** @type {number} */ (gl.getRenderbufferParameter(gl.RENDERBUFFER, gl.RENDERBUFFER_SAMPLES));
+ this.check(value >= samples, 'Expected greater or equal to ' + samples + ' got ' + value);
+ for `samples == 1` the test would have `value == 0` with INVALID_OPERATION from ANGLE due to
+ the extension not being enabled.
+
+ Fixes tests:
+ webgl/2.0.0/deqp/functional/gles3/rbostatequery.html
+ webgl/2.0.y/deqp/functional/gles3/rbostatequery.html
+
+ * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+ (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+
2021-10-25 Null <[email protected]>
Cherry-pick r284247. rdar://problem/84629726
Modified: branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (284940 => 284941)
--- branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2021-10-27 21:05:15 UTC (rev 284940)
+++ branches/safari-612-branch/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm 2021-10-27 21:05:20 UTC (rev 284941)
@@ -348,6 +348,8 @@
if (contextAttributes().xrCompatible)
requiredExtensions.append("GL_OES_EGL_image"_s);
#endif
+ if (m_isForWebGL2)
+ requiredExtensions.append("GL_ANGLE_framebuffer_multisample"_s);
ExtensionsGL& extensions = getExtensions();
for (auto& extension : requiredExtensions) {
if (!extensions.supports(extension)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
