Title: [128877] trunk/Source/WebCore
- Revision
- 128877
- Author
- [email protected]
- Date
- 2012-09-18 05:21:44 -0700 (Tue, 18 Sep 2012)
Log Message
Fix compilation with Qt 5 on MeeGo 1.2 Harmattan
https://bugs.webkit.org/show_bug.cgi?id=96937
Patch by Simon Hausmann <[email protected]> on 2012-09-18
Reviewed by Jocelyn Turcotte.
The gl2ext.h header file on the platform is outdated. Instead use the newer copy from Qt
through implicit inclusion of qopengl.h. Since Qt's declarations are based on newer Khronos
headers, the multi sampling extensions do have the PROC suffix, we need the same workaround
as QNX.
* platform/graphics/opengl/Extensions3DOpenGLES.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128876 => 128877)
--- trunk/Source/WebCore/ChangeLog 2012-09-18 12:05:31 UTC (rev 128876)
+++ trunk/Source/WebCore/ChangeLog 2012-09-18 12:21:44 UTC (rev 128877)
@@ -1,3 +1,17 @@
+2012-09-18 Simon Hausmann <[email protected]>
+
+ Fix compilation with Qt 5 on MeeGo 1.2 Harmattan
+ https://bugs.webkit.org/show_bug.cgi?id=96937
+
+ Reviewed by Jocelyn Turcotte.
+
+ The gl2ext.h header file on the platform is outdated. Instead use the newer copy from Qt
+ through implicit inclusion of qopengl.h. Since Qt's declarations are based on newer Khronos
+ headers, the multi sampling extensions do have the PROC suffix, we need the same workaround
+ as QNX.
+
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+
2012-09-14 Andrey Kosyakov <[email protected]>
Web Inspector: [Extensions API] explicitly manage extension audit progress
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (128876 => 128877)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-09-18 12:05:31 UTC (rev 128876)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-09-18 12:21:44 UTC (rev 128877)
@@ -29,11 +29,17 @@
#include "Extensions3DOpenGLCommon.h"
+#if PLATFORM(QT)
+// Takes care of declaring the GLES extensions.
+#include <qopengl.h>
+#else
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
+#endif
-#if OS(QNX)
+#if OS(QNX) || PLATFORM(QT)
// See https://bugs.webkit.org/show_bug.cgi?id=91030.
+// Newer Khorons headers do define these with a PROC suffix, but older headers don't.
#define PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC
#define PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
