diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-05 10:21:31 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-05 10:23:28 (GMT) |
| commit | ec13cf30f10dabce37af3ce9d6763066e8cf4cc4 (patch) | |
| tree | 11148f70bc1350b218bfdefd160123c35913612c /src/opengl/qglframebufferobject_p.h | |
| parent | a12b1538df45268f2a66ec55856ffeeb131eb751 (diff) | |
| download | Qt-ec13cf30f10dabce37af3ce9d6763066e8cf4cc4.zip Qt-ec13cf30f10dabce37af3ce9d6763066e8cf4cc4.tar.gz Qt-ec13cf30f10dabce37af3ce9d6763066e8cf4cc4.tar.bz2 | |
Removed the FBO stacking behaviour and the test attached to it.
Having this behaviour in QGLFrameBufferObject complicates alot of things
and isn't really necessary.
Reviewed-by: Tom Cooksey
Diffstat (limited to 'src/opengl/qglframebufferobject_p.h')
| -rw-r--r-- | src/opengl/qglframebufferobject_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index 122c42e..c341459 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -127,7 +127,8 @@ private: class QGLFramebufferObjectPrivate { public: - QGLFramebufferObjectPrivate() : fbo_guard(0), texture(0), depth_stencil_buffer(0), color_buffer(0), valid(false), previous_fbo(0), engine(0) {} + QGLFramebufferObjectPrivate() : fbo_guard(0), texture(0), depth_stencil_buffer(0) + , color_buffer(0), valid(false), engine(0) {} ~QGLFramebufferObjectPrivate() {} void init(QGLFramebufferObject *q, const QSize& sz, @@ -143,7 +144,6 @@ public: QGLFramebufferObjectFormat format; uint valid : 1; QGLFramebufferObject::Attachment fbo_attachment; - GLuint previous_fbo; mutable QPaintEngine *engine; QGLFBOGLPaintDevice glDevice; |