Changeset 165314 in webkit

Timestamp:

Mar 7, 2014 6:23:50 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL] Replace GraphicsContext3D with Evas_GL in AcceleratedCompositingContext.
​https://bugs.webkit.org/show_bug.cgi?id=129676

Patch by Hyowon Kim <​hw1008.kim@samsung.com> on 2014-03-07
Reviewed by Gyuyoung Kim.

TextureMapperGL has its own GraphicsContext3D created by createForCurrentGLContext().
So AcceleratedCompositingContext doesn't need to create and set it to TextureMapperGL.

We now should do 'makeCurrentContext' with a platform specific context before createForCurrentGLContext().
This patch removes GraphicsContext3D related codes in AcceleratedCompositingContext
and adds EvasGLContext/Surface to it instead.

• WebCoreSupport/AcceleratedCompositingContextEfl.cpp:

(WebCore::AcceleratedCompositingContext::initialize):
(WebCore::AcceleratedCompositingContext::resize):
(WebCore::AcceleratedCompositingContext::renderLayers):

• WebCoreSupport/AcceleratedCompositingContextEfl.h:
• ewk/ewk_view.cpp:
• ewk/ewk_view_private.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/AcceleratedCompositingContextEfl.cpp (modified) (4 diffs)
• WebCoreSupport/AcceleratedCompositingContextEfl.h (modified) (4 diffs)
• ewk/ewk_view.cpp (modified) (1 diff)
• ewk/ewk_view_private.h (modified) (1 diff)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2014-03-07  Hyowon Kim  <hw1008.kim@samsung.com>
+
+        [EFL] Replace GraphicsContext3D with Evas_GL in AcceleratedCompositingContext.
+        https://bugs.webkit.org/show_bug.cgi?id=129676
+
+        Reviewed by Gyuyoung Kim.
+
+        TextureMapperGL has its own GraphicsContext3D created by createForCurrentGLContext().
+        So AcceleratedCompositingContext doesn't need to create and set it to TextureMapperGL.
+
+        We now should do 'makeCurrentContext' with a platform specific context before createForCurrentGLContext().
+        This patch removes GraphicsContext3D related codes in AcceleratedCompositingContext
+        and adds EvasGLContext/Surface to it instead.
+
+        * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
+        (WebCore::AcceleratedCompositingContext::initialize):
+        (WebCore::AcceleratedCompositingContext::resize):
+        (WebCore::AcceleratedCompositingContext::renderLayers):
+        * WebCoreSupport/AcceleratedCompositingContextEfl.h:
+        * ewk/ewk_view.cpp:
+        * ewk/ewk_view_private.h:
+
 2014-03-04  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp

@@ -23 +23 @@
 
 #include "AcceleratedCompositingContextEfl.h"
-
 #include "FrameView.h"
-#include "GraphicsContext3D.h"
 #include "GraphicsLayerTextureMapper.h"
 #include "HostWindow.h"
@@ -60 +58 @@
         return false;
 
-    m_context3D = GraphicsContext3D::create(GraphicsContext3D::Attributes(), hostWindow, WebCore::GraphicsContext3D::RenderDirectlyToHostWindow);
-    if (!m_context3D)
+    m_evasGL = adoptPtr(evas_gl_new(evas_object_evas_get(m_view)));
+    if (!m_evasGL)
+        return false;
+
+    m_evasGLContext = EvasGLContext::create(m_evasGL.get());
+    if (!m_evasGLContext)
+        return false;
+
+    Evas_Coord width = 0;
+    Evas_Coord height = 0;
+    evas_object_geometry_get(m_view, 0, 0, &width, &height);
+
+    IntSize webViewSize(width, height);
+    if (webViewSize.isEmpty())
+        return false;
+
+    return resize(webViewSize);
+}
+
+bool AcceleratedCompositingContext::resize(const IntSize& size)
+{
+    static Evas_GL_Config evasGLConfig = {
+        EVAS_GL_RGBA_8888,
+        EVAS_GL_DEPTH_BIT_8,
+        EVAS_GL_STENCIL_NONE,
+        EVAS_GL_OPTIONS_NONE,
+        EVAS_GL_MULTISAMPLE_NONE
+    };
+
+    m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, size);
+    if (!m_evasGLSurface)
         return false;
 
@@ -80 +107 @@
         return;
 
-    if (!m_context3D->makeContextCurrent())
+    if (!evas_gl_make_current(m_evasGL.get(), m_evasGLSurface->surface(), m_evasGLContext->context()))
         return;
 
-    int width = 0;
-    int height = 0;
+    Evas_Coord width = 0;
+    Evas_Coord height = 0;
     evas_object_geometry_get(m_view, 0, 0, &width, &height);
-    m_context3D->viewport(0, 0, width, height);
+    evas_gl_api_get(m_evasGL.get())->glViewport(0, 0, width, height);
 
     m_textureMapper->beginPainting();
@@ -115 +142 @@
 }
 
-GraphicsContext3D* AcceleratedCompositingContext::context()
-{
-    return m_context3D.get();
-}
-
 } // namespace WebCore
 

trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.h

@@ -21 +21 @@
 #define AcceleratedCompositingContextEfl_h
 
+#if USE(TEXTURE_MAPPER_GL)
+#include "EvasGLContext.h"
+#include "EvasGLSurface.h"
+#include "TextureMapperFPSCounter.h"
 #include <wtf/Noncopyable.h>
-#include <wtf/PassOwnPtr.h>
-
-#if USE(TEXTURE_MAPPER_GL)
-
-#include "TextureMapperFPSCounter.h"
-#include "ewk_private.h"
+#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
+class GraphicsLayer;
 class HostWindow;
 class TextureMapper;
@@ -44 +44 @@
     virtual void renderLayers();
     virtual void attachRootGraphicsLayer(GraphicsLayer* rootLayer);
-    virtual GraphicsContext3D* context();
 
 private:
@@ -50 +49 @@
 
     virtual bool initialize(HostWindow*);
+
+    bool resize(const IntSize&);
 
     Evas_Object* m_view;
@@ -57 +58 @@
     TextureMapperLayer* m_rootTextureMapperLayer;
 
-    RefPtr<GraphicsContext3D> m_context3D;
+    OwnPtr<Evas_GL> m_evasGL;
+    OwnPtr<EvasGLContext> m_evasGLContext;
+    OwnPtr<EvasGLSurface> m_evasGLSurface;
+
     TextureMapperFPSCounter m_fpsCounter;
 };

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -4658 +4658 @@
 }
 
-WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView)
-{
-    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
-    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, 0);
-
-    _ewk_view_accelerated_compositing_context_create_if_needed(ewkView);
-    return priv->acceleratedCompositingContext->context();
-}
-
 void ewk_view_root_graphics_layer_set(Evas_Object* ewkView, WebCore::GraphicsLayer* rootLayer)
 {

trunk/Source/WebKit/efl/ewk/ewk_view_private.h

@@ -151 +151 @@
 
 bool ewk_view_accelerated_compositing_object_create(Evas_Object* ewkView, Evas_Native_Surface* nativeSurface, const WebCore::IntRect& rect);
-WebCore::GraphicsContext3D* ewk_view_accelerated_compositing_context_get(Evas_Object* ewkView);
 void ewk_view_root_graphics_layer_set(Evas_Object* ewkView, WebCore::GraphicsLayer* rootLayer);
 void ewk_view_mark_for_sync(Evas_Object* ewkView);