t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase-5.0.2: Fix build without -fpermissive

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2014-03-14 19:53:53 +01:00
parent 5e9a9d935a
commit 1d14002dd8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/qtbase-5.0.2/0019-Fix-FBO-restoring-in-QOpenGLTextureGlyphCache.patch
View File

@@ -28,8 +28,8 @@ index 4e20f6a..3e66bad 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;
@@ -39,7 +39,7 @@ index 4e20f6a..3e66bad 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(0, 0, pex->width, pex->height);