Title: [210165] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 210165
- Author
- [email protected]
- Date
- 2016-12-27 03:52:31 -0800 (Tue, 27 Dec 2016)
Log Message
Merge r210133 - [GTK] GLES build broken since r208997
https://bugs.webkit.org/show_bug.cgi?id=166455
Unreviewed. Fix the preprocessor guards here; this code is incompatible with GLES2.
Looks like it's been broken for a month. Typical!
* platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
(WebCore::Extensions3DOpenGLCommon::initializeAvailableExtensions):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (210164 => 210165)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 11:52:23 UTC (rev 210164)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-27 11:52:31 UTC (rev 210165)
@@ -1,3 +1,15 @@
+2016-12-22 Michael Catanzaro <[email protected]>
+
+ [GTK] GLES build broken since r208997
+ https://bugs.webkit.org/show_bug.cgi?id=166455
+
+ Unreviewed. Fix the preprocessor guards here; this code is incompatible with GLES2.
+
+ Looks like it's been broken for a month. Typical!
+
+ * platform/graphics/opengl/Extensions3DOpenGLCommon.cpp:
+ (WebCore::Extensions3DOpenGLCommon::initializeAvailableExtensions):
+
2016-11-28 Miguel Gomez <[email protected]>
[GTK] Dramatic increase on memory usage since 2.14.x
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp (210164 => 210165)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2016-12-27 11:52:23 UTC (rev 210164)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp 2016-12-27 11:52:31 UTC (rev 210165)
@@ -209,7 +209,7 @@
void Extensions3DOpenGLCommon::initializeAvailableExtensions()
{
-#if PLATFORM(MAC) || PLATFORM(GTK)
+#if PLATFORM(MAC) || (PLATFORM(GTK) && !USE(OPENGL_ES_2))
if (m_useIndexedGetString) {
GLint numExtensions = 0;
::glGetIntegerv(GL_NUM_EXTENSIONS, &numExtensions);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
