RenderViewJobs: process local Parameters per RenderPass

Change-Id: I78a3625a9f195150e224a1f03ef35999af572300
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 16 insertions, 4 deletions

diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index 126231d05..1fcd06c19 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -340,6 +340,14 @@ void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList,
         addParametersForIds(infoList, manager, effect->parameters());
 }
 
+void parametersFromRenderPass(ParameterInfoList *infoList,
+                              ParameterManager *manager,
+                              RenderRenderPass *pass)
+{
+    if (pass)
+        addParametersForIds(infoList, manager, pass->parameters());
+}
+
 RenderStateSet *buildRenderStateSet(const QList<RenderState*> &states, QFrameAllocator *allocator)
 {
     if (states.isEmpty())
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h
index 8d43f1c9f..4f9418dfe 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -80,8 +80,8 @@ Q_AUTOTEST_EXPORT RenderRenderPassList findRenderPassesForTechnique(Renderer *re
 struct ParameterInfo
 {
     ParameterInfo(const QString &name = QString(), const QVariant &value = QVariant())
-      : name(name)
-      , value(value)
+        : name(name)
+        , value(value)
     {}
 
     QString name;
@@ -101,6 +101,10 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
                                                              RenderEffect *effect,
                                                              RenderTechnique *technique);
 
+Q_AUTOTEST_EXPORT void parametersFromRenderPass(ParameterInfoList *infoList,
+                                                ParameterManager *manager,
+                                                RenderRenderPass *pass);
+
 Q_AUTOTEST_EXPORT ParameterInfoList::iterator findParamInfo(ParameterInfoList *infoList,
                                                             const QString &name);
 
@@ -114,8 +118,8 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
     ~UniformBlockValueBuilder();
 
     void buildActiveUniformNameValueMapHelper(const QString &blockName,
-                                        const QString &qmlPropertyName,
-                                        const QVariant &value);
+                                              const QString &qmlPropertyName,
+                                              const QVariant &value);
     void buildActiveUniformNameValueMapStructHelper(RenderShaderData *rShaderData,
                                                     const QString &blockName,
                                                     const QString &qmlPropertyName = QString());