Changeset 128877 in webkit

Timestamp:

Sep 18, 2012 5:21:44 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Fix compilation with Qt 5 on MeeGo 1.2 Harmattan
​https://bugs.webkit.org/show_bug.cgi?id=96937

Patch by Simon Hausmann <​simon.hausmann@digia.com> 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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/opengl/Extensions3DOpenGLES.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-18  Simon Hausmann  <simon.hausmann@digia.com>
+
+        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  <caseq@chromium.org>
 

trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h

@@ -30 +30 @@
 #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