diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-17 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-17 23:00:12 (GMT) |
| commit | ab9d11946e5ff88008e8c2d887b8d0458ab9a98c (patch) | |
| tree | 41642e36b440b5e326a2dd56e2dca041ddb52908 /src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | |
| parent | 432cd48a777fddc04f4c323df5876bcc6c0c2829 (diff) | |
| parent | 0d3786a9cd6dc3c4dd17a7e98fe138a7abaabb29 (diff) | |
| download | Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.zip Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.tar.gz Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp index 1b879c3..ba311c3 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp @@ -323,6 +323,9 @@ int QGLTextureGlyphCache::maxTextureWidth() const int QGLTextureGlyphCache::maxTextureHeight() const { - return ctx->d_ptr->maxTextureSize(); + if (ctx->d_ptr->workaround_brokenTexSubImage) + return qMin(1024, ctx->d_ptr->maxTextureSize()); + else + return ctx->d_ptr->maxTextureSize(); } QT_END_NAMESPACE |