Title: [144620] trunk/Source/WebCore
- Revision
- 144620
- Author
- [email protected]
- Date
- 2013-03-04 05:07:49 -0800 (Mon, 04 Mar 2013)
Log Message
[EFL] Build fix when compiling with GLES2 support enabled.
https://bugs.webkit.org/show_bug.cgi?id=111291
Patch by Kondapally Kalyan <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144619 => 144620)
--- trunk/Source/WebCore/ChangeLog 2013-03-04 13:00:36 UTC (rev 144619)
+++ trunk/Source/WebCore/ChangeLog 2013-03-04 13:07:49 UTC (rev 144620)
@@ -1,3 +1,20 @@
+2013-03-04 Kondapally Kalyan <[email protected]>
+
+ [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 <[email protected]>
Web Inspector: implement Flame Chart for CPU profiler.
Modified: trunk/Source/WebCore/platform/graphics/OpenGLESShims.h (144619 => 144620)
--- trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2013-03-04 13:00:36 UTC (rev 144619)
+++ trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2013-03-04 13:07:49 UTC (rev 144620)
@@ -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
Modified: trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp (144619 => 144620)
--- trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2013-03-04 13:00:36 UTC (rev 144619)
+++ trunk/Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp 2013-03-04 13:07:49 UTC (rev 144620)
@@ -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 @@
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();
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h (144619 => 144620)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2013-03-04 13:00:36 UTC (rev 144619)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2013-03-04 13:07:49 UTC (rev 144620)
@@ -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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
