summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-02-01 13:30:15 (GMT)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-02-01 13:39:41 (GMT)
commitafe0f17eb5974adbedd1bc1f2fcd98459d92df47 (patch)
tree7b2933344e7e965451beb387b7536419f4f74999 /src/opengl/gl2paintengineex
parenta1c89baa7d88a4a662ccd2fdb3381844fa116365 (diff)
downloadQt-afe0f17eb5974adbedd1bc1f2fcd98459d92df47.zip
Qt-afe0f17eb5974adbedd1bc1f2fcd98459d92df47.tar.gz
Qt-afe0f17eb5974adbedd1bc1f2fcd98459d92df47.tar.bz2
Fixed garbled 3D Qt logo in the overpainting example.
Disable vertex attribute arrays in the GL2 paint engine when calling QPainter::beginNativePainting() and QPainter::end(). Task-number: QTBUG-7781 Reviewed-by: Trond
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index b282676..35e95be 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -558,6 +558,9 @@ void QGL2PaintEngineExPrivate::resetGLState()
glStencilMask(0xff);
glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
glStencilFunc(GL_ALWAYS, 0, 0xff);
+ glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR);
+ glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR);
+ glDisableVertexAttribArray(QT_OPACITY_ATTR);
}
void QGL2PaintEngineEx::endNativePainting()