Title: [220827] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 220827
- Author
- [email protected]
- Date
- 2017-08-16 23:08:47 -0700 (Wed, 16 Aug 2017)
Log Message
Merge r220522 - Unreviewed GTK+ build fix for ENABLE_GLES2=ON.
* platform/graphics/texmap/TextureMapperGLHeaders.h:
Define various GL constants that are not provided in GLES2 headers
but are only leveraged in OpenGL calls if at runtime the underlying
OpenGL is GLES2-capable.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220826 => 220827)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:41 UTC (rev 220826)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-17 06:08:47 UTC (rev 220827)
@@ -1,5 +1,14 @@
2017-08-10 Zan Dobersek <[email protected]>
+ Unreviewed GTK+ build fix for ENABLE_GLES2=ON.
+
+ * platform/graphics/texmap/TextureMapperGLHeaders.h:
+ Define various GL constants that are not provided in GLES2 headers
+ but are only leveraged in OpenGL calls if at runtime the underlying
+ OpenGL is GLES2-capable.
+
+2017-08-10 Zan Dobersek <[email protected]>
+
[TexMap] Remove GraphicsContext3D usage from BitmapTexturePool
https://bugs.webkit.org/show_bug.cgi?id=175319
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h (220826 => 220827)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h 2017-08-17 06:08:41 UTC (rev 220826)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h 2017-08-17 06:08:47 UTC (rev 220827)
@@ -33,3 +33,23 @@
#else
#include "OpenGLShims.h"
#endif
+
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
+#ifndef GL_TEXTURE_RECTANGLE_ARB
+#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
+#endif
+
+#ifndef GL_UNPACK_ROW_LENGTH
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#endif
+
+#ifndef GL_UNPACK_SKIP_ROWS
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#endif
+
+#ifndef GL_UNPACK_SKIP_PIXELS
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
