From 65160b2311081e54cf0738440bd9741ef2cbca6e Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Tue, 3 May 2011 14:11:45 +0200
Subject: [PATCH] Track QPlatformGLContext API changes

---
 .../gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp        | 4 +---
 .../gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp        | 4 +---
 .../wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp          | 1 -
 .../gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp    | 2 --
 .../gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp    | 1 -
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
index 7e84b5d..6971459 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
@@ -97,8 +97,6 @@ QWaylandReadbackEglContext::~QWaylandReadbackEglContext()
 
 void QWaylandReadbackEglContext::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
-
     mWindow->waitForFrameSync();
 
     eglMakeCurrent(mEglIntegration->eglDisplay(),mPixmapSurface,mPixmapSurface,mContext);
@@ -114,7 +112,7 @@ void QWaylandReadbackEglContext::swapBuffers()
 {
     eglSwapBuffers(mEglIntegration->eglDisplay(),mPixmapSurface);
 
-    if (QPlatformGLContext::currentContext() != this) {
+    if (QWindowContext::currentContext().handle() != this) {
         makeCurrent();
     }
 
diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
index 08c5cf6..5bafd41 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.cpp
@@ -85,8 +85,6 @@ QWaylandReadbackGlxContext::QWaylandReadbackGlxContext(QWaylandReadbackGlxIntegr
 
 void QWaylandReadbackGlxContext::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
-
     glXMakeCurrent(mGlxIntegration->xDisplay(),mGlxPixmap,mContext);
 }
 
@@ -97,7 +95,7 @@ void QWaylandReadbackGlxContext::doneCurrent()
 
 void QWaylandReadbackGlxContext::swapBuffers()
 {
-    if (QPlatformGLContext::currentContext() != this) {
+    if (QWindowContext::currentContext().handle() != this) {
         makeCurrent();
     }
 
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
index 5c5e88a..d8cff1f 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
@@ -90,7 +90,6 @@ QWaylandGLContext::~QWaylandGLContext()
 
 void QWaylandGLContext::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
     if (mSurface == EGL_NO_SURFACE) {
         qWarning("makeCurrent with EGL_NO_SURFACE");
     }
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
index 1536b2e..21b369d 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp
@@ -75,8 +75,6 @@ QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(QWaylandXCompositeEGL
 
 void QWaylandXCompositeEGLContext::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
-
     eglMakeCurrent(mEglIntegration->eglDisplay(),mEglWindowSurface,mEglWindowSurface,mContext);
 }
 
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
index fbe8d38..39316ad 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
@@ -67,7 +67,6 @@ QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(QWaylandXCompositeGLX
 
 void QWaylandXCompositeGLXContext::makeCurrent()
 {
-    QPlatformGLContext::makeCurrent();
     glXMakeCurrent(mGlxIntegration->xDisplay(),mXWindow,mContext);
 }
 
-- 
2.7.4