Title: [135463] trunk
- Revision
- 135463
- Author
- [email protected]
- Date
- 2012-11-21 19:08:46 -0800 (Wed, 21 Nov 2012)
Log Message
[EFL] GLX detection is broken.
https://bugs.webkit.org/show_bug.cgi?id=102687.
Patch by Kondapally Kalyan <[email protected]> on 2012-11-21
Reviewed by Laszlo Gombos.
HAVE_GLX is enabled only if WebGL is enabled. This is wrong and we should
explicitly test for GLX support.
This patch makes changes so that we check for glx.h header and sets HAVE_GLX flag appropriately.
* Source/cmake/OptionsEfl.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (135462 => 135463)
--- trunk/ChangeLog 2012-11-22 03:05:34 UTC (rev 135462)
+++ trunk/ChangeLog 2012-11-22 03:08:46 UTC (rev 135463)
@@ -1,3 +1,16 @@
+2012-11-21 Kondapally Kalyan <[email protected]>
+
+ [EFL] GLX detection is broken.
+ https://bugs.webkit.org/show_bug.cgi?id=102687.
+
+ Reviewed by Laszlo Gombos.
+
+ HAVE_GLX is enabled only if WebGL is enabled. This is wrong and we should
+ explicitly test for GLX support.
+ This patch makes changes so that we check for glx.h header and sets HAVE_GLX flag appropriately.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-11-21 Yael Aharon <[email protected]>
[EFL] Turn on WTF_USE_TILED_BACKING_STORE by default
Modified: trunk/Source/cmake/OptionsEfl.cmake (135462 => 135463)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-11-22 03:05:34 UTC (rev 135462)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-11-22 03:08:46 UTC (rev 135463)
@@ -152,8 +152,13 @@
FIND_PACKAGE(GStreamer REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
ENDIF ()
-IF (ENABLE_WEBGL)
- FIND_PACKAGE(OpenGL REQUIRED)
+IF (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE)
+ FIND_PACKAGE(OpenGL REQUIRED)
+ CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
+
+ IF (OPENGLX_FOUND)
+ ADD_DEFINITIONS(-DHAVE_GLX)
+ ENDIF()
ENDIF ()
IF (ENABLE_INSPECTOR)
@@ -177,14 +182,11 @@
SET(ENABLE_3D_RENDERING 1)
ADD_DEFINITIONS(-DENABLE_3D_RENDERING=1)
-
- FIND_PACKAGE(OpenGL REQUIRED)
ENDIF()
IF (ENABLE_WEBGL)
SET (ENABLE_WEBGL 1)
ADD_DEFINITIONS(-DWTF_USE_GRAPHICS_SURFACE=1)
- ADD_DEFINITIONS(-DHAVE_GLX)
ENDIF()
IF (ENABLE_SPELLCHECK)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
