diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-25 12:56:27 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-27 10:43:11 (GMT) |
| commit | 15c8f565973592c9929cdd6fc83d61641aa63afa (patch) | |
| tree | b0a2e1754164b715572c6d088651d9d3859e26f7 /src/opengl/qgl_p.h | |
| parent | cfdfdf079c4a2095c588dd8af8403c74d2cfa37a (diff) | |
| download | Qt-15c8f565973592c9929cdd6fc83d61641aa63afa.zip Qt-15c8f565973592c9929cdd6fc83d61641aa63afa.tar.gz Qt-15c8f565973592c9929cdd6fc83d61641aa63afa.tar.bz2 | |
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.
Diffstat (limited to 'src/opengl/qgl_p.h')
| -rw-r--r-- | src/opengl/qgl_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index b421eee..9657416 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -333,6 +333,7 @@ private: #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) QGLPixmapData *pixmapData; #endif + int previous_fbo; }; // GL extension definitions |