diff options
| author | Björn Breitmeyer <bjoern.breitmeyer@kdab.com> | 2014-02-25 10:18:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-28 12:09:25 +0100 |
| commit | 10f0485464acebd281f37b78f9ab5d02ee4ada9b (patch) | |
| tree | cfca7a4c1311ee56f180b293df800a0619e21275 /src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h | |
| parent | 6ef802ff6ed1cd234848b65fdad56dc3b0579cff (diff) | |
Fixed regression from fd5c629f4336b1f79
Buffer offsets were wrong, and a type
in the buffer content.
Task-number: QTBUG-36989
Change-Id: I863976420d495b006692c4b614f74c285649cb1a
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h index b561bc08f7..e1be2105cd 100644 --- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h @@ -46,6 +46,7 @@ #include <QtGui/qopenglfunctions.h> #include <qopenglshaderprogram.h> #include <qopenglbuffer.h> +#include <qopenglvertexarrayobject.h> #include <QtGui/private/qopenglengineshadersource_p.h> #include <private/qsgareaallocator_p.h> @@ -135,6 +136,7 @@ private: QOpenGLShaderProgram *m_blitProgram; QOpenGLBuffer m_blitBuffer; + QOpenGLVertexArrayObject m_vao; QOpenGLSharedResourceGuard *m_fboGuard; #if !defined(QT_OPENGL_ES_2) |