Attachment 180968 Details for Bug 105816 – patch v2

[patch] patch v2

gles2compile.patch (text/plain), 3.90 KB, created by Kalyan on 2012-12-31 04:11:25 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Kalyan

Created: 2012-12-31 04:11:25 PST

Size: 3.90 KB

patch

obsolete

>diff --git ChangeLog ChangeLog
>index 29e96fc..1008405 100644
>--- ChangeLog
>+++ ChangeLog
>@@ -1,3 +1,18 @@
>+2012-12-31  Kondapally Kalyan  <kalyan.kondapally@intel.com>
>+
>+        [EFL][WebGL] Add compile time support for GLES2.
>+        https://bugs.webkit.org/show_bug.cgi?id=105816
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch adds build support for GLES2.
>+        GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
>+        cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
>+        address all the build issues related to GLES2 but only adds the needed support in
>+        OptionsEfl.cmake.
>+
>+        * Source/cmake/OptionsEfl.cmake:
>+
> 2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>
> 
>         [EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
>diff --git Source/WebCore/ChangeLog Source/WebCore/ChangeLog
>index 9141c25..bb32095 100644
>--- Source/WebCore/ChangeLog
>+++ Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-12-31  Kondapally Kalyan  <kalyan.kondapally@intel.com>
>+
>+        [EFL][WebGL] Add compile time support for GLES2.
>+        https://bugs.webkit.org/show_bug.cgi?id=105816
>+
>+        This patch adds build support for GLES2.
>+        GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
>+        cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
>+        address all the build issues related to GLES2 but only adds the needed support in
>+        PlatformEfl.cmake.
>+
>+        * PlatformEfl.cmake:
>+
> 2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>
> 
>         [EFL] [WebGL] Minor cleanup in PlatformContext.
>diff --git Source/WebCore/PlatformEfl.cmake Source/WebCore/PlatformEfl.cmake
>index 712db0a..e869706 100644
>--- Source/WebCore/PlatformEfl.cmake
>+++ Source/WebCore/PlatformEfl.cmake
>@@ -274,15 +274,12 @@ if (WTF_USE_3D_GRAPHICS)
>     endif ()
> 
>     list(APPEND WebCore_SOURCES
>-        platform/graphics/OpenGLShims.cpp
>         platform/graphics/cairo/DrawingBufferCairo.cpp
>         platform/graphics/efl/GraphicsContext3DEfl.cpp
>         platform/graphics/efl/GraphicsContext3DPrivate.cpp
>-        platform/graphics/opengl/Extensions3DOpenGL.cpp
>         platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>         platform/graphics/opengl/GLPlatformContext.cpp
>         platform/graphics/opengl/GLPlatformSurface.cpp
>-        platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>         platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
>         platform/graphics/surfaces/GraphicsSurface.cpp
>         platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
>@@ -306,6 +303,19 @@ if (WTF_USE_3D_GRAPHICS)
>         )
>     endif ()
> 
>+    if (WTF_USE_OPENGL_ES_2)
>+        list(APPEND WebCore_SOURCES
>+            platform/graphics/opengl/Extensions3DOpenGLES.cpp
>+            platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
>+        )
>+    else ()
>+        list(APPEND WebCore_SOURCES
>+            platform/graphics/opengl/Extensions3DOpenGL.cpp
>+            platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>+            platform/graphics/OpenGLShims.cpp
>+        )
>+    endif ()
>+
>     list(APPEND WebCore_LIBRARIES
>         ${X11_X11_LIB}
>         ${X11_Xcomposite_LIB}
>diff --git Source/cmake/OptionsEfl.cmake Source/cmake/OptionsEfl.cmake
>index fe202ef..181671f 100644
>--- Source/cmake/OptionsEfl.cmake
>+++ Source/cmake/OptionsEfl.cmake
>@@ -186,6 +186,16 @@ if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
>     if (EGL_FOUND)
>         set(WTF_USE_EGL 1)
>         add_definitions(-DWTF_USE_EGL=1)
>+        option(ENABLE_GLES2 ON)
>+
>+        if (ENABLE_GLES2)
>+            find_package(GLES REQUIRED)
>+        endif ()
>+
>+        if (OPENGLES2_FOUND)
>+            set(WTF_USE_OPENGL_ES_2 1)
>+            add_definitions(-DWTF_USE_OPENGL_ES_2=1)
>+        endif ()
>      elseif (OPENGLX_FOUND)
>          set(WTF_USE_GLX 1)
>          add_definitions(-DWTF_USE_GLX=1)

Flags:

kenneth: review+
webkit.review.bot: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 105816: 180847 | 180968 | 180977