diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 00:25:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 00:25:14 (GMT) |
| commit | 466b1db5f5466469bf3a62bb1d10da909aa07bac (patch) | |
| tree | 977fa5c73c88a1114ef7dbd114f611d7d739a7d0 | |
| parent | 19b77ecfcdae8a68cfec5d89cf510b9cc837bed2 (diff) | |
| parent | 0727539b89898544047d32e63633790fa0c44b5a (diff) | |
| download | Qt-466b1db5f5466469bf3a62bb1d10da909aa07bac.zip Qt-466b1db5f5466469bf3a62bb1d10da909aa07bac.tar.gz Qt-466b1db5f5466469bf3a62bb1d10da909aa07bac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't delete FBO when resetting glyph cache
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index 66445cd..1b879c3 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -83,13 +83,9 @@ void QGLTextureGlyphCache::clear() if (ctx) { QGLShareContextScope scope(ctx); - if (!ctx->d_ptr->workaround_brokenFBOReadBack) - glDeleteFramebuffers(1, &m_fbo); - if (m_width || m_height) glDeleteTextures(1, &m_texture); - m_fbo = 0; m_texture = 0; m_width = 0; m_height = 0; @@ -105,6 +101,13 @@ void QGLTextureGlyphCache::clear() QGLTextureGlyphCache::~QGLTextureGlyphCache() { + if (ctx) { + QGLShareContextScope scope(ctx); + + if (!ctx->d_ptr->workaround_brokenFBOReadBack) + glDeleteFramebuffers(1, &m_fbo); + } + clear(); } |