[EFL] Build fix when compiling with GLES2 support enabled.

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

Patch by Kondapally Kalyan <kalyan.kondapally@intel.com> on 2013-03-04
Reviewed by Kenneth Rohde Christiansen.

This patch fixes build issues when compiling with GLES2
support. As part of the fix the patch removes Evas specific
workaround of using GLX with EGL in PlatformContext as GLES2
is the main target with EGL.

* platform/graphics/OpenGLESShims.h:
* platform/graphics/opengl/GLPlatformContext.cpp:
(WebCore::GLCurrentContextWrapper::GLCurrentContextWrapper):
* platform/graphics/texmap/TextureMapper.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a2a3442..9adfffe 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-03-04  Kondapally Kalyan  <kalyan.kondapally@intel.com>
+
+        [EFL] Build fix when compiling with GLES2 support enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=111291
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        This patch fixes build issues when compiling with GLES2
+        support. As part of the fix the patch removes Evas specific
+        workaround of using GLX with EGL in PlatformContext as GLES2 
+        is the main target with EGL.
+
+        * platform/graphics/OpenGLESShims.h:
+        * platform/graphics/opengl/GLPlatformContext.cpp:
+        (WebCore::GLCurrentContextWrapper::GLCurrentContextWrapper):
+        * platform/graphics/texmap/TextureMapper.h:
+
 2013-03-04  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Web Inspector: implement Flame Chart for CPU profiler.

diff --git a/Source/WebCore/platform/graphics/OpenGLESShims.h b/Source/WebCore/platform/graphics/OpenGLESShims.h
index bcaf855..4bb5b59 100644 (file)
--- a/Source/WebCore/platform/graphics/OpenGLESShims.h
+++ b/Source/WebCore/platform/graphics/OpenGLESShims.h
@@ -26,7 +26,7 @@
 #ifndef OpenGLESShims_h
 #define OpenGLESShims_h
 
-#if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(BLACKBERRY) || PLATFORM(QT) || PLATFORM(GTK) || PLATFORM(EFL)
 #define glBindFramebufferEXT glBindFramebuffer
 #define glFramebufferTexture2DEXT glFramebufferTexture2D
 #define glBindRenderbufferEXT glBindRenderbuffer

diff --git a/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp b/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp
index ced7bb8..bce0425 100644 (file)
--- a/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp
+++ b/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp
@@ -36,10 +36,6 @@
 
 #include "NotImplemented.h"
 
-#if HAVE(GLX)
-#include <GL/glx.h>
-#endif
-
 namespace WebCore {
 
 #if USE(OPENGL_ES_2)
@@ -55,8 +51,7 @@ public:
     GLCurrentContextWrapper()
         : GLPlatformContext()
     {
-        // FIXME:: This is a workaround until support to build evas with EGL has been added.
-#if USE(GLX) || PLATFORM(EFL)
+#if USE(GLX)
         m_contextHandle = glXGetCurrentContext();
 #elif USE(EGL)
         m_contextHandle = eglGetCurrentContext();

diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapper.h b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
index 71200ec..83fd0c6 100644 (file)
--- a/Source/WebCore/platform/graphics/texmap/TextureMapper.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapper.h
@@ -28,7 +28,7 @@
     #define TEXMAP_OPENGL_ES_2
 #endif
 #endif
-#if PLATFORM(GTK) && USE(OPENGL_ES_2)
+#if (PLATFORM(GTK) || PLATFORM(EFL)) && USE(OPENGL_ES_2)
 #define TEXMAP_OPENGL_ES_2
 #endif