Changeset 283979 in webkit

Timestamp:

Oct 12, 2021, 5:36:10 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

WebGL first clear is lost when scissor is used for preserveDrawingBuffer:true in some conditions
​https://bugs.webkit.org/show_bug.cgi?id=230618
<rdar://problem/83668270>

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-10-12
Reviewed by Dean Jackson.

Source/WebCore:

Disable scissor for the duration of the blit from drawing buffer
to display buffer.
Not testable via WebGL conformance test suite as it affects the compositing.

Test: webgl/gl-clear-preserve-drawing-buffer-bug.html

• platform/graphics/angle/GraphicsContextGLANGLE.cpp:

(WebCore::GraphicsContextGLOpenGL::prepareTextureImpl):

LayoutTests:

Add a pixel test to verify that scissor is not applied when blitting drawing buffer
to display buffer in preserveDrawingBuffer: true case.

• webgl/gl-clear-preserve-drawing-buffer-bug-expected.html: Added.
• webgl/gl-clear-preserve-drawing-buffer-bug.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgl/gl-clear-preserve-drawing-buffer-bug-expected.html (added)
• LayoutTests/webgl/gl-clear-preserve-drawing-buffer-bug.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-12  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        WebGL first clear is lost when scissor is used for preserveDrawingBuffer:true in some conditions
+        https://bugs.webkit.org/show_bug.cgi?id=230618
+        <rdar://problem/83668270>
+
+        Reviewed by Dean Jackson.
+
+        Add a pixel test to verify that scissor is not applied when blitting drawing buffer
+        to display buffer in preserveDrawingBuffer: true case.
+
+        * webgl/gl-clear-preserve-drawing-buffer-bug-expected.html: Added.
+        * webgl/gl-clear-preserve-drawing-buffer-bug.html: Added.
+
 2021-10-11  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-12  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        WebGL first clear is lost when scissor is used for preserveDrawingBuffer:true in some conditions
+        https://bugs.webkit.org/show_bug.cgi?id=230618
+        <rdar://problem/83668270>
+
+        Reviewed by Dean Jackson.
+
+        Disable scissor for the duration of the blit from drawing buffer
+        to display buffer.
+        Not testable via WebGL conformance test suite as it affects the compositing.
+
+        Test: webgl/gl-clear-preserve-drawing-buffer-bug.html
+
+        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+        (WebCore::GraphicsContextGLOpenGL::prepareTextureImpl):
+
 2021-10-12  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp

@@ -531 +531 @@
     if (m_preserveDrawingBufferTexture) {
         // Blit m_preserveDrawingBufferTexture into m_texture.
+        TemporaryANGLESetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
+        TemporaryANGLESetting scopedDither(GL_DITHER, GL_FALSE);
         gl::BindFramebuffer(GL_DRAW_FRAMEBUFFER_ANGLE, m_preserveDrawingBufferFBO);
         gl::BindFramebuffer(GL_READ_FRAMEBUFFER_ANGLE, m_fbo);