summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-19 09:53:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-19 09:53:40 (GMT)
commit78b2e9421c47371b68f4c65a181a077ba3a226ac (patch)
tree232c2a229bd4b4a0b86f1c3207983762eaba141b /src/opengl
parent71dedbee1f5a23411e2c82157a6fe6ee5d48ab6e (diff)
parent6d6df0e2b63f0103ec1f19b4b856b106e295d618 (diff)
downloadQt-78b2e9421c47371b68f4c65a181a077ba3a226ac.zip
Qt-78b2e9421c47371b68f4c65a181a077ba3a226ac.tar.gz
Qt-78b2e9421c47371b68f4c65a181a077ba3a226ac.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Removed an assert in the print dialog on windows simple cleanup in QSplitter Actually use GL texture cache when bindoptions are provided
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index e0030ad..5908f14 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2208,8 +2208,8 @@ QGLTexture* QGLContextPrivate::bindTexture(const QImage &image, GLenum target, G
Q_Q(QGLContext);
#ifdef QGL_BIND_TEXTURE_DEBUG
- printf("QGLContextPrivate::bindTexture(), imageSize=(%d,%d), internalFormat =0x%x, options=%x\n",
- image.width(), image.height(), internalFormat, int(options));
+ printf("QGLContextPrivate::bindTexture(), imageSize=(%d,%d), internalFormat =0x%x, options=%x, key=%llx\n",
+ image.width(), image.height(), internalFormat, int(options), key);
QTime time;
time.start();
#endif
@@ -2547,7 +2547,7 @@ GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format,
return 0;
Q_D(QGLContext);
- QGLTexture *texture = d->bindTexture(image, target, format, false, options);
+ QGLTexture *texture = d->bindTexture(image, target, format, options);
return texture->id;
}
@@ -2559,7 +2559,7 @@ GLuint QGLContext::bindTexture(const QImage &image, QMacCompatGLenum target, QMa
return 0;
Q_D(QGLContext);
- QGLTexture *texture = d->bindTexture(image, GLenum(target), GLint(format), false, DefaultBindOption);
+ QGLTexture *texture = d->bindTexture(image, GLenum(target), GLint(format), DefaultBindOption);
return texture->id;
}
@@ -2571,7 +2571,7 @@ GLuint QGLContext::bindTexture(const QImage &image, QMacCompatGLenum target, QMa
return 0;
Q_D(QGLContext);
- QGLTexture *texture = d->bindTexture(image, GLenum(target), GLint(format), false, options);
+ QGLTexture *texture = d->bindTexture(image, GLenum(target), GLint(format), options);
return texture->id;
}
#endif