diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 12:29:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 12:29:49 (GMT) |
| commit | 4fdffd678edd1dcb668f5d2a42d2b6cffb991d64 (patch) | |
| tree | 775245128e18eaf547b51f460a3f826e69a15b6d | |
| parent | da424a2e8a8570e24eac6272bb410a51381fcad7 (diff) | |
| parent | 896eb11980b16ba5072dc1e835d40e90eb08c250 (diff) | |
| download | Qt-4fdffd678edd1dcb668f5d2a42d2b6cffb991d64.zip Qt-4fdffd678edd1dcb668f5d2a42d2b6cffb991d64.tar.gz Qt-4fdffd678edd1dcb668f5d2a42d2b6cffb991d64.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the bindTexture() filters on X11 to not rely on mipmap generation.
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index f0b06ef5..326785e 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1765,6 +1765,9 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con glXBindTexImageEXT(x11Info.display(), (GLXPixmap)pixmapData->gl_surface, GLX_FRONT_LEFT_EXT, 0); glBindTexture(GL_TEXTURE_2D, textureId); + GLuint filtering = (options & QGLContext::LinearFilteringBindOption) ? GL_LINEAR : GL_NEAREST; + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering); if (!((hasAlpha && RGBAConfigInverted) || (!hasAlpha && RGBConfigInverted))) options &= ~QGLContext::InvertedYBindOption; |