Changeset 169467 in webkit

Timestamp:

May 29, 2014 3:10:16 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS WebGL] Fix depth buffer clearing issue.
​https://bugs.webkit.org/show_bug.cgi?id=133388

Patch by Alex Christensen <​achristensen@webkit.org> on 2014-05-29
Reviewed by Dean Jackson.

No new tests, but this fixes webgl/1.0.1/conformance/canvas/buffer-preserve-test.html.

• platform/graphics/mac/WebGLLayer.mm:

(-[WebGLLayer display]):

• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::prepareTexture):
Moved marking the layer as composited from the mac-only prepareTexture to
the end of [WebGLLayer display] which is called by mac and iOS.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/WebGLLayer.mm (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-29  Alex Christensen  <achristensen@webkit.org>
+
+        [iOS WebGL] Fix depth buffer clearing issue.
+        https://bugs.webkit.org/show_bug.cgi?id=133388
+
+        Reviewed by Dean Jackson.
+
+        No new tests, but this fixes webgl/1.0.1/conformance/canvas/buffer-preserve-test.html.
+
+        * platform/graphics/mac/WebGLLayer.mm:
+        (-[WebGLLayer display]):
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::GraphicsContext3D::prepareTexture):
+        Moved marking the layer as composited from the mac-only prepareTexture to
+        the end of [WebGLLayer display] which is called by mac and iOS.
+
 2014-05-29  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/platform/graphics/mac/WebGLLayer.mm

@@ -156 +156 @@
     [super display];
 #endif
+    m_context->markLayerComposited();
 }
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp

@@ -224 +224 @@
         ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_state.boundFBO);
     ::glFinish();
-    m_layerComposited = true;
 }