Changeset 92130 in webkit

Timestamp:

Aug 1, 2011, 9:10:12 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] OpenGLShims does not build on ARM
​https://bugs.webkit.org/show_bug.cgi?id=65465

Patch by Benjamin Poulain <​benjamin@webkit.org> on 2011-08-01
Reviewed by Noam Rosenthal.

Fix the build with OpenGL ES 2:
-lookupOpenGLFunctionAddress() was defined but not used for OpenGL ES.
-glBlitFramebuffer() and glRenderbufferStorageMultisample() are not part of the specification.
When those are available as platform extension, the extension has been added.
-GLchar is not defined on some platform. The patch adds the same typedef as the official definition
to avoid conflicts.

• platform/graphics/cairo/OpenGLShims.cpp:

(lookupOpenGLFunctionAddress):
(WebCore::initializeOpenGLShims):

• platform/graphics/cairo/OpenGLShims.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/OpenGLShims.cpp (modified) (4 diffs)
• platform/graphics/cairo/OpenGLShims.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-01  Benjamin Poulain  <benjamin@webkit.org>
+
+        [Qt] OpenGLShims does not build on ARM
+        https://bugs.webkit.org/show_bug.cgi?id=65465
+
+        Reviewed by Noam Rosenthal.
+
+        Fix the build with OpenGL ES 2:
+        -lookupOpenGLFunctionAddress() was defined but not used for OpenGL ES.
+        -glBlitFramebuffer() and glRenderbufferStorageMultisample() are not part of the specification.
+        When those are available as platform extension, the extension has been added.
+        -GLchar is not defined on some platform. The patch adds the same typedef as the official definition
+        to avoid conflicts.
+
+        * platform/graphics/cairo/OpenGLShims.cpp:
+        (lookupOpenGLFunctionAddress):
+        (WebCore::initializeOpenGLShims):
+        * platform/graphics/cairo/OpenGLShims.h:
+
 2011-08-01  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp

@@ -27 +27 @@
 #include <wtf/text/WTFString.h>
 
+namespace WebCore {
+
+OpenGLFunctionTable* openGLFunctionTable()
+{
+    static OpenGLFunctionTable table;
+    return &table;
+}
+
 #if PLATFORM(QT) && defined(QT_OPENGL_ES_2)
 #define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
     openGLFunctionTable()->FunctionName = ::FunctionName
 #else
-#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
-    openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(lookupOpenGLFunctionAddress(#FunctionName, success))
-#endif
-
-namespace WebCore {
 
 #if PLATFORM(QT)
@@ -87 +90 @@
 }
 
-OpenGLFunctionTable* openGLFunctionTable()
-{
-    static OpenGLFunctionTable table;
-    return &table;
-}
+#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
+    openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(lookupOpenGLFunctionAddress(#FunctionName, success))
+#endif
 
 bool initializeOpenGLShims()
@@ -111 +112 @@
     ASSIGN_FUNCTION_TABLE_ENTRY(glBlendEquationSeparate, success);
     ASSIGN_FUNCTION_TABLE_ENTRY(glBlendFuncSeparate, success);
+#if defined(GL_ES_VERSION_2_0)
+
+#if defined(GL_ANGLE_framebuffer_blit)
+    openGLFunctionTable()->glBlitFramebuffer = ::GL_ANGLE_framebuffer_blit;
+#else
+    openGLFunctionTable()->glBlitFramebuffer = 0;
+#endif
+
+#else
     ASSIGN_FUNCTION_TABLE_ENTRY(glBlitFramebuffer, success);
+#endif
     ASSIGN_FUNCTION_TABLE_ENTRY(glBufferData, success);
     ASSIGN_FUNCTION_TABLE_ENTRY(glBufferSubData, success);
@@ -157 +168 @@
     ASSIGN_FUNCTION_TABLE_ENTRY(glLinkProgram, success);
     ASSIGN_FUNCTION_TABLE_ENTRY(glRenderbufferStorage, success);
+#if defined(GL_ES_VERSION_2_0)
+
+#if defined(GL_APPLE_framebuffer_multisample)
+    openGLFunctionTable()->glRenderbufferStorageMultisample = ::glRenderbufferStorageMultisampleAPPLE;
+#elif defined(GL_ANGLE_framebuffer_multisample)
+    openGLFunctionTable()->glRenderbufferStorageMultisample = ::glRenderbufferStorageMultisampleANGLE;
+#else
+    openGLFunctionTable()->glRenderbufferStorageMultisample = 0;
+#endif
+
+#else
     ASSIGN_FUNCTION_TABLE_ENTRY(glRenderbufferStorageMultisample, success);
+#endif
     ASSIGN_FUNCTION_TABLE_ENTRY(glSampleCoverage, success);
     ASSIGN_FUNCTION_TABLE_ENTRY(glShaderSource, success);

trunk/Source/WebCore/platform/graphics/cairo/OpenGLShims.h

@@ -22 +22 @@
 #else
 #include <GL/gl.h>
+#endif
+
+#if defined(GL_ES_VERSION_2_0)
+// Some openGL ES systems miss this typedef.
+typedef char GLchar;
 #endif