diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-27 23:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-27 23:00:12 (GMT) |
| commit | 8080417e0e264fdf3ccf3bb0806e14d0d480202b (patch) | |
| tree | 35ac3a796470ac5e3649dc6061a9c2e1e612b3ea /src/opengl/qgl.cpp | |
| parent | 6f7d60f5a0ee04c6e2f1cd21968c66f96465d52a (diff) | |
| parent | 220d13f0e83f9a70e69d95cb78711fec309e83cc (diff) | |
| download | Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.zip Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.tar.gz Qt-8080417e0e264fdf3ccf3bb0806e14d0d480202b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index ed9753e..18f1203 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2095,7 +2095,9 @@ void QGLContextPrivate::cleanup() void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled) { Q_ASSERT(arrayIndex < QT_GL_VERTEX_ARRAY_TRACKED_COUNT); +#ifdef glEnableVertexAttribArray Q_ASSERT(glEnableVertexAttribArray); +#endif if (vertexAttributeArraysEnabledState[arrayIndex] && !enabled) glDisableVertexAttribArray(arrayIndex); @@ -2108,7 +2110,9 @@ void QGLContextPrivate::setVertexAttribArrayEnabled(int arrayIndex, bool enabled void QGLContextPrivate::syncGlState() { +#ifdef glEnableVertexAttribArray Q_ASSERT(glEnableVertexAttribArray); +#endif for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) { if (vertexAttributeArraysEnabledState[i]) glEnableVertexAttribArray(i); |