diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 12:07:20 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-28 12:07:20 (GMT) |
| commit | 7c2620578ba0698a14c1d4ff5c7a4e260f06ad31 (patch) | |
| tree | edb83c85af4bdc12a8230834a10f8e90b4b9ee2e /src/opengl/gl2paintengineex | |
| parent | 0ba973c885257941800e895aacc387904d1737ef (diff) | |
| download | Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.zip Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.tar.gz Qt-7c2620578ba0698a14c1d4ff5c7a4e260f06ad31.tar.bz2 | |
Attempting to make EGL compile again and fix some potential
issues with flipped pixmaps on X11
Diffstat (limited to 'src/opengl/gl2paintengineex')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index cc9b014..612ba1b 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -1104,7 +1104,9 @@ void QGL2PaintEngineEx::drawPixmap(const QRectF& dest, const QPixmap & pixmap, c QGLContext *ctx = d->ctx; glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT); QGLTexture *texture = - ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption); + ctx->d_func()->bindTexture(pixmap, GL_TEXTURE_2D, GL_RGBA, + QGLContext::InternalBindOption + | QGLContext::CanFlipNativePixmapBindOption); GLfloat top = texture->options & QGLContext::InvertedYBindOption ? (pixmap.height() - src.top()) : src.top(); GLfloat bottom = texture->options & QGLContext::InvertedYBindOption ? (pixmap.height() - src.bottom()) : src.bottom(); |