Lighthouse Wayland: wayland-egl entry points where renamed

Conflicts:

	src/plugins/platforms/wayland/qwaylanddisplay.cpp
	src/plugins/platforms/wayland/qwaylanddrmsurface.cpp

2 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 2e30c2f..0747afd 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -184,7 +184,7 @@ QWaylandDisplay::QWaylandDisplay(void)
     wl_display_add_global_listener(mDisplay,
                                    QWaylandDisplay::displayHandleGlobal, this);
 
-    mNativeEglDisplay = wl_egl_native_display_create(mDisplay);
+    mNativeEglDisplay = wl_egl_display_create(mDisplay);
 
     mEglDisplay = eglGetDisplay(mNativeEglDisplay);
     if (mEglDisplay == NULL) {
diff --git a/src/plugins/platforms/wayland/qwaylanddrmsurface.cpp b/src/plugins/platforms/wayland/qwaylanddrmsurface.cpp
index a9a8046..aaf4a5c 100644
--- a/src/plugins/platforms/wayland/qwaylanddrmsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddrmsurface.cpp
@@ -77,9 +77,9 @@ QWaylandDrmBuffer::QWaylandDrmBuffer(QWaylandDisplay *display,
 	break;
     }
 
-    mPixmap = wl_egl_native_pixmap_create(display->nativeDisplay(),
-					  size.width(), size.height(),
-					  visual, 0);
+    mPixmap = wl_egl_pixmap_create(display->nativeDisplay(),
+				   size.width(), size.height(),
+				   visual, 0);
 
     mImage = eglCreateImageKHR(display->eglDisplay(),
 			       NULL, EGL_NATIVE_PIXMAP_KHR,
@@ -90,15 +90,14 @@ QWaylandDrmBuffer::QWaylandDrmBuffer(QWaylandDisplay *display,
     glBindTexture(GL_TEXTURE_2D, mTexture);
     glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, mImage);
 
-    mBuffer = wl_egl_native_pixmap_create_buffer(display->nativeDisplay(),
-						 mPixmap);
+    mBuffer = wl_egl_pixmap_create_buffer(display->nativeDisplay(), mPixmap);
 }
 
 QWaylandDrmBuffer::~QWaylandDrmBuffer(void)
 {
     glDeleteTextures(1, &mTexture);
     eglDestroyImageKHR(mDisplay->eglDisplay(), mImage);
-    wl_egl_native_pixmap_destroy(mPixmap);
+    wl_egl_pixmap_destroy(mPixmap);
     wl_buffer_destroy(mBuffer);
 }