Changeset 146968 in webkit

Timestamp:

Mar 27, 2013 12:08:30 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CoordGfx] Support to share GraphicsSurface flags with client.
​https://bugs.webkit.org/show_bug.cgi?id=112982

Patch by Kondapally Kalyan <​kalyan.kondapally@intel.com> on 2013-03-27
Reviewed by Noam Rosenthal.

Covered by existing WebGL tests.

Source/WebCore:

This patch adds support to pass GraphicsSurface flags during it's client creation.
This would be helpful to determine cases when blending can be disabled on client
side i.e When AlphaSupport is disabled during Graphics Surface creation.
With GLX, we rely on Window to provide us with necessary information on client side.
This might not be the case on other platforms or when not using Window on X.
This patch doesn't change original behaviour of creating GraphicsSurface client
with default flags GraphicsSurface::SupportsTextureTarget and GraphicsSurface::SupportsSharing.

• platform/graphics/texmap/TextureMapperPlatformLayer.h:

(WebCore::TextureMapperPlatformLayer::graphicsSurfaceFlags):

• platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:

(WebCore::CoordinatedGraphicsLayer::createCanvasIfNeeded):

• platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:

(WebCore::CoordinatedGraphicsScene::createCanvasIfNeeded):

• platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:

(CoordinatedGraphicsLayerState):

• platform/graphics/efl/GraphicsContext3DPrivate.cpp:

(WebCore):
(WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):

• platform/graphics/efl/GraphicsContext3DPrivate.h:

(GraphicsContext3DPrivate):

• platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp:

(WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
(WebCore::GraphicsSurfacePrivate::initializeClient):

Source/WebKit2:

This patch adds support to pass GraphicsSurface flags
during it's client creation.

• Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:

(CoreIPC::::encode):
(CoreIPC::::decode):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp (modified) (1 diff)
• WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h (modified) (1 diff)
• WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp (modified) (2 diffs)
• WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h (modified) (1 diff)
• WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp (modified) (1 diff)
• WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-27  Kondapally Kalyan  <kalyan.kondapally@intel.com>
+
+        [CoordGfx] Support to share GraphicsSurface flags with client.
+        https://bugs.webkit.org/show_bug.cgi?id=112982
+
+        Reviewed by Noam Rosenthal.
+
+        Covered by existing WebGL tests.
+
+        This patch adds support to pass GraphicsSurface flags during it's client creation.
+        This would be helpful to determine cases when blending can be disabled on client
+        side i.e When AlphaSupport is disabled during Graphics Surface creation.
+        With GLX, we rely on Window to provide us with necessary information on client side.
+        This might not be the case on other platforms or when not using Window on X.
+        This patch doesn't change original behaviour of creating GraphicsSurface client
+        with default flags GraphicsSurface::SupportsTextureTarget and GraphicsSurface::SupportsSharing.
+
+        * platform/graphics/texmap/TextureMapperPlatformLayer.h:
+        (WebCore::TextureMapperPlatformLayer::graphicsSurfaceFlags):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::createCanvasIfNeeded):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp:
+        (WebCore::CoordinatedGraphicsScene::createCanvasIfNeeded):
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h:
+        (CoordinatedGraphicsLayerState):
+        * platform/graphics/efl/GraphicsContext3DPrivate.cpp:
+        (WebCore):
+        (WebCore::GraphicsContext3DPrivate::graphicsSurfaceFlags):
+        * platform/graphics/efl/GraphicsContext3DPrivate.h:
+        (GraphicsContext3DPrivate):
+        * platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp:
+        (WebCore::GraphicsSurfacePrivate::GraphicsSurfacePrivate):
+        (WebCore::GraphicsSurfacePrivate::initializeClient):
+
 2013-03-26  Takashi Sakamoto  <tasak@google.com>
 

trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp

@@ -265 +265 @@
     return m_size;
 }
+
+GraphicsSurface::Flags GraphicsContext3DPrivate::graphicsSurfaceFlags() const
+{
+    if (m_graphicsSurface)
+        return m_graphicsSurface->flags();
+
+    return TextureMapperPlatformLayer::graphicsSurfaceFlags();
+}
 #endif
 

trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.h

@@ -55 +55 @@
     virtual uint32_t copyToGraphicsSurface() OVERRIDE;
     virtual GraphicsSurfaceToken graphicsSurfaceToken() const OVERRIDE;
