diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-01-19 10:40:32 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-01-19 10:40:32 (GMT) |
| commit | 61ce98e3af8f0acdb011e87e281a1440fa7817a7 (patch) | |
| tree | c3130ac1a2e398360fa7b1b38989236d05c4b711 | |
| parent | f62d047bf20cd45f78db14f1ef4f9ba7f7a7b131 (diff) | |
| download | Qt-61ce98e3af8f0acdb011e87e281a1440fa7817a7.zip Qt-61ce98e3af8f0acdb011e87e281a1440fa7817a7.tar.gz Qt-61ce98e3af8f0acdb011e87e281a1440fa7817a7.tar.bz2 | |
Updated painter path caching in the GL2 engine after merge.
The painter path caching needed to be updated after an
optimisation (45fedfeb) in the 4.6 branch was merged into the
master branch.
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 2a49d8a..5e41cc1 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -809,16 +809,15 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path) } prepareForDraw(currentBrush.isOpaque()); - glEnableVertexAttribArray(QT_VERTEX_COORDS_ATTR); #ifdef QT_OPENGL_CACHE_AS_VBOS glBindBuffer(GL_ARRAY_BUFFER, cache->vbo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cache->ibo); - glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, false, 0, 0); + setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, 0); glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0); #else - glVertexAttribPointer(QT_VERTEX_COORDS_ATTR, 2, GL_FLOAT, false, 0, cache->vertices); + setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, cache->vertices); glDrawElements(cache->primitiveType, cache->indexCount, GL_UNSIGNED_INT, cache->indices); #endif |