summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-10 11:28:27 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-10 11:28:27 (GMT)
commit8032423bb8fa91c623ece61bff528adfd49e8685 (patch)
tree6eff98b5035c584be7be5520e4953644cf5fdb1f
parent7a3b5e052ea94776a02cebc8174e753925878815 (diff)
downloadQt-8032423bb8fa91c623ece61bff528adfd49e8685.zip
Qt-8032423bb8fa91c623ece61bff528adfd49e8685.tar.gz
Qt-8032423bb8fa91c623ece61bff528adfd49e8685.tar.bz2
Revert 004b09ffd423cd3100e346825dd7d730fc86d366
Changing the height here will make the coords out of sync with the ' buffer, causing broken drawing. I revert this change to prepare QStaticText for integration, and will revisit it later on.
-rw-r--r--src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index 53c627f..6cb76ee 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -70,12 +70,8 @@ QGLTextureGlyphCache::~QGLTextureGlyphCache()
}
}
-void QGLTextureGlyphCache::createTextureData(int width, int unalteredHeight)
+void QGLTextureGlyphCache::createTextureData(int width, int height)
{
- extern int qt_next_power_of_two(int v);
- // Set height to lowest POT number which is higher than or equal to height
- int height = qt_next_power_of_two(unalteredHeight);
-
glGenTextures(1, &m_texture);
glBindTexture(GL_TEXTURE_2D, m_texture);