+    virtual GraphicsSurface::Flags graphicsSurfaceFlags() const OVERRIDE;
     void didResizeCanvas(const IntSize&);
 #endif

trunk/Source/WebCore/platform/graphics/surfaces/efl/GraphicsSurfaceCommon.cpp

@@ -42 +42 @@
     }
 
-    GraphicsSurfacePrivate(PlatformBufferHandle winId, const IntSize& size, GraphicsSurface::Flags)
-        : m_rect(FloatPoint::zero(), size)
+    GraphicsSurfacePrivate(PlatformBufferHandle winId, const IntSize& size, GraphicsSurface::Flags flags)
+        : m_flags(0)
+        , m_rect(FloatPoint::zero(), size)
         , m_size(size)
         , m_sharedHandle(winId)
     {
+        if (flags & GraphicsSurface::SupportsAlpha)
+            m_flags |= TextureMapperGL::ShouldBlend;
     }
 
@@ -142 +145 @@
         if (!m_client)
             return;
-
-        // FIXME: This information should be passed from GraphicsSurface.
-        if (m_client->hasAlpha())
-            m_flags |= TextureMapperGL::ShouldBlend;
     }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayer.h

@@ -43 +43 @@
     virtual uint32_t copyToGraphicsSurface() { return 0; }
     virtual GraphicsSurfaceToken graphicsSurfaceToken() const { return GraphicsSurfaceToken(); }
+    virtual GraphicsSurface::Flags graphicsSurfaceFlags() const { return  GraphicsSurface::SupportsTextureTarget | GraphicsSurface::SupportsSharing; }
 #endif
 };

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp

@@ -728 +728 @@
         m_layerState.canvasSize = m_canvasPlatformLayer->platformLayerSize();
         m_layerState.canvasToken = m_canvasPlatformLayer->graphicsSurfaceToken();
+        m_layerState.canvasSurfaceFlags = m_canvasPlatformLayer->graphicsSurfaceFlags();
         m_layerState.canvasChanged = true;
         m_isValidCanvas = true;

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsScene.cpp

@@ -204 +204 @@
     RefPtr<TextureMapperSurfaceBackingStore> canvasBackingStore(TextureMapperSurfaceBackingStore::create());
     m_surfaceBackingStores.set(layer, canvasBackingStore);
-
-    GraphicsSurface::Flags surfaceFlags = GraphicsSurface::SupportsTextureTarget | GraphicsSurface::SupportsSharing;
-    canvasBackingStore->setGraphicsSurface(GraphicsSurface::create(state.canvasSize, surfaceFlags, state.canvasToken));
+    canvasBackingStore->setGraphicsSurface(GraphicsSurface::create(state.canvasSize, state.canvasSurfaceFlags, state.canvasToken));
     layer->setContentsToMedia(canvasBackingStore.get());
 }

trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsState.h

@@ -44 +44 @@
 
 #if USE(GRAPHICS_SURFACE)
+#include "GraphicsSurface.h"
 #include "GraphicsSurfaceToken.h"
 #endif
@@ -163 +164 @@
     GraphicsSurfaceToken canvasToken;
     uint32_t canvasFrontBuffer;
+    GraphicsSurface::Flags canvasSurfaceFlags;
 #endif
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-27  Kondapally Kalyan  <kalyan.kondapally@intel.com>
+
+        [CoordGfx] Support to share GraphicsSurface flags with client.
+        https://bugs.webkit.org/show_bug.cgi?id=112982
+
+        Reviewed by Noam Rosenthal.
+
+        Covered by existing WebGL tests.
+
+        This patch adds support to pass GraphicsSurface flags
+        during it's client creation.
+
+        * Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp:
+        (CoreIPC::::encode):
+        (CoreIPC::::decode):
+
 2013-03-26  Hayato Ito  <hayato@chromium.org>
 

trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp

@@ -895 +895 @@
         encoder << state.canvasToken;
         encoder << state.canvasFrontBuffer;
+        encoder << state.canvasSurfaceFlags;
     }
 #endif
@@ -981 +982 @@
 
         if (!decoder.decode(state.canvasFrontBuffer))
+            return false;
+
+        if (!decoder.decode(state.canvasSurfaceFlags))
             return false;
     }