diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-09 06:32:07 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-09 06:32:07 (GMT) |
| commit | f2eab026602a0608e036018eeacf3fa6c8ca3fa7 (patch) | |
| tree | 97be8a8e269ea49fb68d4908d8f7d0f47afbd1d6 /src/opengl/qgl_x11.cpp | |
| parent | 22d7c82b71f34df637efd0ed39b3d63719a2bf67 (diff) | |
| parent | 17fcc84e5ebcf09f80a4bbebafde913d0422a91e (diff) | |
| download | Qt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.zip Qt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.tar.gz Qt-f2eab026602a0608e036018eeacf3fa6c8ca3fa7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -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 d203646..9491f14 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1773,6 +1773,9 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pixmap, cons 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; |