diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch index 96b0a71a..e47c7b6d 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch @@ -1,7 +1,7 @@ -From dd2a427857612798071d3f8c23286322654669d6 Mon Sep 17 00:00:00 2001 +From edea45b25b50932c8c072679d36e97b3cc3c1326 Mon Sep 17 00:00:00 2001 From: Valery Volgutov <valery.volgutov@lge.com> Date: Tue, 21 May 2013 12:02:19 -0700 -Subject: [PATCH] Fix FBO restoring in QOpenGLTextureGlyphCache +Subject: [PATCH 19/22] Fix FBO restoring in QOpenGLTextureGlyphCache QOpenGLTextureGlyphCache::restoreTextureData restores FBO which was binded before restoreTextureData call. More specifically, @@ -15,13 +15,12 @@ GL_FRAMEBUFFER_BINDING query and restoring it. Upstream-Status: Backport https://codereview.qt-project.org/#change,56608 - --- - src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- + src/gui/opengl/qopengltextureglyphcache.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp -index 4e20f6a..3e66bad 100644 +index 8822faf..022356a 100644 --- a/src/gui/opengl/qopengltextureglyphcache.cpp +++ b/src/gui/opengl/qopengltextureglyphcache.cpp @@ -147,6 +147,9 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) @@ -42,7 +41,7 @@ index 4e20f6a..3e66bad 100644 + funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); if (pex != 0) { - glViewport(0, 0, pex->width, pex->height); + glViewport(pex->x, pex->y, pex->width, pex->height); -- -1.7.9.5 +1.8.3.2 |