diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-08-21 15:39:17 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-08-21 15:39:17 (GMT) |
| commit | d0a1f4de851eb89665b0a3909adcfe150118bc77 (patch) | |
| tree | 0f078332620d06be8965172c6401d5fb4df61d79 | |
| parent | 454e18b91eddc422607cddd683baac30bdc89513 (diff) | |
| parent | 628e2c59dcb7c036bd7b40ff0a2fda0d89aa7155 (diff) | |
| download | Qt-d0a1f4de851eb89665b0a3909adcfe150118bc77.zip Qt-d0a1f4de851eb89665b0a3909adcfe150118bc77.tar.gz Qt-d0a1f4de851eb89665b0a3909adcfe150118bc77.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 1 | ||||
| -rw-r--r-- | src/opengl/qgl_x11egl.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 7a3fa56..2901c1e 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -410,6 +410,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() const QPixmap& texPixmap = currentBrush->texture(); glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT); + // TODO: Support y-inverted pixmaps as brushes ctx->d_func()->bindTexture(texPixmap, GL_TEXTURE_2D, GL_RGBA, true); updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, true); } diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp index 7452c92..b982a19 100644 --- a/src/opengl/qgl_x11egl.cpp +++ b/src/opengl/qgl_x11egl.cpp @@ -494,6 +494,10 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData* pd, cons { Q_Q(QGLContext); + // The EGL texture_from_pixmap has no facility to invert the y coordinate + if (!canInvert) + return 0; + Q_ASSERT(pd->classId() == QPixmapData::X11Class); static bool checkedForTFP = false; |