diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-26 14:03:56 +0200 |
| commit | 1c1bb3bc4ae3907d9d6d2417b56d90da3c70e4b7 (patch) | |
| tree | ea7c3a0dbf98786edf0a2be0f82381e0f25bac61 /src/quick/scenegraph | |
| parent | 7ccfa59664b8bdb24c06025d3ffc5c4da7f0bb1e (diff) | |
| parent | b1ccb1f8c30d601c55145b65add3846fe5f9bb32 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I4020a1b3c59dea18faf7cbcbb78b90fcfc3680f0
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp index 136f23f339..dcc485ce17 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp @@ -38,6 +38,7 @@ #include <QtQml/private/qqmlglobal_p.h> #include <QtQuick/private/qsgdistancefieldutil_p.h> #include <qopenglfunctions.h> +#include <qopenglframebufferobject.h> #include <qmath.h> #if !defined(QT_OPENGL_ES_2) @@ -324,7 +325,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int GL_COLOR_BUFFER_BIT, GL_NEAREST); // Reset the default framebuffer - m_coreFuncs->glBindFramebuffer(GL_FRAMEBUFFER, 0); + QOpenGLFramebufferObject::bindDefault(); return; } else if (useTextureResizeWorkaround()) { @@ -449,7 +450,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int m_funcs->glDeleteTextures(1, &tmp_texture); m_funcs->glDeleteTextures(1, &oldTexture); - m_funcs->glBindFramebuffer(GL_FRAMEBUFFER, 0); + QOpenGLFramebufferObject::bindDefault(); // restore render states if (stencilTestEnabled) |