summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/render/backend/renderer.cpp8
-rw-r--r--src/render/backend/renderer_p.h6
-rw-r--r--src/render/framegraph/framegraphvisitor.cpp2
-rw-r--r--src/render/jobs/expandboundingvolumejob.cpp (renamed from src/render/jobs/updateboundingvolumejob.cpp)10
-rw-r--r--src/render/jobs/expandboundingvolumejob_p.h (renamed from src/render/jobs/updateboundingvolumejob_p.h)12
-rw-r--r--src/render/jobs/job_common_p.h2
-rw-r--r--src/render/jobs/jobs.pri8
-rw-r--r--tests/benchmarks/render/jobs/tst_bench_jobs.cpp4
8 files changed, 26 insertions, 26 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 253864d45..6b3a43e24 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -154,7 +154,7 @@ Renderer::Renderer(QRenderAspect::RenderType type)
, m_framePreparationJob(Render::FramePreparationJobPtr::create())
, m_cleanupJob(Render::FrameCleanupJobPtr::create())
, m_worldTransformJob(Render::UpdateWorldTransformJobPtr::create())
- , m_updateBoundingVolumeJob(Render::UpdateBoundingVolumeJobPtr::create())
+ , m_expandBoundingVolumeJob(Render::ExpandBoundingVolumeJobPtr::create())
, m_calculateBoundingVolumeJob(Render::CalculateBoundingVolumeJobPtr::create())
{
// Set renderer as running - it will wait in the context of the
@@ -165,7 +165,7 @@ 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_updateBoundingVolumeJob->addDependency(m_worldTransformJob);
+ m_expandBoundingVolumeJob->addDependency(m_worldTransformJob);
m_framePreparationJob->addDependency(m_worldTransformJob);
// All world stuff depends on the RenderEntity's localBoundingVolume
@@ -497,7 +497,7 @@ void Renderer::setSceneRoot(QBackendNodeFactory *factory, Entity *sgRoot)
// Set the scene root on the jobs
m_framePreparationJob->setRoot(m_renderSceneRoot);
m_worldTransformJob->setRoot(m_renderSceneRoot);
- m_updateBoundingVolumeJob->setRoot(m_renderSceneRoot);
+ m_expandBoundingVolumeJob->setRoot(m_renderSceneRoot);
m_calculateBoundingVolumeJob->setRoot(m_renderSceneRoot);
m_cleanupJob->setRoot(m_renderSceneRoot);
m_pickBoundingVolumeJob->setRoot(m_renderSceneRoot);
@@ -900,7 +900,7 @@ QVector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
// Add jobs
renderBinJobs.push_back(m_framePreparationJob);
- renderBinJobs.push_back(m_updateBoundingVolumeJob);
+ renderBinJobs.push_back(m_expandBoundingVolumeJob);
renderBinJobs.push_back(m_calculateBoundingVolumeJob);
renderBinJobs.push_back(m_worldTransformJob);
renderBinJobs.push_back(m_cleanupJob);
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 56638ce65..0d00445e0 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -62,7 +62,7 @@
#include <Qt3DRender/private/pickboundingvolumejob_p.h>
#include <Qt3DRender/private/rendersettings_p.h>
#include <Qt3DRender/private/renderviewinitializerjob_p.h>
-#include <Qt3DRender/private/updateboundingvolumejob_p.h>
+#include <Qt3DRender/private/expandboundingvolumejob_p.h>
#include <Qt3DRender/private/updateworldtransformjob_p.h>
#include <Qt3DRender/private/calcboundingvolumejob_p.h>
#include <Qt3DRender/private/framepreparationjob_p.h>
@@ -173,7 +173,7 @@ public:
QVector<Qt3DCore::QAspectJobPtr> createRenderBufferJobs() const;
inline FrameCleanupJobPtr frameCleanupJob() const { return m_cleanupJob; }
- inline UpdateBoundingVolumeJobPtr updateBoundingVolumeJob() const { return m_updateBoundingVolumeJob; }
+ inline ExpandBoundingVolumeJobPtr expandBoundingVolumeJob() const { return m_expandBoundingVolumeJob; }
inline FramePreparationJobPtr framePreparationJob() const { return m_framePreparationJob; }
inline CalculateBoundingVolumeJobPtr calculateBoundingVolumeJob() const { return m_calculateBoundingVolumeJob; }
inline UpdateWorldTransformJobPtr updateWorldTransformJob() const { return m_worldTransformJob; }
@@ -296,7 +296,7 @@ private:
FramePreparationJobPtr m_framePreparationJob;
FrameCleanupJobPtr m_cleanupJob;
UpdateWorldTransformJobPtr m_worldTransformJob;
- UpdateBoundingVolumeJobPtr m_updateBoundingVolumeJob;
+ ExpandBoundingVolumeJobPtr m_expandBoundingVolumeJob;
CalculateBoundingVolumeJobPtr m_calculateBoundingVolumeJob;
void performDraw(GeometryRenderer *rGeometryRenderer,
diff --git a/src/render/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index 4cb4a0459..eccc831c9 100644
--- a/src/render/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
@@ -299,7 +299,7 @@ void FrameGraphVisitor::visit(Render::FrameGraphNode *node)
auto syncRenderViewCommandBuildersJob = GenericLambdaJobPtr<decltype(syncRenderViewCommandBuilders)>::create(syncRenderViewCommandBuilders);
// Set dependencies
- renderViewJob->addDependency(renderer->updateBoundingVolumeJob());
+ renderViewJob->addDependency(renderer->expandBoundingVolumeJob());
syncRenderViewInitializationJob->addDependency(renderViewJob);
filterEntityByLayer->addDependency(syncRenderViewInitializationJob);
diff --git a/src/render/jobs/updateboundingvolumejob.cpp b/src/render/jobs/expandboundingvolumejob.cpp
index 9a4a9f27e..eb3f72b4a 100644
--- a/src/render/jobs/updateboundingvolumejob.cpp
+++ b/src/render/jobs/expandboundingvolumejob.cpp
@@ -37,7 +37,7 @@
**
****************************************************************************/
-#include "updateboundingvolumejob_p.h"
+#include "expandboundingvolumejob_p.h"
#include <Qt3DRender/private/renderer_p.h>
#include <Qt3DRender/private/entity_p.h>
@@ -72,18 +72,18 @@ void expandWorldBoundingVolume(Qt3DRender::Render::Entity *node)
}
-UpdateBoundingVolumeJob::UpdateBoundingVolumeJob()
+ExpandBoundingVolumeJob::ExpandBoundingVolumeJob()
: m_node(nullptr)
{
- SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateBoundingVolume, 0);
+ SET_JOB_RUN_STAT_TYPE(this, JobTypes::ExpendBoundingVolume, 0);
}
-void UpdateBoundingVolumeJob::setRoot(Entity *root)
+void ExpandBoundingVolumeJob::setRoot(Entity *root)
{
m_node = root;
}
-void UpdateBoundingVolumeJob::run()
+void ExpandBoundingVolumeJob::run()
{
// Expand worldBoundingVolumeWithChildren of each node that has children by the
// bounding volumes of the children.
diff --git a/src/render/jobs/updateboundingvolumejob_p.h b/src/render/jobs/expandboundingvolumejob_p.h
index ee140f807..d20722eb8 100644
--- a/src/render/jobs/updateboundingvolumejob_p.h
+++ b/src/render/jobs/expandboundingvolumejob_p.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
-#define QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#ifndef QT3DRENDER_RENDER_EXPANDBOUNDINGVOLUMEJOB_H
+#define QT3DRENDER_RENDER_EXPANDBOUNDINGVOLUMEJOB_H
//
// W A R N I N G
@@ -63,10 +63,10 @@ namespace Render {
class Entity;
-class QT3DRENDERSHARED_PRIVATE_EXPORT UpdateBoundingVolumeJob : public Qt3DCore::QAspectJob
+class QT3DRENDERSHARED_PRIVATE_EXPORT ExpandBoundingVolumeJob : public Qt3DCore::QAspectJob
{
public:
- UpdateBoundingVolumeJob();
+ ExpandBoundingVolumeJob();
void setRoot(Entity *root);
@@ -77,11 +77,11 @@ private:
Entity *m_node;
};
-typedef QSharedPointer<UpdateBoundingVolumeJob> UpdateBoundingVolumeJobPtr;
+typedef QSharedPointer<ExpandBoundingVolumeJob> ExpandBoundingVolumeJobPtr;
} // namespace Render
} // namespace Qt3DRender
QT_END_NAMESPACE
-#endif // QT3DRENDER_RENDER_UPDATEBOUNDINGVOLUMEJOB_H
+#endif // QT3DRENDER_RENDER_EXPANDBOUNDINGVOLUMEJOB_H
diff --git a/src/render/jobs/job_common_p.h b/src/render/jobs/job_common_p.h
index 89208c486..60f3153a0 100644
--- a/src/render/jobs/job_common_p.h
+++ b/src/render/jobs/job_common_p.h
@@ -73,7 +73,7 @@ namespace JobTypes {
PickBoundingVolume,
RenderView,
UpdateTransform,
- UpdateBoundingVolume,
+ ExpandBoundingVolume,
FrameSubmission,
LayerFiltering,
EntityComponentTypeFiltering,
diff --git a/src/render/jobs/jobs.pri b/src/render/jobs/jobs.pri
index 079907d62..8241b8a97 100644
--- a/src/render/jobs/jobs.pri
+++ b/src/render/jobs/jobs.pri
@@ -2,7 +2,6 @@ INCLUDEPATH += $$PWD
HEADERS += \
$$PWD/updateworldtransformjob_p.h \
- $$PWD/updateboundingvolumejob_p.h \
$$PWD/renderviewjobutils_p.h \
$$PWD/loadscenejob_p.h \
$$PWD/framecleanupjob_p.h \
@@ -21,11 +20,11 @@ HEADERS += \
$$PWD/renderviewbuilderjob_p.h \
$$PWD/renderviewinitializerjob_p.h \
$$PWD/frustumcullingjob_p.h \
- $$PWD/lightgatherer_p.h
+ $$PWD/lightgatherer_p.h \
+ $$PWD/expandboundingvolumejob_p.h
SOURCES += \
$$PWD/updateworldtransformjob.cpp \
- $$PWD/updateboundingvolumejob.cpp \
$$PWD/renderviewjobutils.cpp \
$$PWD/loadscenejob.cpp \
$$PWD/framecleanupjob.cpp \
@@ -41,4 +40,5 @@ SOURCES += \
$$PWD/renderviewbuilderjob.cpp \
$$PWD/renderviewinitializerjob.cpp \
$$PWD/frustumcullingjob.cpp \
- $$PWD/lightgatherer.cpp
+ $$PWD/lightgatherer.cpp \
+ $$PWD/expandboundingvolumejob.cpp
diff --git a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
index cf0f6bb92..0c1fcc480 100644
--- a/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
+++ b/tests/benchmarks/render/jobs/tst_bench_jobs.cpp
@@ -96,8 +96,8 @@ namespace Qt3DRender {
QVector<Qt3DCore::QAspectJobPtr> updateBoundingJob()
{
- static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateBoundingVolumeJob->setRoot(d_func()->m_renderer->sceneRoot());
- return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateBoundingVolumeJob;
+ static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob->setManager(d_func()->m_renderer->nodeManagers()->renderNodesManager());
+ return QVector<Qt3DCore::QAspectJobPtr>() << static_cast<Render::Renderer *>(d_func()->m_renderer)->m_updateWorldBoundingVolumeJob;
}
QVector<Qt3DCore::QAspectJobPtr> calculateBoundingVolumeJob()
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 22:55:29 +0000