Fixed bugs in GL2 paint engine when several engines are active.

Make sure makeCurrent() on a window surface unbinds any active FBO, and
simplify ensureActive() code in GL2 paint engine a bit. We don't need
the last_engine pointer as ensureActive() will take care of ensuring the
correct engine is active anway.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 0a2a196..62a592a 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -4391,6 +4391,15 @@ void QGLDrawable::swapBuffers()
 
 void QGLDrawable::makeCurrent()
 {
+    previous_fbo = 0;
+    if (!pixmapData && !fbo) {
+        QGLContext *ctx = context();
+        previous_fbo = ctx->d_ptr->current_fbo;
+        ctx->d_ptr->current_fbo = 0;
+        if (previous_fbo)
+            glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
+    }
+
     if (widget)
         widget->makeCurrent();
 #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
@@ -4428,6 +4437,12 @@ void QGLDrawable::doneCurrent()
     }
 #endif
 
+    if (previous_fbo) {
+        QGLContext *ctx = context();
+        ctx->d_ptr->current_fbo = previous_fbo;
+        glBindFramebuffer(GL_FRAMEBUFFER_EXT, previous_fbo);
+    }
+
     if (fbo && !wasBound)
         fbo->release();
 }