[Qt][EFL][WebGL] Minor refactoring of GraphicsSurface/GraphicsSurfaceGLX

https://bugs.webkit.org/show_bug.cgi?id=108686

Patch by Viatcheslav Ostapenko <sl.ostapenko@samsung.com> on 2013-02-11
Reviewed by Noam Rosenthal.

Remove unused platformSurface()/m_platformSurface from GraphicsSurface.
Move m_texture from GraphicsSurface to GLX GraphicsSurfacePrivate to match
Win and Mac implementations.

No new tests, refactoring only.

* platform/graphics/surfaces/GraphicsSurface.cpp:
(WebCore::GraphicsSurface::GraphicsSurface):
* platform/graphics/surfaces/GraphicsSurface.h:
(GraphicsSurface):
* platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
(WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::swapBuffers):
(WebCore::GraphicsSurfacePrivate::surface):
(GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::textureID):
(WebCore::GraphicsSurfacePrivate::clear):
(WebCore::GraphicsSurface::platformExport):
(WebCore::GraphicsSurface::platformGetTextureID):
(WebCore::GraphicsSurface::platformSwapBuffers):
(WebCore::GraphicsSurface::platformCreate):
(WebCore::GraphicsSurface::platformImport):
(WebCore::GraphicsSurface::platformDestroy):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142587 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6e4f1075e5d228dd4991ba8d74fd4c9364ae6a23..a17130d5cd83a332fac38a8cc24d71fef050f423 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2013-02-11  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
+
+        [Qt][EFL][WebGL] Minor refactoring of GraphicsSurface/GraphicsSurfaceGLX
+        https://bugs.webkit.org/show_bug.cgi?id=108686
+
+        Reviewed by Noam Rosenthal.
+
+        Remove unused platformSurface()/m_platformSurface from GraphicsSurface.
+        Move m_texture from GraphicsSurface to GLX GraphicsSurfacePrivate to match
+        Win and Mac implementations.
+
+        No new tests, refactoring only.
+
+        * platform/graphics/surfaces/GraphicsSurface.cpp:
+        (WebCore::GraphicsSurface::GraphicsSurface):
+        * platform/graphics/surfaces/GraphicsSurface.h:
+        (GraphicsSurface):
+        * platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp:
+        (WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
+        (WebCore::GraphicsSurfacePrivate::swapBuffers):
+        (WebCore::GraphicsSurfacePrivate::surface):
+        (GraphicsSurfacePrivate):
+        (WebCore::GraphicsSurfacePrivate::textureID):
+        (WebCore::GraphicsSurfacePrivate::clear):
+        (WebCore::GraphicsSurface::platformExport):
+        (WebCore::GraphicsSurface::platformGetTextureID):
+        (WebCore::GraphicsSurface::platformSwapBuffers):
+        (WebCore::GraphicsSurface::platformCreate):
+        (WebCore::GraphicsSurface::platformImport):
+        (WebCore::GraphicsSurface::platformDestroy):
+
 2013-02-11  Viatcheslav Ostapenko  <sl.ostapenko@samsung.com>
 
         [EFL][WebGL] WebGL content is not painted after resizing the viewport.

diff --git a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.cpp b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.cpp
index 5688ce9e1b3e938c767b6c3c9b7fd9a07836b348..baefa8a190841aeab2b40a2cd0647720f163359c 100644 (file)
--- a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.cpp
+++ b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.cpp
@@ -85,8 +85,6 @@ IntSize GraphicsSurface::size() const
 
 GraphicsSurface::GraphicsSurface(const IntSize&, Flags flags)
     : m_flags(flags)
-    , m_platformSurface(0)
-    , m_texture(0)
     , m_fbo(0)
     , m_private(0)
 {

diff --git a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h
index 549e804c465dde88d47fe7e589ce64ea83d54303..da4936998c5d0dd7928595e221c8fa92691a3878 100644 (file)
--- a/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h
+++ b/Source/WebCore/platform/graphics/surfaces/GraphicsSurface.h
@@ -73,7 +73,6 @@ public:
     typedef int LockOptions;
 
     Flags flags() const { return m_flags; }
-    PlatformGraphicsSurface platformSurface() const { return m_platformSurface; }
     IntSize size() const;
 
     static PassRefPtr<GraphicsSurface> create(const IntSize&, Flags, const PlatformGraphicsContext3D shareContext = 0);
@@ -119,8 +118,6 @@ private:
 #endif
 
 private:
-    PlatformGraphicsSurface m_platformSurface;
-    uint32_t m_texture;
     uint32_t m_fbo;
     GraphicsSurfacePrivate* m_private;
 };

diff --git a/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp b/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
index e6b144a52cfbf88f7023afd259e78a7af68512f0..68678ca1fff3933dde13eaa21d570fe2e2399a64 100644 (file)
--- a/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
+++ b/Source/WebCore/platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
@@ -73,6 +73,7 @@ struct GraphicsSurfacePrivate {
         , m_detachedContext(0)
         , m_detachedSurface(0)
         , m_isReceiver(false)
+        , m_texture(0)
     {
         GLXContext shareContextObject = 0;
 
@@ -107,6 +108,7 @@ struct GraphicsSurfacePrivate {
         , m_detachedContext(0)
         , m_detachedSurface(0)
         , m_isReceiver(true)
+        , m_texture(0)
     {
         m_configSelector = adoptPtr(new GLXConfigSelector());
     }
@@ -190,10 +192,17 @@ struct GraphicsSurfacePrivate {
 
     void swapBuffers()
     {
-        // The buffers are being switched on the writing side, the reading side just reads
-        // whatever texture the XWindow contains.
-        if (m_isReceiver)
+        if (isReceiver()) {
+            if (isMesaGLX() && textureID()) {
+                glBindTexture(GL_TEXTURE_2D, textureID());
+                // Mesa doesn't re-bind texture to the front buffer on glXSwapBufer
+                // Manually release previous lock and rebind texture to surface to ensure frame updates.
+                pGlXReleaseTexImageEXT(display(), glxPixmap(), GLX_FRONT_EXT);
+                pGlXBindTexImageEXT(display(), glxPixmap(), GLX_FRONT_EXT, 0);
+            }
+
             return;
+        }
 
         GLXContext glContext = glXGetCurrentContext();
 
@@ -261,9 +270,37 @@ struct GraphicsSurfacePrivate {
 
     TextureMapperGL::Flags flags() const { return m_flags; }
 
+    Window surface() const { return m_surface; }
+
+    GLuint textureID() const
+    {
+        if (m_texture) 
+            return m_texture;
+
+        GLXPixmap pixmap = glxPixmap();
+        if (!pixmap)
+            return 0;
+
+        GLuint texture;
+        glGenTextures(1, &texture);
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_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);
+        pGlXBindTexImageEXT(display(), pixmap, GLX_FRONT_EXT, 0);
+        const_cast<GraphicsSurfacePrivate*>(this)->m_texture = texture;
+
+        return texture;
+    }
 private:
     void clear()
     {
+        if (m_texture) {
+            pGlXReleaseTexImageEXT(display(), glxPixmap(), GLX_FRONT_EXT);
+            glDeleteTextures(1, &m_texture);
+        }
+
         if (m_glxPixmap) {
             glXDestroyPixmap(display(), m_glxPixmap);
             m_glxPixmap = 0;
@@ -300,6 +337,7 @@ private:
     OwnPtr<GLXConfigSelector> m_configSelector;
     bool m_isReceiver;
     TextureMapperGL::Flags m_flags;
+    GLuint m_texture;
 };
 
 static bool resolveGLMethods()
@@ -322,26 +360,12 @@ static bool resolveGLMethods()
 
 GraphicsSurfaceToken GraphicsSurface::platformExport()
 {
-    return GraphicsSurfaceToken(m_platformSurface);
+    return GraphicsSurfaceToken(m_private->surface());
 }
 
 uint32_t GraphicsSurface::platformGetTextureID()
 {
-    if (!m_texture) {
-        GLXPixmap pixmap = m_private->glxPixmap();
-        if (!pixmap)
-            return 0;
-
-        glGenTextures(1, &m_texture);
-        glBindTexture(GL_TEXTURE_2D, m_texture);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_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);
-        pGlXBindTexImageEXT(m_private->display(), pixmap, GLX_FRONT_EXT, 0);
-    }
-
-    return m_texture;
+    return m_private->textureID();
 }
 
 void GraphicsSurface::platformCopyToGLTexture(uint32_t /*target*/, uint32_t /*id*/, const IntRect& /*targetRect*/, const IntPoint& /*offset*/)
@@ -376,17 +400,6 @@ uint32_t GraphicsSurface::platformFrontBuffer() const
 
 uint32_t GraphicsSurface::platformSwapBuffers()
 {
-    if (m_private->isReceiver()) {
-        if (isMesaGLX() && platformGetTextureID()) {
-            glBindTexture(GL_TEXTURE_2D, platformGetTextureID());
-            // Mesa doesn't re-bind texture to the front buffer on glXSwapBufer
-            // Manually release previous lock and rebind texture to surface to get frame update.
-            pGlXReleaseTexImageEXT(m_private->display(), m_private->glxPixmap(), GLX_FRONT_EXT);
-            pGlXBindTexImageEXT(m_private->display(), m_private->glxPixmap(), GLX_FRONT_EXT, 0);
-        }
-        return 0;
-    }
-
     m_private->swapBuffers();
     return 0;
 }
@@ -410,7 +423,7 @@ PassRefPtr<GraphicsSurface> GraphicsSurface::platformCreate(const IntSize& size,
     if (!resolveGLMethods())
         return PassRefPtr<GraphicsSurface>();
 
-    surface->m_platformSurface = surface->m_private->createSurface(size);
+    surface->m_private->createSurface(size);
 
     return surface;
 }
@@ -424,9 +437,8 @@ PassRefPtr<GraphicsSurface> GraphicsSurface::platformImport(const IntSize& size,
         return PassRefPtr<GraphicsSurface>();
 
     RefPtr<GraphicsSurface> surface = adoptRef(new GraphicsSurface(size, flags));
-    surface->m_platformSurface = token.frontBufferHandle;
 
-    surface->m_private = new GraphicsSurfacePrivate(surface->m_platformSurface);
+    surface->m_private = new GraphicsSurfacePrivate(token.frontBufferHandle);
     if (!resolveGLMethods())
         return PassRefPtr<GraphicsSurface>();
 
@@ -446,11 +458,6 @@ void GraphicsSurface::platformUnlock()
 
 void GraphicsSurface::platformDestroy()
 {
-    if (m_texture) {
-        pGlXReleaseTexImageEXT(m_private->display(), m_private->glxPixmap(), GLX_FRONT_EXT);
-        glDeleteTextures(1, &m_texture);
-    }
-
     delete m_private;
     m_private = 0;
 }