summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-12-09 16:17:53 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-13 16:10:24 +0000
commit9add600584ab87c80d439c0d5571994d72af3477 (patch)
treea71c20c3764732ea5769043d351e3fb1facb476e /src/render/materialsystem
parentd0ab2359f5b4b23dcd017ed6abb2c063deb98a85 (diff)
Rename QUniformPack to ShaderParameterPack
This will make it more clear that it also contains other things like UBO/SSBO which are pure Uniform values. Change-Id: I641246798b8c868d7bfdfde381221d9a97ed2d35 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem')
-rw-r--r--src/render/materialsystem/shader.cpp2
-rw-r--r--src/render/materialsystem/shader_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp
index 47bb0f05d..c5f0eac6e 100644
--- a/src/render/materialsystem/shader.cpp
+++ b/src/render/materialsystem/shader.cpp
@@ -240,7 +240,7 @@ QOpenGLShaderProgram *Shader::getOrCreateProgram(GraphicsContext *ctx)
return m_program;
}
-void Shader::updateUniforms(GraphicsContext *ctx, const QUniformPack &pack)
+void Shader::updateUniforms(GraphicsContext *ctx, const ShaderParameterPack &pack)
{
const QHash<QString, const QUniformValue* > &values = pack.uniforms();
const QHash<QString, const QUniformValue* >::const_iterator valueEnd = values.constEnd();
diff --git a/src/render/materialsystem/shader_p.h b/src/render/materialsystem/shader_p.h
index d4839dba4..5b8cea106 100644
--- a/src/render/materialsystem/shader_p.h
+++ b/src/render/materialsystem/shader_p.h
@@ -78,7 +78,7 @@ public:
void cleanup();
void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
- void updateUniforms(GraphicsContext *ctx, const QUniformPack &pack);
+ void updateUniforms(GraphicsContext *ctx, const ShaderParameterPack &pack);
void setFragOutputs(const QHash<QString, int> &fragOutputs);
QVector<QString> uniformsNames() const;