summaryrefslogtreecommitdiffstats
path: root/src/render/backend/renderview_p.h
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/backend/renderview_p.h
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/backend/renderview_p.h')
-rw-r--r--src/render/backend/renderview_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index e99c60fc3..6246a32d1 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -312,13 +312,13 @@ private:
QUniformValue *time(const QMatrix4x4 &model) const;
QUniformValue *eyePosition(const QMatrix4x4 &model) const;
- void setUniformValue(QUniformPack &uniformPack, const QString &name, const QVariant &value);
- void setStandardUniformValue(QUniformPack &uniformPack, const QString &glslName, const QString &name, const QMatrix4x4 &worldTransform);
- void setUniformBlockValue(QUniformPack &uniformPack,
+ void setUniformValue(ShaderParameterPack &uniformPack, const QString &name, const QVariant &value);
+ void setStandardUniformValue(ShaderParameterPack &uniformPack, const QString &glslName, const QString &name, const QMatrix4x4 &worldTransform);
+ void setUniformBlockValue(ShaderParameterPack &uniformPack,
Shader *shader,
const ShaderUniformBlock &block,
const QVariant &value);
- void setDefaultUniformBlockShaderDataValue(QUniformPack &uniformPack,
+ void setDefaultUniformBlockShaderDataValue(ShaderParameterPack &uniformPack,
Shader *shader,
ShaderData *shaderData,
const QString &structName);