From 10f0485464acebd281f37b78f9ab5d02ee4ada9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Breitmeyer?= <bjoern.breitmeyer@kdab.com>
Date: Tue, 25 Feb 2014 10:18:06 +0100
Subject: 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>
---
 src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h')

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)
-- 
cgit v1.2.3