Title: [122413] trunk/Source/WebCore
- Revision
- 122413
- Author
- [email protected]
- Date
- 2012-07-11 20:54:08 -0700 (Wed, 11 Jul 2012)
Log Message
Compilation error with GLES2 when using gl2ext.h from ANGLE.
https://bugs.webkit.org/show_bug.cgi?id=91030
Reviewed by Kenneth Russell.
gl2ext.h defines PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG and not
PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC. This is a bug in the original Khronos header,
but we should work around it until fixed headers are integrated.
* platform/graphics/opengl/Extensions3DOpenGLES.h:
(Extensions3DOpenGLES):
Removed the "PROC" suffix to work around the header bug.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122412 => 122413)
--- trunk/Source/WebCore/ChangeLog 2012-07-12 03:23:38 UTC (rev 122412)
+++ trunk/Source/WebCore/ChangeLog 2012-07-12 03:54:08 UTC (rev 122413)
@@ -1,3 +1,19 @@
+2012-07-11 No'am Rosenthal <[email protected]>
+
+ Compilation error with GLES2 when using gl2ext.h from ANGLE.
+ https://bugs.webkit.org/show_bug.cgi?id=91030
+
+ Reviewed by Kenneth Russell.
+
+ gl2ext.h defines PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG and not
+ PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC. This is a bug in the original Khronos header,
+ but we should work around it until fixed headers are integrated.
+
+
+ * platform/graphics/opengl/Extensions3DOpenGLES.h:
+ (Extensions3DOpenGLES):
+ Removed the "PROC" suffix to work around the header bug.
+
2012-07-11 Mark Rowe <[email protected]>
Attempt to fix the Chromium Mac build after r122400.
Modified: trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h (122412 => 122413)
--- trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-07-12 03:23:38 UTC (rev 122412)
+++ trunk/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLES.h 2012-07-12 03:54:08 UTC (rev 122413)
@@ -57,8 +57,8 @@
bool m_supportsOESvertexArrayObject;
bool m_supportsIMGMultisampledRenderToTexture;
- PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC m_glFramebufferTexture2DMultisampleIMG;
- PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC m_glRenderbufferStorageMultisampleIMG;
+ PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG m_glFramebufferTexture2DMultisampleIMG;
+ PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG m_glRenderbufferStorageMultisampleIMG;
PFNGLBINDVERTEXARRAYOESPROC m_glBindVertexArrayOES;
PFNGLDELETEVERTEXARRAYSOESPROC m_glDeleteVertexArraysOES;
PFNGLGENVERTEXARRAYSOESPROC m_glGenVertexArraysOES;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
