diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-06-22 10:34:07 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-07-02 10:25:36 (GMT) |
| commit | 10ac24c98ea7f2738662be91fda7feec7f322dff (patch) | |
| tree | 35b514150d4946d7be0b5c6681dbc8ccb878d69b /src/opengl | |
| parent | de7a1e3780c145b8721f42bb9477224b5a8ae93f (diff) | |
| download | Qt-10ac24c98ea7f2738662be91fda7feec7f322dff.zip Qt-10ac24c98ea7f2738662be91fda7feec7f322dff.tar.gz Qt-10ac24c98ea7f2738662be91fda7feec7f322dff.tar.bz2 | |
The group pointer should no longer be a part of the 64 bit int.
The group is now a proper part of the QGLTextureCacheKey, and it's no
longer necessary with this hack.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 19ab51d..1f2a886 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2235,7 +2235,7 @@ QImage QGLContextPrivate::convertToGLFormat(const QImage &image, bool force_prem QGLTexture *QGLContextPrivate::bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options) { - const qint64 key = image.cacheKey() | (qint64) group; + const qint64 key = image.cacheKey(); QGLTexture *texture = textureCacheLookup(key, target); if (texture) { glBindTexture(target, texture->id); @@ -2508,7 +2508,7 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, Q_UNUSED(q); #endif - const qint64 key = pixmap.cacheKey() | (qint64) group; + const qint64 key = pixmap.cacheKey(); QGLTexture *texture = textureCacheLookup(key, target); if (texture) { glBindTexture(target, texture->id); |