diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 18:53:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-18 18:53:09 (GMT) |
| commit | 6eadd0f2249e5d7c09abe1131897f6e6811dde1a (patch) | |
| tree | 650bbe34927f6977f1d1da27dc323eeca2c88aa2 /src/plugins | |
| parent | 776f345d984a53a0d40a76acb19d938d5557a3be (diff) | |
| parent | 7ddf40aa71ca0adb7846bf8b0df2240a3870d894 (diff) | |
| download | Qt-6eadd0f2249e5d7c09abe1131897f6e6811dde1a.zip Qt-6eadd0f2249e5d7c09abe1131897f6e6811dde1a.tar.gz Qt-6eadd0f2249e5d7c09abe1131897f6e6811dde1a.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:
Prevent failed rendering for NPOT textures in GLES2.
Don't use GL_REPEAT for NPOT textures in GLES2.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp index ec6c33f..73435df 100644 --- a/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp +++ b/src/plugins/graphicssystems/meego/qmeegopixmapdata.cpp @@ -159,7 +159,9 @@ Qt::HANDLE QMeeGoPixmapData::imageToEGLSharedImage(const QImage &image) glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glBindTexture(GL_TEXTURE_2D, textureId); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + EGLImageKHR eglimage = QEgl::eglCreateImageKHR(QEgl::display(), QEglContext::currentContext(QEgl::OpenGL)->context(), EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer) textureId, |