diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-08 13:09:00 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-08 16:36:16 (GMT) |
commit | 31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7 (patch) | |
tree | e9402324bd0eadd51802a3df9b43157639f01123 /src/opengl/qglpaintdevice_p.h | |
parent | e3e7cf545116c194bd5cfe79b28ea37c8bf78219 (diff) | |
download | Qt-31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7.zip Qt-31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7.tar.gz Qt-31d8058a32a1d2d2d6bc1ba3d48f5a382d7b87a7.tar.bz2 |
Make QGLPixmapData work with the new QGLPaintDevice API
This patch changes the ordering of QGL2PaintEngine::begin a bit because
QGLPixmapData needs to use the paint engine's drawTexture method within
beginPaint().
Also, this initialises needsSync to true and removes the setState call.
So now all the state initialisation is done in ensureActive rather than
begin.
Diffstat (limited to 'src/opengl/qglpaintdevice_p.h')
-rw-r--r-- | src/opengl/qglpaintdevice_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h index b0e8826..a175b8c 100644 --- a/src/opengl/qglpaintdevice_p.h +++ b/src/opengl/qglpaintdevice_p.h @@ -84,10 +84,10 @@ public: protected: // Inline? // void setContext(QGLContext* c); - + GLuint m_previousFBO; + GLuint m_thisFBO; private: // QGLContext* m_context; - GLuint m_previousFBO; }; |