summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2009-09-02 12:18:10 (GMT)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2009-09-02 12:52:16 (GMT)
commitabef77a3fa1e4d2f6a44b323672db8ccbbd2b03f (patch)
tree6302736dbdbdad0c32c2e9f813a0fb5d9b13c606 /src/opengl/qgl_p.h
parentdbc2bc6deb8a0d44cafe8c8d6c6905c689aa018f (diff)
downloadQt-abef77a3fa1e4d2f6a44b323672db8ccbbd2b03f.zip
Qt-abef77a3fa1e4d2f6a44b323672db8ccbbd2b03f.tar.gz
Qt-abef77a3fa1e4d2f6a44b323672db8ccbbd2b03f.tar.bz2
Split QGLEngineShaderManager into a shared and a per engine part.
Both the shaders and the engine states were shared between OpenGL contexts, but the states should be only apply to one context, not a group of contexts. This commit separates the shaders and the states. Task-number: 257254 Reviewed-by: Samuel
Diffstat (limited to 'src/opengl/qgl_p.h')
-rw-r--r--src/opengl/qgl_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index a39c52c..72ec35e 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -540,10 +540,10 @@ public:
// Return resource for 'key' or a shared context.
void *value(const QGLContext *key);
// Free resource for 'key' and all its shared contexts.
- void remove(const QGLContext *key);
+ void removeGroup(const QGLContext *key);
private slots:
// Remove entry 'key' from cache and delete resource if there are no shared contexts.
- void aboutToDestroyContext(const QGLContext *key);
+ void removeOne(const QGLContext *key);
private:
typedef QHash<const QGLContext *, void *> ResourceHash;
ResourceHash m_resources;