diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-14 19:53:53 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-14 19:55:16 +0100 |
| commit | 2463683ab5ddaf71aee77814aa03de1e5e149b79 (patch) | |
| tree | 43741a6cbfe5b2ce6008c2ef6e7f0004d984b4d4 | |
| parent | 13624dc95e73241b2f21571f545b72e655dd4f66 (diff) | |
| download | meta-qt5-2463683ab5ddaf71aee77814aa03de1e5e149b79.tar.gz | |
qtbase-5.0.2: Fix build without -fpermissive
* commit in newer qt is using GLint and casting to GLuint
later so it doesn't have this issue:
commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6
Author: Valery Volgutov <valery.volgutov@lge.com>
Date: Tue May 21 14:18:17 2013 -0700
Fix FBO restoring in QOpenGLTextureGlyphCache
* but backport to 5.0.2 is using GLuint:
and causes build failure without -fpermissive:
| qtbase/5.0.2-r3/qtbase-opensource-src-5.0.2/src/gui/opengl/qopengltextureglyphcache.cpp:151:51: error: invalid conversion from 'GLuint* {aka unsigned int*}' to 'GLint* {aka int*}' [-fpermissive]
| glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
| ^
| /usr/include/GLES2/gl2.h:536:37: error: initializing argument 2 of 'void glGetIntegerv(GLenum, GLint*)' [-fpermissive]
| GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
| ^
* resync with version from 5.1.1 to fix this
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch | 6 |
1 files changed, 3 insertions, 3 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 e47c7b6d..e8169b58 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 | |||
| @@ -27,8 +27,8 @@ index 8822faf..022356a 100644 | |||
| 27 | return; | 27 | return; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | + GLuint saveFbo; | 30 | + GLint oldFbo; |
| 31 | + glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo); | 31 | + glGetIntegerv(GL_FRAMEBUFFER_BINDING, &oldFbo); |
| 32 | + | 32 | + |
| 33 | int oldWidth = m_textureResource->m_width; | 33 | int oldWidth = m_textureResource->m_width; |
| 34 | int oldHeight = m_textureResource->m_height; | 34 | int oldHeight = m_textureResource->m_height; |
| @@ -38,7 +38,7 @@ index 8822faf..022356a 100644 | |||
| 38 | glDeleteTextures(1, &oldTexture); | 38 | glDeleteTextures(1, &oldTexture); |
| 39 | 39 | ||
| 40 | - funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); | 40 | - funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo); |
| 41 | + funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo); | 41 | + funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); |
| 42 | 42 | ||
| 43 | if (pex != 0) { | 43 | if (pex != 0) { |
| 44 | glViewport(pex->x, pex->y, pex->width, pex->height); | 44 | glViewport(pex->x, pex->y, pex->width, pex->height); |