aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-04-18 18:27:14 +0200
committerUlf Hermann <ulf.hermann@qt.io>2016-04-28 07:16:35 +0000
commit6b810efa7d47d8da19928d1116f71b9fb83215f1 (patch)
tree99ea5a09710d073b8080b709de779be91be0dfba
parent55e9687368008e66e67db2636f47b87699d083c7 (diff)
Make some of the shader manager private
There is no need for other classes to directly access the shader cache, and if we ever want a way to invalidate pieces of it, we better prevent such access. Change-Id: I79949b375854445c46b9d8bf6072bb53030b8dac Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
index 8cd9e7e3ff..0752beb24e 100644
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
@@ -521,7 +521,7 @@ public:
float lastOpacity;
};
- ShaderManager(QSGRenderContext *ctx) : blitProgram(0), visualizeProgram(0), context(ctx) { }
+ ShaderManager(QSGRenderContext *ctx) : visualizeProgram(0), blitProgram(0), context(ctx) { }
~ShaderManager() {
qDeleteAll(rewrittenShaders);
qDeleteAll(stockShaders);
@@ -534,11 +534,13 @@ public:
Shader *prepareMaterial(QSGMaterial *material);
Shader *prepareMaterialNoRewrite(QSGMaterial *material);
+ QOpenGLShaderProgram *visualizeProgram;
+
+private:
QHash<QSGMaterialType *, Shader *> rewrittenShaders;
QHash<QSGMaterialType *, Shader *> stockShaders;
QOpenGLShaderProgram *blitProgram;
- QOpenGLShaderProgram *visualizeProgram;
QSGRenderContext *context;
};