Title: [205475] trunk/Source/WebKit2
- Revision
- 205475
- Author
- [email protected]
- Date
- 2016-09-06 04:28:32 -0700 (Tue, 06 Sep 2016)
Log Message
[GTK] glImageTargetTexture2D() is a GL function, rename accordingly
https://bugs.webkit.org/show_bug.cgi?id=161622
Patch by Emanuele Aina <[email protected]> on 2016-09-06
Reviewed by Carlos Garcia Campos.
glImageTargetTexture2D() is a GL function, not EGL, using the 'egl'
prefix is misleading.
* UIProcess/gtk/WaylandCompositor.cpp:
(WebKit::WaylandCompositor::Surface::prepareTextureForPainting):
(WebKit::WaylandCompositor::initializeEGL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205474 => 205475)
--- trunk/Source/WebKit2/ChangeLog 2016-09-06 11:19:52 UTC (rev 205474)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 11:28:32 UTC (rev 205475)
@@ -1,5 +1,19 @@
2016-09-06 Emanuele Aina <[email protected]>
+ [GTK] glImageTargetTexture2D() is a GL function, rename accordingly
+ https://bugs.webkit.org/show_bug.cgi?id=161622
+
+ Reviewed by Carlos Garcia Campos.
+
+ glImageTargetTexture2D() is a GL function, not EGL, using the 'egl'
+ prefix is misleading.
+
+ * UIProcess/gtk/WaylandCompositor.cpp:
+ (WebKit::WaylandCompositor::Surface::prepareTextureForPainting):
+ (WebKit::WaylandCompositor::initializeEGL):
+
+2016-09-06 Emanuele Aina <[email protected]>
+
[GTK][EFL] Make *_PROCESS_CMD_PREFIX conditional on DEVELOPER_MODE
https://bugs.webkit.org/show_bug.cgi?id=161621
Modified: trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp (205474 => 205475)
--- trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-09-06 11:19:52 UTC (rev 205474)
+++ trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp 2016-09-06 11:28:32 UTC (rev 205475)
@@ -77,7 +77,7 @@
static PFNEGLQUERYWAYLANDBUFFERWL eglQueryWaylandBuffer;
static PFNEGLCREATEIMAGEKHRPROC eglCreateImage;
static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImage;
-static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC eglImageTargetTexture2D;
+static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glImageTargetTexture2D;
WaylandCompositor& WaylandCompositor::singleton()
{
@@ -211,7 +211,7 @@
return false;
glBindTexture(GL_TEXTURE_2D, m_texture);
- eglImageTargetTexture2D(GL_TEXTURE_2D, m_image);
+ glImageTargetTexture2D(GL_TEXTURE_2D, m_image);
texture = m_texture;
textureSize = m_buffer->size();
@@ -345,9 +345,9 @@
return false;
}
- eglImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
- if (!eglImageTargetTexture2D) {
- WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture.");
+ glImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
+ if (!glImageTargetTexture2D) {
+ WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture2D.");
return false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
