diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
| commit | b7b20e33f36fd942811af33eae906ccdcf486112 (patch) | |
| tree | b79f93c0cb2ef72056a378aec0d28a770ae07b8a /src/plugins | |
| parent | e35c073c72bb297b4760ee4041ce487c08723d14 (diff) | |
| parent | b8205bd9dc0288f66f1c23e9f227e703bc6712bd (diff) | |
| download | Qt-b7b20e33f36fd942811af33eae906ccdcf486112.zip Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.gz Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
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, |