diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-28 05:06:56 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-09-28 05:06:56 (GMT) |
| commit | bfd5b875701e36d8aa2637548a67511d6d1082d0 (patch) | |
| tree | cbcbded97c90f0afa731df0da18158d8ef4dd595 /src/opengl/qglframebufferobject_p.h | |
| parent | 3a927312dbb797f03b351067210b83784c7132cb (diff) | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| download | Qt-bfd5b875701e36d8aa2637548a67511d6d1082d0.zip Qt-bfd5b875701e36d8aa2637548a67511d6d1082d0.tar.gz Qt-bfd5b875701e36d8aa2637548a67511d6d1082d0.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qglframebufferobject_p.h')
| -rw-r--r-- | src/opengl/qglframebufferobject_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index d8ff012..58b4e9e 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -126,7 +126,7 @@ private: class QGLFramebufferObjectPrivate { public: - QGLFramebufferObjectPrivate() : fbo_guard(0), texture(0), depth_stencil_buffer(0) + QGLFramebufferObjectPrivate() : fbo_guard(0), texture(0), depth_buffer(0), stencil_buffer(0) , color_buffer(0), valid(false), engine(0) {} ~QGLFramebufferObjectPrivate() {} @@ -136,7 +136,8 @@ public: bool checkFramebufferStatus() const; QGLSharedResourceGuard fbo_guard; GLuint texture; - GLuint depth_stencil_buffer; + GLuint depth_buffer; + GLuint stencil_buffer; GLuint color_buffer; GLenum target; QSize size; |