Changeset 203498 in webkit

Timestamp:

Jul 21, 2016, 12:29:39 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Threaded Compositor] Flickering when zooming in/out in maps.google.com
​https://bugs.webkit.org/show_bug.cgi?id=154069

Patch by Miguel Gomez <​magomez@igalia.com> on 2016-07-21
Reviewed by Carlos Garcia Campos.

Add a new extra buffer to GraphicsContext3D when using the Threaded Compositor,
so it doesn't have to reuse the buffers that are still waiting for composition.

Covered by existing tests.

• platform/graphics/GraphicsContext3D.h:

Add a new texture to use for the rendering. Remove the compositor fbo we were using.

• platform/graphics/cairo/GraphicsContext3DCairo.cpp:

(WebCore::GraphicsContext3D::GraphicsContext3D):
Initialize the new texture and remove the previous fbo related code.
(WebCore::GraphicsContext3D::~GraphicsContext3D):
Properly destroy the new texture and remove the previous fbo related code.

• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):
Allocate the new texture and remove the previous fbo allocation.

• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:

(WebCore::GraphicsContext3D::prepareTexture):
Use a single fbo with three textures instead of two fbos with a texture each.
Rotate the three textures usage so:

• m_texture becomes m_compositorTexture to be pushed to the compositor.
• m_intermediateTexture becomes m_texture to receive the next rendering.
• m_compositorTexture becomes m_intermediateTexture.

And add a glFlush() to ensure that the gl commands are sent to the pipeline.

• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:

(WebCore::GraphicsContext3D::reshapeFBOs):
Allocate the new texture.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext3D.h (modified) (1 diff)
• platform/graphics/cairo/GraphicsContext3DCairo.cpp (modified) (4 diffs)
• platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-21  Miguel Gomez  <magomez@igalia.com>
+
+        [Threaded Compositor] Flickering when zooming in/out in maps.google.com
+        https://bugs.webkit.org/show_bug.cgi?id=154069
+
+        Reviewed by Carlos Garcia Campos.
+
+        Add a new extra buffer to GraphicsContext3D when using the Threaded Compositor,
+        so it doesn't have to reuse the buffers that are still waiting for composition.
+
+        Covered by existing tests.
+
+        * platform/graphics/GraphicsContext3D.h:
+        Add a new texture to use for the rendering. Remove the compositor fbo we were using.
+        * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+        Initialize the new texture and remove the previous fbo related code.
+        (WebCore::GraphicsContext3D::~GraphicsContext3D):
+        Properly destroy the new texture and remove the previous fbo related code.
+        * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+        (WebCore::GraphicsContext3D::reshapeFBOs):
+        Allocate the new texture and remove the previous fbo allocation.
+        * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+        (WebCore::GraphicsContext3D::prepareTexture):
+        Use a single fbo with three textures instead of two fbos with a texture each.
+        Rotate the three textures usage so:
+        - m_texture becomes m_compositorTexture to be pushed to the compositor.
+        - m_intermediateTexture becomes m_texture to receive the next rendering.
+        - m_compositorTexture becomes m_intermediateTexture.
+        And add a glFlush() to ensure that the gl commands are sent to the pipeline.
+        * platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp:
+        (WebCore::GraphicsContext3D::reshapeFBOs):
+        Allocate the new texture.
+
 2016-07-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h

@@ -1423 +1423 @@
     GC3Duint m_fbo;
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    GC3Duint m_compositorFBO;
+    GC3Duint m_intermediateTexture;
 #endif
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp

@@ -86 +86 @@
     , m_fbo(0)
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    , m_compositorFBO(0)
+    , m_intermediateTexture(0)
 #endif
     , m_depthStencilBuffer(0)
@@ -114 +114 @@
 
 #if USE(COORDINATED_GRAPHICS_THREADED)
-        ::glGenFramebuffers(1, &m_compositorFBO);
         ::glGenTextures(1, &m_compositorTexture);
         ::glBindTexture(GL_TEXTURE_2D, m_compositorTexture);
@@ -121 +120 @@
         ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
         ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+        ::glGenTextures(1, &m_intermediateTexture);
+        ::glBindTexture(GL_TEXTURE_2D, m_intermediateTexture);
+        ::glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        ::glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        ::glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
         ::glBindTexture(GL_TEXTURE_2D, 0);
 #endif
@@ -190 +197 @@
     ::glDeleteFramebuffers(1, &m_fbo);
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    ::glDeleteFramebuffers(1, &m_compositorFBO);
+    ::glDeleteTextures(1, &m_intermediateTexture);
 #endif
 }

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

@@ -178 +178 @@
         ::glBindTexture(GL_TEXTURE_2D, 0);
 #if USE(COORDINATED_GRAPHICS_THREADED)
-        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_compositorFBO);
-        ::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_compositorTexture, 0);
-        attachDepthAndStencilBufferIfNeeded(internalDepthStencilFormat, width, height);
-        ::glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
+        ::glBindTexture(GL_TEXTURE_2D, m_intermediateTexture);
+        ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
+        ::glBindTexture(GL_TEXTURE_2D, 0);
 #endif
     }

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

@@ -237 +237 @@
 
 #if USE(COORDINATED_GRAPHICS_THREADED)
-    std::swap(m_fbo, m_compositorFBO);
     std::swap(m_texture, m_compositorTexture);
-
-    if (m_state.boundFBO != m_compositorFBO)
+    std::swap(m_texture, m_intermediateTexture);
+    ::glBindFramebuffer(GL_FRAMEBUFFER, m_fbo);
+    ::glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_texture, 0);
+    glFlush();
+
+    if (m_state.boundFBO != m_fbo)
         ::glBindFramebufferEXT(GraphicsContext3D::FRAMEBUFFER, m_state.boundFBO);
     else

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

@@ -111 +111 @@
     }
 
+#if USE(COORDINATED_GRAPHICS_THREADED)
+        ::glBindTexture(GL_TEXTURE_2D, m_intermediateTexture);
+        ::glTexImage2D(GL_TEXTURE_2D, 0, m_internalColorFormat, width, height, 0, colorFormat, GL_UNSIGNED_BYTE, 0);
+        ::glBindTexture(GL_TEXTURE_2D, 0);
+#endif
+
     Extensions3DOpenGLES* extensions = static_cast<Extensions3DOpenGLES*>(getExtensions());
     if (extensions->isImagination() && m_attrs.antialias) {