summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvenn-Arne Dragly <s@dragly.com>2018-01-30 09:21:38 +0100
committerSvenn-Arne Dragly <svenn-arne.dragly@qt.io>2018-02-01 12:29:32 +0000
commita819190eb71ceb6bb9202f0b3497cc117d8331e7 (patch)
treeeb70f3e4a73239ea86f7c73b9c33b371859e425c
parent929e72e36cc10556bdf33a50911f2cd651f0b8dc (diff)
Make ShaderGathererJob depend on FilterCompatibleTechniques
The ShaderGathererJob will use Technique::isCompatibleWithRenderer() while looking for dirty shaders. This is set in the FilterCompatibleTechniquesJob, but it might run after (or, even worse, at the same time as) ShaderGathererJob. Task-number: QTBUG-66024 Change-Id: I929e87b9c67068b51f7d64c637b1741d743b1839 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--src/render/backend/renderer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index c1b5760c7..7ed62a98f 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -217,6 +217,8 @@ Renderer::Renderer(QRenderAspect::RenderType type)
m_updateLevelOfDetailJob->addDependency(m_updateMeshTriangleListJob);
m_pickBoundingVolumeJob->addDependency(m_updateMeshTriangleListJob);
+ m_shaderGathererJob->addDependency(m_filterCompatibleTechniqueJob);
+
m_filterCompatibleTechniqueJob->setRenderer(this);
m_defaultRenderStateSet = new RenderStateSet;