Title: [146637] trunk/Source
- Revision
- 146637
- Author
- [email protected]
- Date
- 2013-03-22 11:47:36 -0700 (Fri, 22 Mar 2013)
Log Message
[GTK] Include the right GL header for GLES2
https://bugs.webkit.org/show_bug.cgi?id=113034
Reviewed by Martin Robinson.
Include GLES2/gl2.h when using GLES2.
Source/WebKit/gtk:
* WebCoreSupport/AcceleratedCompositingContextGL.cpp:
Source/WebKit2:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (146636 => 146637)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-03-22 18:38:23 UTC (rev 146636)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-03-22 18:47:36 UTC (rev 146637)
@@ -1,3 +1,14 @@
+2013-03-22 Mario Sanchez Prada <[email protected]>
+
+ [GTK] Include the right GL header for GLES2
+ https://bugs.webkit.org/show_bug.cgi?id=113034
+
+ Reviewed by Martin Robinson.
+
+ Include GLES2/gl2.h when using GLES2.
+
+ * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
+
2013-03-20 Zan Dobersek <[email protected]>
[GTK] Build ANGLE sources into a separate library from libWebCore.la
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (146636 => 146637)
--- trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-03-22 18:38:23 UTC (rev 146636)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-03-22 18:47:36 UTC (rev 146637)
@@ -32,7 +32,13 @@
#include "TextureMapperGL.h"
#include "TextureMapperLayer.h"
#include "webkitwebviewprivate.h"
+
+#if USE(OPENGL_ES_2)
+#include <GLES2/gl2.h>
+#else
#include <GL/gl.h>
+#endif
+
#include <cairo.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
Modified: trunk/Source/WebKit2/ChangeLog (146636 => 146637)
--- trunk/Source/WebKit2/ChangeLog 2013-03-22 18:38:23 UTC (rev 146636)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-22 18:47:36 UTC (rev 146637)
@@ -1,3 +1,14 @@
+2013-03-22 Mario Sanchez Prada <[email protected]>
+
+ [GTK] Include the right GL header for GLES2
+ https://bugs.webkit.org/show_bug.cgi?id=113034
+
+ Reviewed by Martin Robinson.
+
+ Include GLES2/gl2.h when using GLES2.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+
2013-03-22 Timothy Hatcher <[email protected]>
Fix an assert when opening the Web Inspector window for the first time.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (146636 => 146637)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2013-03-22 18:38:23 UTC (rev 146636)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2013-03-22 18:47:36 UTC (rev 146637)
@@ -33,7 +33,13 @@
#include "TextureMapperGL.h"
#include "WebPage.h"
#include "WebProcess.h"
+
+#if USE(OPENGL_ES_2)
+#include <GLES2/gl2.h>
+#else
#include <GL/gl.h>
+#endif
+
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
#include <WebCore/GLContext.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
