diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-14 18:33:39 +0100 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-16 13:54:27 +0000 |
commit | edb8095b8c9a9d86f6b6abccf5d4d821470a5154 (patch) | |
tree | 368e6868ed34a166d96e3e31c36be4070c31f808 /src/render | |
parent | c10370585b6228c3564a22f22ec60ee24c9fe9f1 (diff) |
Change the idiom to clear null job dependencies
The "clearNull" method is kind of surprising so make QAspectJob API more
usual. Also the "clearNull" method was only used twice so change the
idiom to go through removeDependency if that one receives a null
pointer.
Change-Id: Ib74e1054ba52754b1a19d6c3e9268fa9ff14edaf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/backend/renderer.cpp | 2 | ||||
-rw-r--r-- | src/render/frontend/qrenderaspect.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index c64d811cd..5fdd6e136 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -748,7 +748,7 @@ QAspectJobPtr Renderer::pickBoundingVolumeJob() // Clear any previous dependency not valid anymore if (!m_pickBoundingVolumeJob) m_pickBoundingVolumeJob.reset(new PickBoundingVolumeJob(this)); - m_pickBoundingVolumeJob->clearNullDependencies(); + m_pickBoundingVolumeJob->removeDependency(QWeakPointer<QAspectJob>()); m_pickBoundingVolumeJob->setRoot(m_renderSceneRoot); return m_pickBoundingVolumeJob; } diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp index b2b85bddf..685879f8c 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -350,7 +350,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time) } // Clear any previous temporary dependency - d->m_calculateBoundingVolumeJob->clearNullDependencies(); + d->m_calculateBoundingVolumeJob->removeDependency(QWeakPointer<QAspectJob>()); const QVector<QAspectJobPtr> bufferJobs = createRenderBufferJobs(); Q_FOREACH (const QAspectJobPtr bufferJob, bufferJobs) d->m_calculateBoundingVolumeJob->addDependency(bufferJob); |