Changeset 205475 in webkit
- Timestamp:
- Sep 6, 2016 4:28:32 AM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r205474 r205475 1 2016-09-06 Emanuele Aina <emanuele.aina@collabora.com> 2 3 [GTK] glImageTargetTexture2D() is a GL function, rename accordingly 4 https://bugs.webkit.org/show_bug.cgi?id=161622 5 6 Reviewed by Carlos Garcia Campos. 7 8 glImageTargetTexture2D() is a GL function, not EGL, using the 'egl' 9 prefix is misleading. 10 11 * UIProcess/gtk/WaylandCompositor.cpp: 12 (WebKit::WaylandCompositor::Surface::prepareTextureForPainting): 13 (WebKit::WaylandCompositor::initializeEGL): 14 1 15 2016-09-06 Emanuele Aina <emanuele.aina@collabora.com> 2 16 -
trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp
r205397 r205475 78 78 static PFNEGLCREATEIMAGEKHRPROC eglCreateImage; 79 79 static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImage; 80 static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC eglImageTargetTexture2D;80 static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glImageTargetTexture2D; 81 81 82 82 WaylandCompositor& WaylandCompositor::singleton() … … 212 212 213 213 glBindTexture(GL_TEXTURE_2D, m_texture); 214 eglImageTargetTexture2D(GL_TEXTURE_2D, m_image);214 glImageTargetTexture2D(GL_TEXTURE_2D, m_image); 215 215 216 216 texture = m_texture; … … 346 346 } 347 347 348 eglImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));349 if (! eglImageTargetTexture2D) {350 WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture .");348 glImageTargetTexture2D = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES")); 349 if (!glImageTargetTexture2D) { 350 WTFLogAlways("WaylandCompositor requires glEGLImageTargetTexture2D."); 351 351 return false; 352 352 }
Note: See TracChangeset
for help on using the changeset viewer.