diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-12-30 08:21:34 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-12-30 12:21:35 (GMT) |
| commit | 1f1b37e613a930cc1ab871f5d11bf9742920c7f9 (patch) | |
| tree | 432356825b85eba0c8a6b93cc4925dc2401b9021 /src/opengl/qgl.h | |
| parent | 4bc5082073ef64f5e1cf120eb5190ca0f5dad268 (diff) | |
| download | Qt-1f1b37e613a930cc1ab871f5d11bf9742920c7f9.zip Qt-1f1b37e613a930cc1ab871f5d11bf9742920c7f9.tar.gz Qt-1f1b37e613a930cc1ab871f5d11bf9742920c7f9.tar.bz2 | |
Track which vertex attrib arrays are enabled in QGLContextPrivate
The GL2 engine (and probably Qt/3D) needs to track which vertex
attribute arrays are currently enabled and which are disabled. As
this is per-context state, the logical place to track this is in the
context and not in the paint engine.
This patch also makes the GL2 engine's shader manager enable/disable
the appropriate attribute arrays for a given shader program when it
is used.
Reviewed-By: Kim
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 2076c46..b6cd128 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -393,6 +393,7 @@ private: friend class QOpenGLPaintEnginePrivate; friend class QGL2PaintEngineEx; friend class QGL2PaintEngineExPrivate; + friend class QGLEngineShaderManager; friend class QGLWindowSurface; friend class QGLPixmapData; friend class QGLPixmapFilterBase; |