1 files changed, 23 insertions, 21 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
index 49ae73de40..e0de801a5e 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
@@ -44,42 +44,44 @@
 
 #include <QtGui/QPlatformGLContext>
 
-#include <QtCore/QWaitCondition>
-
-#include "qwaylandbuffer.h"
 #include "qwaylandxcompositeglxintegration.h"
-
 #include "qglxconvenience.h"
 
 class QWaylandXCompositeGLXWindow;
 class QWaylandShmBuffer;
 
+class QWaylandXCompositeGLXSurface : public QPlatformGLSurface
+{
+public:
+    QWaylandXCompositeGLXSurface(QWaylandXCompositeGLXWindow *window);
+
+    QWaylandXCompositeGLXWindow *window() const { return m_window; }
+    Window xWindow() const;
+
+private:
+    QWaylandXCompositeGLXWindow *m_window;
+};
+
+
 class QWaylandXCompositeGLXContext : public QPlatformGLContext
 {
 public:
-    QWaylandXCompositeGLXContext(QWaylandXCompositeGLXIntegration *glxIntegration, QWaylandXCompositeGLXWindow *window);
+    QWaylandXCompositeGLXContext(const QGuiGLFormat &format, QPlatformGLContext *share, Display *display, int screen);
 
-    void makeCurrent();
-    void doneCurrent();
-    void swapBuffers();
-    void* getProcAddress(const QString& procName);
+    QGuiGLFormat format() const;
 
-    QWindowFormat windowFormat() const;
+    void swapBuffers(const QPlatformGLSurface &surface);
 
-    void geometryChanged();
+    bool makeCurrent(const QPlatformGLSurface &surface);
+    void doneCurrent();
 
-private:
-    QWaylandXCompositeGLXIntegration *mGlxIntegration;
-    QWaylandXCompositeGLXWindow *mWindow;
-    QWaylandBuffer *mBuffer;
+    void (*getProcAddress(const QByteArray &procName)) ();
 
-    Window mXWindow;
-    GLXFBConfig mConfig;
-    GLXContext mContext;
+private:
+    GLXContext m_context;
 
-    static void sync_function(void *data);
-    void waitForSync();
-    bool mWaitingForSyncCallback;
+    Display *m_display;
+    QGuiGLFormat m_format;
 };
 
 #endif // QWAYLANDXCOMPOSITEGLXCONTEXT_H