Title: [134476] trunk/Source/WebCore
- Revision
- 134476
- Author
- [email protected]
- Date
- 2012-11-13 13:37:25 -0800 (Tue, 13 Nov 2012)
Log Message
[Qt] QNX build fails due to signature change in gl2.h header (glShaderSource)
https://bugs.webkit.org/show_bug.cgi?id=98038
Patch by Milian Wolff <[email protected]> on 2012-11-13
Reviewed by Simon Hausmann.
Cast the function to the expected type, just like it is done on non-Qt/OpenGL2 ES platforms.
* platform/graphics/OpenGLShims.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134475 => 134476)
--- trunk/Source/WebCore/ChangeLog 2012-11-13 21:25:18 UTC (rev 134475)
+++ trunk/Source/WebCore/ChangeLog 2012-11-13 21:37:25 UTC (rev 134476)
@@ -1,3 +1,15 @@
+2012-11-13 Milian Wolff <[email protected]>
+
+ [Qt] QNX build fails due to signature change in gl2.h header (glShaderSource)
+ https://bugs.webkit.org/show_bug.cgi?id=98038
+
+ Reviewed by Simon Hausmann.
+
+ Cast the function to the expected type, just like it is done on non-Qt/OpenGL2 ES platforms.
+
+ * platform/graphics/OpenGLShims.cpp:
+ (WebCore):
+
2012-11-13 Chris Fleizach <[email protected]>
WebKit exposes ARIA rowheader role as AXUnknown when not contained in table/grid
Modified: trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp (134475 => 134476)
--- trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2012-11-13 21:25:18 UTC (rev 134475)
+++ trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp 2012-11-13 21:37:25 UTC (rev 134476)
@@ -101,7 +101,7 @@
// With Angle only EGL/GLES2 extensions are available through eglGetProcAddress, not the regular standardized functions.
#define ASSIGN_FUNCTION_TABLE_ENTRY(FunctionName, success) \
- openGLFunctionTable()->FunctionName = ::FunctionName
+ openGLFunctionTable()->FunctionName = reinterpret_cast<FunctionName##Type>(::FunctionName)
#else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
