Title: [125039] trunk
- Revision
- 125039
- Author
- [email protected]
- Date
- 2012-08-08 08:42:32 -0700 (Wed, 08 Aug 2012)
Log Message
[Qt] Compile errors with OpenGLES2
https://bugs.webkit.org/show_bug.cgi?id=93206
Patch by Loïc Yhuel <[email protected]> on 2012-08-08
Reviewed by Noam Rosenthal.
Fix build with OpenGLES2 on Linux desktop
Source/WebCore:
* platform/graphics/OpenGLESShims.h: removed unused define conflicting with gl2ext.h from ANGLE
Tools:
* qmake/mkspecs/features/features.prf: Don't use GLX with OpenGLES2
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125038 => 125039)
--- trunk/Source/WebCore/ChangeLog 2012-08-08 15:18:25 UTC (rev 125038)
+++ trunk/Source/WebCore/ChangeLog 2012-08-08 15:42:32 UTC (rev 125039)
@@ -1,3 +1,14 @@
+2012-08-08 Loïc Yhuel <[email protected]>
+
+ [Qt] Compile errors with OpenGLES2
+ https://bugs.webkit.org/show_bug.cgi?id=93206
+
+ Reviewed by Noam Rosenthal.
+
+ Fix build with OpenGLES2 on Linux desktop
+
+ * platform/graphics/OpenGLESShims.h: removed unused define conflicting with gl2ext.h from ANGLE
+
2012-08-08 Pavel Feldman <[email protected]>
Web Inspector: store last evaluation result in $_
Modified: trunk/Source/WebCore/platform/graphics/OpenGLESShims.h (125038 => 125039)
--- trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2012-08-08 15:18:25 UTC (rev 125038)
+++ trunk/Source/WebCore/platform/graphics/OpenGLESShims.h 2012-08-08 15:42:32 UTC (rev 125039)
@@ -54,7 +54,6 @@
#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
#define FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x9134
-#define GL_MAX_SAMPLES_EXT 0x8D57
#endif // PLATFORM(BLACKBERRY)
#endif // OpenGLESShims_h
Modified: trunk/Tools/ChangeLog (125038 => 125039)
--- trunk/Tools/ChangeLog 2012-08-08 15:18:25 UTC (rev 125038)
+++ trunk/Tools/ChangeLog 2012-08-08 15:42:32 UTC (rev 125039)
@@ -1,3 +1,14 @@
+2012-08-08 Loïc Yhuel <[email protected]>
+
+ [Qt] Compile errors with OpenGLES2
+ https://bugs.webkit.org/show_bug.cgi?id=93206
+
+ Reviewed by Noam Rosenthal.
+
+ Fix build with OpenGLES2 on Linux desktop
+
+ * qmake/mkspecs/features/features.prf: Don't use GLX with OpenGLES2
+
2012-08-08 Peter Beverloo <[email protected]>
Introduce cr-android bots in the EWS system
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (125038 => 125039)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-08 15:18:25 UTC (rev 125038)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-08-08 15:42:32 UTC (rev 125039)
@@ -164,7 +164,7 @@
haveQt(5):linux-*:config_libXrender: DEFINES += HAVE_XRENDER=1
# GLX Support
-haveQt(5):linux-*:config_glx: DEFINES += HAVE_GLX=1
+haveQt(5):linux-*:config_glx:!contains(QT_CONFIG, opengles2): DEFINES += HAVE_GLX=1
# Support for Graphics Surface
!contains(DEFINES, WTF_USE_GRAPHICS_SURFACE=.) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
