Attachment 180847 Details for Bug 105816 – patch

[patch] patch

confighelp.patch (text/plain), 4.27 KB, created by Kalyan on 2012-12-27 22:54:23 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Kalyan

Created: 2012-12-27 22:54:23 PST

Size: 4.27 KB

patch

obsolete

>diff --git ChangeLog ChangeLog
>index eac52e5..d6ca836 100644
>--- ChangeLog
>+++ ChangeLog
>@@ -1,5 +1,20 @@
> 2012-12-27  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-27  Kondapally Kalyan  <kalyan.kondapally@intel.com>
>+
>         [EFL][WebGL] Implement EGL support with GLX.
>         https://bugs.webkit.org/show_bug.cgi?id=105602
> 
>diff --git Source/WebCore/ChangeLog Source/WebCore/ChangeLog
>index d063e81..a7a1aca 100644
>--- Source/WebCore/ChangeLog
>+++ Source/WebCore/ChangeLog
>@@ -1,5 +1,18 @@
> 2012-12-27  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-27  Kondapally Kalyan  <kalyan.kondapally@intel.com>
>+
>         [EFL][WebGL] Add OPENGL_ES_2 checks.
>         https://bugs.webkit.org/show_bug.cgi?id=105805
> 
>diff --git Source/WebCore/PlatformEfl.cmake Source/WebCore/PlatformEfl.cmake
>index e7e469c..2fcfcc2 100644
>--- Source/WebCore/PlatformEfl.cmake
>+++ Source/WebCore/PlatformEfl.cmake
>@@ -274,7 +274,6 @@ 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
>@@ -282,7 +281,6 @@ if (WTF_USE_3D_GRAPHICS)
>         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
>@@ -293,6 +291,7 @@ if (WTF_USE_3D_GRAPHICS)
> 
>     if (WTF_USE_EGL)
>         list(APPEND WebCore_SOURCES
>+            platform/graphics/surfaces/egl/EGLConfigHelper.cpp
>             platform/graphics/surfaces/egl/EGLSurface.cpp
>             platform/graphics/surfaces/egl/EGLContext.cpp
>         )
>@@ -305,6 +304,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)

Actions: View | Formatted Diff | Diff

Attachments on bug 105816: 180847 | 180968 | 180977