summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpaintengine_opengl.cpp
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-09-08 16:03:00 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-09-08 16:36:17 (GMT)
commitf6f099e33773e5739ef89681bc97a1a91ff168c8 (patch)
treea5278ef2151debe525b23700e04dd2f3cfd3b0c6 /src/opengl/qpaintengine_opengl.cpp
parent31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7 (diff)
downloadQt-f6f099e33773e5739ef89681bc97a1a91ff168c8.zip
Qt-f6f099e33773e5739ef89681bc97a1a91ff168c8.tar.gz
Qt-f6f099e33773e5739ef89681bc97a1a91ff168c8.tar.bz2
Cleanup of QGLPaintDevice before it goes in
This is the last patch in the QGLPaintDevice series. Although previous patches have not been reviewed individually, Samuel's reviewed QGLPaintDevice API and all the changes as the code stands with this patch. Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
-rw-r--r--src/opengl/qpaintengine_opengl.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 36a0081..34fff10 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -287,7 +287,6 @@ public Q_SLOTS:
}
private:
-// QGLDrawable drawable;
QGLPaintDevice* device;
QGLFramebufferObject *offscreen;
@@ -436,7 +435,7 @@ inline void QGLOffscreen::release()
DEBUG_ONCE_STR("QGLOffscreen: releasing offscreen");
if (drawable_fbo)
- device->context()->makeCurrent(); //###
+ device->ensureActiveTarget(); //###
else
offscreen->release();
@@ -765,7 +764,6 @@ public:
GLubyte pen_color[4];
GLubyte brush_color[4];
QTransform::TransformationType txop;
-// QGLDrawable drawable;
QGLPaintDevice* device;
QGLOffscreen offscreen;