diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-04-19 08:17:30 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-04-19 08:29:51 (GMT) |
| commit | 8fffbc7768be28fb2b31727bf79b2e2357ce9814 (patch) | |
| tree | a91d4503e532f9fad6218fea9b4f066b36586fb3 /src | |
| parent | c799eeffc43a186747f06a7d36a747cce59925dd (diff) | |
| download | Qt-8fffbc7768be28fb2b31727bf79b2e2357ce9814.zip Qt-8fffbc7768be28fb2b31727bf79b2e2357ce9814.tar.gz Qt-8fffbc7768be28fb2b31727bf79b2e2357ce9814.tar.bz2 | |
Use QGLContextPrivate to track attribarray enabled state.
Reviewed-by: Trond
Reviewed-by: Tom
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index c89d34f..955a129 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -573,9 +573,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); + ctx->d_func()->setVertexAttribArrayEnabled(QT_TEXTURE_COORDS_ATTR, false); + ctx->d_func()->setVertexAttribArrayEnabled(QT_VERTEX_COORDS_ATTR, false); + ctx->d_func()->setVertexAttribArrayEnabled(QT_OPACITY_ATTR, false); #ifndef QT_OPENGL_ES_2 glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // color may have been changed by glVertexAttrib() #endif |