Get rid of QOpenGLContext dependency in WaylandCompositor constructor.

Now WaylandSurface::texture() takes a QOpenGLContext * instead. This
prevents a crash in qml-compositor against wayland_egl, since the
context was 0 (it's created behind the scenes by scene graph at a
later point).

Change-Id: Ia02f596922ad0edea602dfe12b411ec827d47669
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index 3ff3583..7f2d47b 100644 (file)
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -57,7 +57,7 @@ class QmlCompositor : public QQuickView, public WaylandCompositor
 {
     Q_OBJECT
 public:
-    QmlCompositor() : WaylandCompositor(this, const_cast<QOpenGLContext *>(QOpenGLContext::currentContext())) {
+    QmlCompositor() : WaylandCompositor(this) {
         //setMouseTracking(true);
         setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
         setResizeMode(QQuickView::SizeRootObjectToView);

diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
index 8e71860..ea7ed34 100644 (file)
--- a/examples/qwidget-compositor/main.cpp
+++ b/examples/qwidget-compositor/main.cpp
@@ -49,7 +49,7 @@
 #include <QMouseEvent>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include <QGLContext>
+#include <QOpenGLContext>
 #include <QGLWidget>
 #endif
 
@@ -82,7 +82,7 @@ class QWidgetCompositor : public QWidget, public WaylandCompositor
     Q_OBJECT
 public:
     QWidgetCompositor()
-        : WaylandCompositor(windowHandle(),const_cast<QGLContext *>(context())->contextHandle())
+        : WaylandCompositor(windowHandle())
         , m_moveSurface(0)
         , m_dragSourceSurface(0)
     {
@@ -155,7 +155,7 @@ protected:
         for (int i = 0; i < m_surfaces.size(); ++i) {
             if (m_surfaces.at(i)->type() == WaylandSurface::Texture) {
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-                drawTexture(m_surfaces.at(i)->geometry(), m_surfaces.at(i)->texture());
+                drawTexture(m_surfaces.at(i)->geometry(), m_surfaces.at(i)->texture(QOpenGLContext::currentContext()));
                 break;
 #endif //QT_COMPOSITOR_WAYLAND_GL
             } else if (m_surfaces.at(i)->type() == WaylandSurface::Shm) {

diff --git a/examples/qwidget-compositor/qwidget-compositor.pro b/examples/qwidget-compositor/qwidget-compositor.pro
index 88dd757..98bcb0c 100644 (file)
--- a/examples/qwidget-compositor/qwidget-compositor.pro
+++ b/examples/qwidget-compositor/qwidget-compositor.pro
@@ -28,7 +28,7 @@ isEmpty(QT_SOURCE_TREE) {
 #HEADERS += $$TOUCHSCREEN_BASE/qtouchscreen.h
 #INCLUDEPATH += $$TOUCHSCREEN_BASE
 #LIBS += -ludev -lmtdev
-QT += gui-private widgets widgets-private
+QT += gui-private widgets widgets-private opengl opengl-private
 
 target.path += $$[QT_INSTALL_DATA]/bin
 INSTALLS += target

diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp
index d5fcb84..d1f017f 100644 (file)
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/qwindow-compositor/qwindowcompositor.cpp
@@ -4,7 +4,7 @@
 #include <QTouchEvent>
 
 QWindowCompositor::QWindowCompositor(QOpenGLWindow *window)
-    : WaylandCompositor(window, window->context())
+    : WaylandCompositor(window)
     , m_window(window)
 {
     m_backgroundImage = QImage(QLatin1String(":/background.jpg"));
@@ -100,7 +100,7 @@ void QWindowCompositor::render()
     //If type == WaylandSurface::Texture draw textureId at geometry
     foreach (WaylandSurface *surface, m_surfaces) {
         if (surface->type() == WaylandSurface::Texture)
-            m_renderer->drawTexture(surface->texture(), surface->geometry(), 1); //depth argument should be dynamic (focused should be top).
+            m_renderer->drawTexture(surface->texture(QOpenGLContext::currentContext()), surface->geometry(), 1); //depth argument should be dynamic (focused should be top).
         else if (surface->type() == WaylandSurface::Shm)
             m_renderer->drawImage(surface->image(), surface->geometry());
     }

diff --git a/src/qt-compositor/compositor_api/compositor_api.pri b/src/qt-compositor/compositor_api/compositor_api.pri
index dfae71b..1072662 100644 (file)
--- a/src/qt-compositor/compositor_api/compositor_api.pri
+++ b/src/qt-compositor/compositor_api/compositor_api.pri
@@ -17,5 +17,5 @@ contains(QT, declarative) {
 
 !isEmpty(QT.core.MAJOR_VERSION):greaterThan(QT.core.MAJOR_VERSION, 4) {
     QT += core-private
-    contains(QT, declarative):QT += declarative-private opengl-private gui-private
+    contains(QT, declarative):QT += declarative-private gui-private
 }

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp
index c8cff06..a42950f 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.cpp
+++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp
@@ -50,9 +50,8 @@
 #include "waylandsurfaceitem.h"
 #endif
 
-WaylandCompositor::WaylandCompositor(QWindow *window, QOpenGLContext *context, const char *socketName)
+WaylandCompositor::WaylandCompositor(QWindow *window, const char *socketName)
     : m_compositor(0)
-    , m_glContext(context)
     , m_toplevel_widget(window)
     , m_socket_name(socketName)
 {
@@ -110,11 +109,6 @@ WaylandSurface *WaylandCompositor::directRenderSurface() const
     return surf ? surf->handle() : 0;
 }
 
-QOpenGLContext * WaylandCompositor::glContext() const
-{
-    return m_glContext;
-}
-
 QWindow * WaylandCompositor::window() const
 {
     return m_toplevel_widget;

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h
index de5a4a8..9f2973a 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/qt-compositor/compositor_api/waylandcompositor.h
@@ -44,9 +44,7 @@
 #include <QObject>
 #include <QImage>
 #include <QRect>
-#include <QOpenGLContext>
 
-class QGLContext;
 class QWidget;
 class QMimeData;
 class WaylandSurface;
@@ -59,7 +57,7 @@ namespace Wayland
 class WaylandCompositor
 {
 public:
-    WaylandCompositor(QWindow *window = 0, QOpenGLContext *context = 0, const char *socketName = 0);
+    WaylandCompositor(QWindow *window = 0, const char *socketName = 0);
     virtual ~WaylandCompositor();
 
     void frameFinished(WaylandSurface *surface = 0);
@@ -71,7 +69,6 @@ public:
     void setDirectRenderSurface(WaylandSurface *surface);
     WaylandSurface *directRenderSurface() const;
 
-    QOpenGLContext *glContext() const;
     QWindow *window()const;
 
     virtual void surfaceCreated(WaylandSurface *surface) = 0;
@@ -97,7 +94,6 @@ private:
     static void retainedSelectionChanged(QMimeData *mimeData, void *param);
 
     Wayland::Compositor *m_compositor;
-    QOpenGLContext *m_glContext;
     QWindow  *m_toplevel_widget;
     QByteArray m_socket_name;
 };

diff --git a/src/qt-compositor/compositor_api/waylandsurface.cpp b/src/qt-compositor/compositor_api/waylandsurface.cpp
index f16a03f..8fdc737 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurface.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurface.cpp
@@ -52,17 +52,16 @@ QImage WaylandSurface::image() const
 }
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-GLuint WaylandSurface::texture() const
+GLuint WaylandSurface::texture(QOpenGLContext *context) const
 {
     Q_D(const WaylandSurface);
-    return d->surface->textureId();
+    return d->surface->textureId(context);
 }
 #else //QT_COMPOSITOR_WAYLAND_GL
-uint WaylandSurface::texture() const
+uint WaylandSurface::texture(QOpenGLContext *) const
 {
     return 0;
 }
-
 #endif
 
 Wayland::Surface * WaylandSurface::handle() const

diff --git a/src/qt-compositor/compositor_api/waylandsurface.h b/src/qt-compositor/compositor_api/waylandsurface.h
index dd6685b..d7cb218 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurface.h
+++ b/src/qt-compositor/compositor_api/waylandsurface.h
@@ -46,7 +46,8 @@
 #include <QtCore/QVariantMap>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include <QtOpenGL/QGLContext>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/qopengl.h>
 #endif
 
 class WaylandSurfacePrivate;
@@ -78,9 +79,9 @@ public:
 
     QImage image() const;
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    GLuint texture() const;
+    GLuint texture(QOpenGLContext *context) const;
 #else
-    uint texture() const;
+    uint texture(QOpenGLContext *context) const;
 #endif
 
     void sendMousePressEvent(const QPoint &pos, Qt::MouseButton button);

diff --git a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
index e17767a..bf91499 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurfaceitem.cpp
@@ -225,8 +225,10 @@ QSGNode *WaylandSurfaceItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
     if (m_damaged) {
         QSGTexture *oldTexture = m_texture;
         if (m_surface->type() == WaylandSurface::Texture) {
+            QOpenGLContext *context = QOpenGLContext::currentContext();
+
             QSGEngine::TextureOption opt = useTextureAlpha() ? QSGEngine::TextureHasAlphaChannel : QSGEngine::TextureOption(0);
-            m_texture = canvas()->sceneGraphEngine()->createTextureFromId(m_surface->texture(),
+            m_texture = canvas()->sceneGraphEngine()->createTextureFromId(m_surface->texture(context),
                                                                           m_surface->geometry().size(),
                                                                           opt);
         } else {

diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
index 0b021d3..0d16f78 100644 (file)
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
@@ -116,7 +116,7 @@ void Dri2XcbHWIntegration::initializeHardware(Wayland::Display *waylandDisplay)
     waylandDisplay->addGlobalObject(m_drm_object->base(),&wl_drm_interface,&drm_interface,post_drm_device);
 }
 
-GLuint Dri2XcbHWIntegration::createTextureFromBuffer(wl_buffer *buffer)
+GLuint Dri2XcbHWIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *)
 {
     Dri2XcbBuffer *dri2Buffer = Wayland::wayland_cast<Dri2XcbBuffer *>(buffer);
 

diff --git a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
index e54debd..9ed3558 100644 (file)
--- a/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
@@ -12,7 +12,7 @@ public:
 
     void initializeHardware(Wayland::Display *waylandDisplay);
 
-    GLuint createTextureFromBuffer(wl_buffer *buffer);
+    GLuint createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *context);
 
 private:
     DrmObject *m_drm_object;

diff --git a/src/qt-compositor/hardware_integration/graphicshardwareintegration.h b/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
index 339e20a..9f1f409 100644 (file)
--- a/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
+++ b/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
@@ -57,7 +57,7 @@ public:
     /** Bind the Wayland buffer to the textureId. The correct context is the current context,
         so there is no need to do makeCurrent in this function.
      **/
-    virtual GLuint createTextureFromBuffer(struct wl_buffer *buffer) = 0;
+    virtual GLuint createTextureFromBuffer(struct wl_buffer *buffer, QOpenGLContext *context) = 0;
     virtual bool isYInverted(struct wl_buffer *) const { return true; }
 
     virtual bool setDirectRenderSurface(WaylandSurface *) {return false;}

diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri
index c7533bd..02a834b 100644 (file)
--- a/src/qt-compositor/hardware_integration/hardware_integration.pri
+++ b/src/qt-compositor/hardware_integration/hardware_integration.pri
@@ -8,7 +8,6 @@ isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
         $$PWD/graphicshardwareintegration.cpp
 
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
-    QT += opengl
 
     isEqual(QT_WAYLAND_GL_CONFIG, custom) {
         QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG

diff --git a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp b/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
index 2d8fb19..80e1aec 100644 (file)
--- a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
+++ b/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.cpp
@@ -64,10 +64,8 @@ class WaylandEglIntegrationPrivate
 public:
     WaylandEglIntegrationPrivate()
         : egl_display(EGL_NO_DISPLAY)
-        , egl_context(EGL_NO_CONTEXT)
     { }
     EGLDisplay egl_display;
-    EGLContext egl_context;
     bool valid;
 };
 
@@ -81,8 +79,6 @@ WaylandEglIntegration::WaylandEglIntegration(WaylandCompositor *compositor)
 void WaylandEglIntegration::initializeHardware(Wayland::Display *waylandDisplay)
 {
     Q_D(WaylandEglIntegration);
-    //We need a window id now :)
-    m_compositor->window()->winId();
 
     QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
     if (nativeInterface) {
@@ -98,12 +94,10 @@ void WaylandEglIntegration::initializeHardware(Wayland::Display *waylandDisplay)
 
         if (!d->valid)
             qWarning("Failed to initialize egl display\n");
-
-        d->egl_context = nativeInterface->nativeResourceForContext("EglContext", m_compositor->glContext());
     }
 }
 
-GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer)
+GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *context)
 {
     Q_D(WaylandEglIntegration);
     if (!d->valid) {
@@ -111,7 +105,10 @@ GLuint WaylandEglIntegration::createTextureFromBuffer(wl_buffer *buffer)
         return 0;
     }
 
-    EGLImageKHR image = eglCreateImageKHR(d->egl_display, d->egl_context,
+    QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface();
+    EGLContext egl_context = nativeInterface->nativeResourceForContext("EglContext", context);
+
+    EGLImageKHR image = eglCreateImageKHR(d->egl_display, egl_context,
                                           EGL_WAYLAND_BUFFER_WL,
                                           buffer, NULL);
 

diff --git a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h b/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h
index 4e98d18..39a63c6 100644 (file)
--- a/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h
+++ b/src/qt-compositor/hardware_integration/wayland_egl/waylandeglintegration.h
@@ -54,7 +54,7 @@ public:
 
     void initializeHardware(Wayland::Display *waylandDisplay);
 
-    GLuint createTextureFromBuffer(wl_buffer *buffer);
+    GLuint createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *context);
 
     bool setDirectRenderSurface(WaylandSurface *);
     bool postBuffer(struct wl_buffer *);

diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
index e32183a..c730a35 100644 (file)
--- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
+++ b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.cpp
@@ -60,7 +60,7 @@ void XCompositeEglIntegration::initializeHardware(Wayland::Display *waylandDispl
     waylandDisplay->addGlobalObject(handler->base(), &wl_xcomposite_interface, &XCompositeHandler::xcomposite_interface,XCompositeHandler::send_root_information);
 }
 
-GLuint XCompositeEglIntegration::createTextureFromBuffer(wl_buffer *buffer)
+GLuint XCompositeEglIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = Wayland::wayland_cast<XCompositeBuffer *>(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());

diff --git a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
index 9cf08a7..9e3b16f 100644 (file)
--- a/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
+++ b/src/qt-compositor/hardware_integration/xcomposite_egl/xcompositeeglintegration.h
@@ -14,7 +14,7 @@ public:
 
     void initializeHardware(Wayland::Display *waylandDisplay);
 
-    GLuint createTextureFromBuffer(struct wl_buffer *buffer);
+    GLuint createTextureFromBuffer(struct wl_buffer *buffer, QOpenGLContext *context);
     bool isYInverted(wl_buffer *) const;
 
 private:

diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
index 17c68d1..41b6367 100644 (file)
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
+++ b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
@@ -73,7 +73,7 @@ void XCompositeGLXIntegration::initializeHardware(Wayland::Display *waylandDispl
     delete glContext;
 }
 
-GLuint XCompositeGLXIntegration::createTextureFromBuffer(wl_buffer *buffer)
+GLuint XCompositeGLXIntegration::createTextureFromBuffer(wl_buffer *buffer, QOpenGLContext *)
 {
     XCompositeBuffer *compositorBuffer = Wayland::wayland_cast<XCompositeBuffer *>(buffer);
     Pixmap pixmap = XCompositeNameWindowPixmap(mDisplay, compositorBuffer->window());

diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
index ace454e..43f062f 100644 (file)
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
+++ b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.h
@@ -16,7 +16,7 @@ public:
 
     void initializeHardware(Wayland::Display *waylandDisplay);
 
-    GLuint createTextureFromBuffer(struct wl_buffer *buffer);
+    GLuint createTextureFromBuffer(struct wl_buffer *buffer, QOpenGLContext *context);
     bool isYInverted(wl_buffer *) const;
 
 private:

diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.cpp b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
index cf8a443..6769bf2 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
@@ -188,9 +188,9 @@ bool Surface::isYInverted() const
 
     if (d->compositor->graphicsHWIntegration()) {
         if (d->type() == WaylandSurface::Texture) {
-            if (textureId()) {
+            //if (textureId()) {
                 return d->compositor->graphicsHWIntegration()->isYInverted(d->buffer());
-            }
+            //}
         } else if (d->type() == WaylandSurface::Direct) {
             return d->compositor->graphicsHWIntegration()->isYInverted(d->buffer());
         }
@@ -238,7 +238,7 @@ QImage Surface::image() const
 }
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-GLuint Surface::textureId() const
+GLuint Surface::textureId(QOpenGLContext *context) const
 {
     Q_D(const Surface);
     if (d->compositor->graphicsHWIntegration() && d->type() == WaylandSurface::Texture
@@ -251,7 +251,7 @@ GLuint Surface::textureId() const
         Surface *that = const_cast<Surface *>(this);
         GraphicsHardwareIntegration *hwIntegration = d->compositor->graphicsHWIntegration();
         that->d_func()->previousBuffer = d->buffer();
-        that->d_func()->texture_id = hwIntegration->createTextureFromBuffer(d->buffer());
+        that->d_func()->texture_id = hwIntegration->createTextureFromBuffer(d->buffer(), context);
         that->d_func()->textureCreatedForBuffer = true;
     }
     return d->texture_id;

diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.h b/src/qt-compositor/wayland_wrapper/wlsurface.h
index 31e10c7..a7e27da 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlsurface.h
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.h
@@ -52,7 +52,8 @@
 #include <QtCore/QMetaType>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include <QtOpenGL/QGLContext>
+#include <QtGui/QOpenGLContext>
+#include <QtGui/qopengl.h>
 #endif
 
 namespace Wayland {
@@ -80,7 +81,7 @@ public:
     QImage image() const;
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-    GLuint textureId() const;
+    GLuint textureId(QOpenGLContext *context) const;
 #endif
 
     void sendMousePressEvent(int x, int y, Qt::MouseButton button);