* commit in newer qt is using GLint and casting to GLuint
later so it doesn't have this issue:
commit 1d8ec5fae2fa4bf694b93bb6bf14a7c42c84a9b6
Author: Valery Volgutov <[email protected]>
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 <[email protected]>
---
.../0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch | 6 +++---
1 file 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 e47c7b6..e8169b5 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
return;
}
-+ GLuint saveFbo;
-+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &saveFbo);
++ GLint oldFbo;
++ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &oldFbo);
+
int oldWidth = m_textureResource->m_width;
int oldHeight = m_textureResource->m_height;
@@ -38,7 +38,7 @@ index 8822faf..022356a 100644
glDeleteTextures(1, &oldTexture);
- funcs.glBindFramebuffer(GL_FRAMEBUFFER, ctx->d_func()->current_fbo);
-+ funcs.glBindFramebuffer(GL_FRAMEBUFFER, saveFbo);
++ funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
if (pex != 0) {
glViewport(pex->x, pex->y, pex->width, pex->height);
--
1.9.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
