diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-26 09:33:56 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-27 05:15:28 +0200 |
| commit | d7836ec1bdfcc2534fb0ccd48fa3c788692d6c60 (patch) | |
| tree | f9ae34bc2654a8308bb231639f357f7e9f4ddaab /src/gui | |
| parent | eddd87826e5b5c37f3391f1196be4a8c08bc46de (diff) | |
Fixed crash in QOpenGLFramebufferObject.
AMD's Catalyst driver returns true in glIsRenderbuffer() for a newly
gen'ed render buffer.
Change-Id: I177425dc4b94923431cec5f89175c63782819eef
Reviewed-on: http://codereview.qt-project.org/5522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 8c5eb0d877..fe252dfa9f 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -470,7 +470,6 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi { // depth and stencil buffer needs another extension funcs.glGenRenderbuffers(1, &depth_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(depth_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer); Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) @@ -497,7 +496,6 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi || (attachment == QOpenGLFramebufferObject::Depth))) { funcs.glGenRenderbuffers(1, &depth_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(depth_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer); Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) { @@ -537,7 +535,6 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi if (stencil_buffer == 0 && (attachment == QOpenGLFramebufferObject::CombinedDepthStencil)) { funcs.glGenRenderbuffers(1, &stencil_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(stencil_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, stencil_buffer); Q_ASSERT(funcs.glIsRenderbuffer(stencil_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) { |