Changeset 205475 in webkit


Ignore:
Timestamp:
Sep 6, 2016 4:28:32 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] glImageTargetTexture2D() is a GL function, rename accordingly
https://bugs.webkit.org/show_bug.cgi?id=161622

Patch by Emanuele Aina <Emanuele Aina> 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):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r205474 r205475  
     12016-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
    1152016-09-06  Emanuele Aina  <emanuele.aina@collabora.com>
    216
  • trunk/Source/WebKit2/UIProcess/gtk/WaylandCompositor.cpp

    r205397 r205475  
    7878static PFNEGLCREATEIMAGEKHRPROC eglCreateImage;
    7979static PFNEGLDESTROYIMAGEKHRPROC eglDestroyImage;
    80 static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC eglImageTargetTexture2D;
     80static PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glImageTargetTexture2D;
    8181
    8282WaylandCompositor& WaylandCompositor::singleton()
     
    212212
    213213    glBindTexture(GL_TEXTURE_2D, m_texture);
    214     eglImageTargetTexture2D(GL_TEXTURE_2D, m_image);
     214    glImageTargetTexture2D(GL_TEXTURE_2D, m_image);
    215215
    216216    texture = m_texture;
     
    346346    }
    347347
    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.");
    351351        return false;
    352352    }
Note: See TracChangeset for help on using the changeset viewer.