diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-26 11:25:58 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-08-27 03:43:34 (GMT) |
| commit | 4b112230229544b13c254acd8a10b67939c79f22 (patch) | |
| tree | 158769d041a0317ff064f102ecb7379b8d77baa3 | |
| parent | 6576cf1ac0ce0443925f5f63f996f0a6be95c5d1 (diff) | |
| download | Qt-4b112230229544b13c254acd8a10b67939c79f22.zip Qt-4b112230229544b13c254acd8a10b67939c79f22.tar.gz Qt-4b112230229544b13c254acd8a10b67939c79f22.tar.bz2 | |
make x11 compile...
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 2337964..aca60bc 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1633,7 +1633,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT, GLX_BIND_TO_TEXTURE_TARGETS_EXT, GLX_TEXTURE_2D_BIT_EXT, // QGLContext::bindTexture() can't return an inverted texture, but QPainter::drawPixmap() can: - GLX_Y_INVERTED_EXT, options & QGLContext::BindInvertedY ? GLX_DONT_CARE : False, + GLX_Y_INVERTED_EXT, options & QGLContext::InvertedYBindOption ? GLX_DONT_CARE : False, XNone }; configList = glXChooseFBConfig(x11Info.display(), x11Info.screen(), configAttribs, &configCount); @@ -1695,9 +1695,9 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con glBindTexture(GL_TEXTURE_2D, textureId); if (!((hasAlpha && RGBAConfigInverted) || (!hasAlpha && RGBConfigInverted))); - options &= ~QGLContext::BindInvertedY; + options &= ~QGLContext::InvertedYBindOption; QGLTexture *texture = new QGLTexture(q, textureId, GL_TEXTURE_2D, options); - if (texture->options & QGLContext::BindInvertedY) + if (texture->options & QGLContext::InvertedYBindOption) pixmapData->flags |= QX11PixmapData::InvertedWhenBoundToTexture; // We assume the cost of bound pixmaps is zero |