QQuickWindow: fix resetOpenGLState handling of vertex arrays

In the core profile it's forbidden to set vertex attributes
(via glVertexAttribPointer and similar) when there's no VAO bound.
Similarly, if there's a VAO bound when calling resetOpenGLState,
then we need to unbind it or those operations will affect its status.

Change-Id: Id7db028ddde9f9429f5a210b8b3d1468888dbce4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index 66202aec5c..8f0696914e 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -94,6 +94,8 @@ class QTouchEvent;
 class QQuickWindowRenderLoop;
 class QQuickWindowIncubationController;
 
+class QOpenGLVertexArrayObjectHelper;
+
 class Q_QUICK_PRIVATE_EXPORT QQuickWindowPrivate : public QWindowPrivate
 {
 public:
@@ -233,6 +235,8 @@ public:
     uint renderTargetId;
     QSize renderTargetSize;
 
+    QOpenGLVertexArrayObjectHelper *vaoHelper;
+
     // Keeps track of which touch point (int) was last accepted by which item
     QHash<int, QQuickItem *> itemForTouchPointId;