Changeset 139186 in webkit

Timestamp:

Jan 9, 2013 5:31:47 AM (11 years ago)

Author:

zeno.albisser@digia.com

Message:

[Qt] WebGL content is incomplete when using multiple canvas
​https://bugs.webkit.org/show_bug.cgi?id=106313

While we are using double buffering for WebGL,
we do not use a drawable that implements a mechanism
for swapping buffers.
Therefore we have to make sure that all GL commands
have been executed properly before copying the texture
onto the GraphicsSurface.

Reviewed by Simon Hausmann.

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-09  Zeno Albisser  <zeno@webkit.org>
+
+        [Qt] WebGL content is incomplete when using multiple canvas
+        https://bugs.webkit.org/show_bug.cgi?id=106313
+
+        While we are using double buffering for WebGL,
+        we do not use a drawable that implements a mechanism
+        for swapping buffers.
+        Therefore we have to make sure that all GL commands
+        have been executed properly before copying the texture
+        onto the GraphicsSurface.
+
+        Reviewed by Simon Hausmann.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext):
+
 2013-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -323 +323 @@
 void GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext() const
 {
-    if (!m_context->m_attrs.antialias)
-        return;
-
     const QOpenGLContext* currentContext = QOpenGLContext::currentContext();
     QSurface* currentSurface = 0;
@@ -332 +329 @@
         m_platformContext->makeCurrent(m_surface);
     }
-    blitMultisampleFramebuffer();
+
+    if (m_context->m_attrs.antialias)
+        blitMultisampleFramebuffer();
+
+    // While the context is still bound, make sure all the Framebuffer content is in finished state.
+    // This is necessary as we are doing our own double buffering instead of using a drawable that provides swapBuffers.
+    glFinish();
+
     if (currentContext && currentContext != m_platformContext)
         const_cast<QOpenGLContext*>(currentContext)->makeCurrent(currentSurface);