MaterialParameterGathererJob: remove unneeded renderer member

Change-Id: I05bef741048fbb29fab261b48f48a20d1d131bcc
Reviewed-by: Mike Krus <mike.krus@kdab.com>

8 files changed, 5 insertions, 14 deletions

diff --git a/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp b/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp
index bae516c7e..5e56e817f 100644
--- a/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp
+++ b/src/render/renderers/opengl/jobs/materialparametergathererjob.cpp
@@ -62,7 +62,6 @@ MaterialParameterGathererJob::MaterialParameterGathererJob()
     , m_manager(nullptr)
     , m_techniqueFilter(nullptr)
     , m_renderPassFilter(nullptr)
-    , m_renderer(nullptr)
 {
     SET_JOB_RUN_STAT_TYPE(this, JobTypes::MaterialParameterGathering, materialParameterGathererCounter++);
 }
@@ -86,7 +85,7 @@ void MaterialParameterGathererJob::run()
             continue;
 
         Effect *effect = m_manager->effectManager()->lookupResource(material->effect());
-        Technique *technique = findTechniqueForEffect(m_renderer, m_techniqueFilter, effect);
+        Technique *technique = findTechniqueForEffect(m_manager, m_techniqueFilter, effect);
 
         if (Q_LIKELY(technique != nullptr)) {
             RenderPassList passes = findRenderPassesForTechnique(m_manager, m_renderPassFilter, technique);
diff --git a/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h
index 687163387..fbfac3364 100644
--- a/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h
+++ b/src/render/renderers/opengl/jobs/materialparametergathererjob_p.h
@@ -78,8 +78,7 @@ public:
     inline void setNodeManagers(NodeManagers *manager) Q_DECL_NOTHROW { m_manager = manager; }
     inline void setTechniqueFilter(TechniqueFilter *techniqueFilter) Q_DECL_NOTHROW { m_techniqueFilter = techniqueFilter; }
     inline void setRenderPassFilter(RenderPassFilter *renderPassFilter) Q_DECL_NOTHROW { m_renderPassFilter = renderPassFilter; }
-    inline void setRenderer(Renderer *renderer) Q_DECL_NOTHROW { m_renderer = renderer; }
-    inline const MaterialParameterGathererData &materialToPassAndParameter() Q_DECL_NOTHROW { return m_parameters; }
+    inline const QHash<Qt3DCore::QNodeId, QVector<RenderPassParameterData>> &materialToPassAndParameter() Q_DECL_NOTHROW { return m_parameters; }
     inline void setHandles(const QVector<HMaterial> &handles) Q_DECL_NOTHROW { m_handles = handles; }
 
     inline TechniqueFilter *techniqueFilter() const Q_DECL_NOTHROW { return m_techniqueFilter; }
@@ -91,7 +90,6 @@ private:
     NodeManagers *m_manager;
     TechniqueFilter *m_techniqueFilter;
     RenderPassFilter *m_renderPassFilter;
-    Renderer *m_renderer;
 
     // Material id to array of RenderPasse with parameters
     MaterialParameterGathererData m_parameters;
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
index 40fe71b2f..629e7e935 100644
--- a/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils.cpp
@@ -283,17 +283,15 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
 
 /*!
     \internal
-    Searches the \a renderer for the best matching Technique from
-    \a effect specified by the \a renderView.
+    Searches the best matching Technique from \a effect specified.
 */
-Technique *findTechniqueForEffect(Renderer *renderer,
+Technique *findTechniqueForEffect(NodeManagers *manager,
                                   const TechniqueFilter *techniqueFilter,
                                   Effect *effect)
 {
     if (!effect)
         return nullptr;
 
-    NodeManagers *manager = renderer->nodeManagers();
     QVector<Technique*> matchingTechniques;
     const bool hasInvalidTechniqueFilter = (techniqueFilter == nullptr || techniqueFilter->filters().isEmpty());
 
diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
index 468a95bfd..3986f837d 100644
--- a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
+++ b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h
@@ -92,7 +92,7 @@ class RenderStateCollection;
 Q_AUTOTEST_EXPORT void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv,
                                                                  const FrameGraphNode *fgLeaf);
 
-Q_AUTOTEST_EXPORT Technique *findTechniqueForEffect(Renderer *renderer,
+Q_AUTOTEST_EXPORT Technique *findTechniqueForEffect(NodeManagers *manager,
                                                     const TechniqueFilter *techniqueFilter,
                                                     Effect *effect);
 
diff --git a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp
index d08bd6dd4..515767caa 100644
--- a/src/render/renderers/opengl/renderer/renderviewbuilder.cpp
+++ b/src/render/renderers/opengl/renderer/renderviewbuilder.cpp
@@ -475,7 +475,6 @@ void RenderViewBuilder::prepareJobs()
         for (auto i = 0; i < RenderViewBuilder::m_optimalParallelJobCount; ++i) {
             auto materialGatherer = Render::MaterialParameterGathererJobPtr::create();
             materialGatherer->setNodeManagers(m_renderer->nodeManagers());
-            materialGatherer->setRenderer(m_renderer);
             if (i == RenderViewBuilder::m_optimalParallelJobCount - 1)
                 materialGatherer->setHandles(materialHandles.mid(i * elementsPerJob, elementsPerJob + lastRemaingElements));
             else
diff --git a/tests/auto/render/materialparametergathererjob/tst_materialparametergathererjob.cpp b/tests/auto/render/materialparametergathererjob/tst_materialparametergathererjob.cpp
index f3b2fd435..20b0bf173 100644
--- a/tests/auto/render/materialparametergathererjob/tst_materialparametergathererjob.cpp
+++ b/tests/auto/render/materialparametergathererjob/tst_materialparametergathererjob.cpp
@@ -97,7 +97,6 @@ public:
     {
         Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create();
         job->setNodeManagers(nodeManagers());
-        job->setRenderer(static_cast<Render::Renderer *>(d_func()->m_renderer));
         return job;
     }
 
diff --git a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp
index 14b304be6..cb51012c1 100644
--- a/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp
+++ b/tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp
@@ -90,7 +90,6 @@ public:
     {
         Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create();
         job->setNodeManagers(nodeManagers());
-        job->setRenderer(static_cast<Render::Renderer *>(d_func()->m_renderer));
         return job;
     }
 
diff --git a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
index d82643439..b0d64b564 100644
--- a/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
+++ b/tests/benchmarks/render/materialparametergathering/tst_bench_materialparametergathering.cpp
@@ -82,7 +82,6 @@ public:
     {
         Render::MaterialParameterGathererJobPtr job = Render::MaterialParameterGathererJobPtr::create();
         job->setNodeManagers(nodeManagers());
-        job->setRenderer(static_cast<Render::Renderer *>(d_func()->m_renderer));
         return job;
     }