Revert "Move calculateBoundingVolumeJob dependency on updateTreeEnabledJob"

This reverts commit e1d1a59eb04f8b17582571275073a6cfa10e9e32.

This change could lead to an explosion in job dependencies, and wasn't
necessary, since only null jobs were cleared each frame.

Change-Id: I2a4963f7edc9d3ad22531978c664fc05943b6483
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp
index aced13fc5..cbb4751f9 100644
--- a/src/render/renderers/opengl/renderer/renderer.cpp
+++ b/src/render/renderers/opengl/renderer/renderer.cpp
@@ -308,13 +308,13 @@ Renderer::Renderer(QRenderAspect::RenderType type)
 
     // Create jobs to update transforms and bounding volumes
     // We can only update bounding volumes once all world transforms are known
+    m_calculateBoundingVolumeJob->addDependency(m_updateTreeEnabledJob);
     m_updateWorldBoundingVolumeJob->addDependency(m_worldTransformJob);
     m_updateWorldBoundingVolumeJob->addDependency(m_calculateBoundingVolumeJob);
     m_expandBoundingVolumeJob->addDependency(m_updateWorldBoundingVolumeJob);
     m_updateShaderDataTransformJob->addDependency(m_worldTransformJob);
     m_pickBoundingVolumeJob->addDependency(m_expandBoundingVolumeJob);
     m_rayCastingJob->addDependency(m_expandBoundingVolumeJob);
-    // m_calculateBoundingVolumeJob's dependency on m_updateTreeEnabledJob is set in renderBinJobs
 
     // Ensures all skeletons are loaded before we try to update them
     m_updateSkinningPaletteJob->addDependency(m_syncLoadingJobs);
@@ -1840,12 +1840,8 @@ QVector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
 
     // Add jobs
     const bool entitiesEnabledDirty = dirtyBitsForFrame & AbstractRenderer::EntityEnabledDirty;
-    if (entitiesEnabledDirty) {
+    if (entitiesEnabledDirty)
         renderBinJobs.push_back(m_updateTreeEnabledJob);
-        // This dependency is added here because we clear all dependencies
-        // at the start of this function.
-        m_calculateBoundingVolumeJob->addDependency(m_updateTreeEnabledJob);
-    }
 
     if (dirtyBitsForFrame & AbstractRenderer::TransformDirty) {
         renderBinJobs.push_back(m_worldTransformJob);