diff options
| author | axis <qt-info@nokia.com> | 2009-12-09 08:13:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-09 08:13:44 (GMT) |
| commit | 5a700d89a2263bcfc91d785c1ed444b1ecdacf83 (patch) | |
| tree | 34ba6c67ad65c083148a80a00c4232e522b03d0a /src/opengl/qgl.cpp | |
| parent | a63810db89ad295df0a2371d4f671af1be75b7a0 (diff) | |
| parent | 9c32e6f919704a50fbb5f46541b16fb712c24c4c (diff) | |
| download | Qt-5a700d89a2263bcfc91d785c1ed444b1ecdacf83.zip Qt-5a700d89a2263bcfc91d785c1ed444b1ecdacf83.tar.gz Qt-5a700d89a2263bcfc91d785c1ed444b1ecdacf83.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-staging2
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 967ba48..8003a29 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5363,11 +5363,12 @@ QSize QGLTexture::bindCompressedTexturePVR(const char *buf, int len) // Restore the default pixel alignment for later texture uploads. glPixelStorei(GL_UNPACK_ALIGNMENT, 4); - // Set the invert flag for the texture. + // Set the invert flag for the texture. The "vertical flip" + // flag in PVR is the opposite sense to our sense of inversion. if ((pvrHeader->flags & PVR_VERTICAL_FLIP) != 0) - options |= QGLContext::InvertedYBindOption; - else options &= ~QGLContext::InvertedYBindOption; + else + options |= QGLContext::InvertedYBindOption; return QSize(pvrHeader->width, pvrHeader->height); } |