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>

10 files changed, 21 insertions, 21 deletions

diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp
index 8c8c1bfa2..511720ea1 100644
--- a/src/render/backend/quniformvalue.cpp
+++ b/src/render/backend/quniformvalue.cpp
@@ -78,17 +78,17 @@ void QUniformValue::apply(GraphicsContext *ctx, const ShaderUniform &shaderDescr
     ctx->bindUniform(m_var, shaderDescription);
 }
 
-QUniformPack::~QUniformPack()
+ShaderParameterPack::~ShaderParameterPack()
 {
     m_uniforms.clear();
 }
 
-void QUniformPack::setUniform(const QString &glslName, const QUniformValue *val)
+void ShaderParameterPack::setUniform(const QString &glslName, const QUniformValue *val)
 {
     m_uniforms.insert(glslName, val);
 }
 
-void QUniformPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &texId)
+void ShaderParameterPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &texId)
 {
     for (int t=0; t<m_textures.size(); ++t) {
         if (m_textures[t].glslName != glslName) {
@@ -103,7 +103,7 @@ void QUniformPack::setTexture(const QString &glslName, const Qt3DCore::QNodeId &
 }
 
 // Contains Uniform Block Index and QNodeId of the ShaderData (UBO)
-void QUniformPack::setUniformBuffer(const BlockToUBO &blockToUBO)
+void ShaderParameterPack::setUniformBuffer(const BlockToUBO &blockToUBO)
 {
     m_uniformBuffers.append(blockToUBO);
 }
diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h
index 9f0381200..35a9cca0f 100644
--- a/src/render/backend/quniformvalue_p.h
+++ b/src/render/backend/quniformvalue_p.h
@@ -142,10 +142,10 @@ struct BlockToUBO {
     QHash<QString, QVariant> m_updatedProperties;
 };
 
-class QUniformPack
+class ShaderParameterPack
 {
 public:
-    ~QUniformPack();
+    ~ShaderParameterPack();
 
     void setUniform(const QString &glslName, const QUniformValue *val);
     void setTexture(const QString &glslName, const Qt3DCore::QNodeId &id);
diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h
index 88aa424e4..6813a6ad7 100644
--- a/src/render/backend/rendercommand_p.h
+++ b/src/render/backend/rendercommand_p.h
@@ -73,7 +73,7 @@ public:
 
     HVao m_vao; // VAO used during the submission step to store all states and VBOs
     HShader m_shader; // Shader for given pass and mesh
-    QUniformPack m_uniforms; // Might need to be reworked so as to be able to destroy the
+    ShaderParameterPack m_uniforms; // Might need to be reworked so as to be able to destroy the
                             // Texture while submission is happening.
     GLint m_instancesCount; // Number of instances of the mesh, if 0 regular draw otherwise glDrawArraysInstanced or glDrawElementsInstanced
     RenderStateSet *m_stateSet;
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 404b10463..a9a6fb3e4 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -219,7 +219,7 @@ private:
     Shader *m_defaultRenderShader;
     RenderStateSet *m_defaultRenderStateSet;
     QHash<QString, QString> m_defaultParameterToGLSLAttributeNames;
-    QUniformPack m_defaultUniformPack;
+    ShaderParameterPack m_defaultUniformPack;
 
     QScopedPointer<GraphicsContext> m_graphicsContext;
     QSurface *m_surface;
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 120142c51..44b7ca1a3 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -577,7 +577,7 @@ const AttachmentPack &RenderView::attachmentPack() const
     return m_attachmentPack;
 }
 
-void RenderView::setUniformValue(QUniformPack &uniformPack, const QString &name, const QVariant &value)
+void RenderView::setUniformValue(ShaderParameterPack &uniformPack, const QString &name, const QVariant &value)
 {
     if (const QUniformValue *val = uniformPack.uniform(name))
         destroyUniformValue(val, m_allocator);
@@ -600,7 +600,7 @@ void RenderView::setUniformValue(QUniformPack &uniformPack, const QString &name,
     }
 }
 
-void RenderView::setStandardUniformValue(QUniformPack &uniformPack, const QString &glslName, const QString &name, const QMatrix4x4 &worldTransform)
+void RenderView::setStandardUniformValue(ShaderParameterPack &uniformPack, const QString &glslName, const QString &name, const QMatrix4x4 &worldTransform)
 {
     if (const QUniformValue *val = uniformPack.uniform(glslName))
         destroyUniformValue(val, m_allocator);
@@ -608,7 +608,7 @@ void RenderView::setStandardUniformValue(QUniformPack &uniformPack, const QStrin
     uniformPack.setUniform(glslName, (this->*ms_standardUniformSetters[name])(worldTransform));
 }
 
-void RenderView::setUniformBlockValue(QUniformPack &uniformPack, Shader *shader, const ShaderUniformBlock &block, const QVariant &value)
+void RenderView::setUniformBlockValue(ShaderParameterPack &uniformPack, Shader *shader, const ShaderUniformBlock &block, const QVariant &value)
 {
     ShaderData *shaderData = Q_NULLPTR;
 
@@ -662,7 +662,7 @@ void RenderView::setUniformBlockValue(QUniformPack &uniformPack, Shader *shader,
     }
 }
 
-void RenderView::setDefaultUniformBlockShaderDataValue(QUniformPack &uniformPack, Shader *shader, ShaderData *shaderData, const QString &structName)
+void RenderView::setDefaultUniformBlockShaderDataValue(ShaderParameterPack &uniformPack, Shader *shader, ShaderData *shaderData, const QString &structName)
 {
     m_data->m_uniformBlockBuilder.activeUniformNamesToValue.clear();
 
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);
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index ad13b2812..b91692adc 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -844,7 +844,7 @@ void GraphicsContext::setRenderer(Renderer *renderer)
 
 // It will be easier if the QGraphicContext applies the QUniformPack
 // than the other way around
-void GraphicsContext::setUniforms(QUniformPack &uniforms)
+void GraphicsContext::setUniforms(ShaderParameterPack &uniforms)
 {
     // Activate textures and update TextureUniform in the pack
     // with the correct textureUnit
@@ -857,7 +857,7 @@ void GraphicsContext::setUniforms(QUniformPack &uniforms)
     // Update the uniforms with the correct texture unit id's
     const QHash<QString, const QUniformValue *> &uniformValues = uniforms.uniforms();
     for (int i = 0; i < uniforms.textures().size(); ++i) {
-        const QUniformPack::NamedTexture &namedTex = uniforms.textures().at(i);
+        const ShaderParameterPack::NamedTexture &namedTex = uniforms.textures().at(i);
         Texture *t = manager->lookupResource<Texture, TextureManager>(namedTex.texId);
         const TextureUniform *texUniform = Q_NULLPTR;
         // TO DO : Rework the way textures are loaded
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index 845beaf5b..3a4150ea9 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -144,7 +144,7 @@ public:
     void specifyIndices(Buffer *buffer);
     void updateBuffer(Buffer *buffer);
 
-    void setUniforms(QUniformPack &uniforms);
+    void setUniforms(ShaderParameterPack &uniforms);
 
     /**
      * @brief glBufferFor - given a client-side (CPU) buffer, provide the
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;