From ac70d64a037e58a1e8c0fdebc83809f50948f742 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Mon, 2 Dec 2019 08:28:38 +0000 Subject: Revert "Update jobs to remove post FF changes" d521b994450f0a4febbd789ba66701ba24fdbe22 Change-Id: Ibe6d608e8400e69b50775c0eb156e74e4e90b25c Reviewed-by: Paul Lemire --- src/animation/backend/abstractevaluateclipanimatorjob.cpp | 2 +- src/animation/backend/abstractevaluateclipanimatorjob_p.h | 3 +++ src/animation/backend/loadanimationclipjob.cpp | 2 +- src/animation/backend/loadanimationclipjob_p.h | 2 ++ src/core/jobs/qaspectjob.cpp | 5 ----- src/core/jobs/qaspectjob.h | 2 +- src/core/jobs/qaspectjob_p.h | 4 ---- src/input/backend/assignkeyboardfocusjob.cpp | 2 +- src/input/backend/assignkeyboardfocusjob_p.h | 2 ++ src/input/backend/axisaccumulatorjob.cpp | 2 +- src/input/backend/axisaccumulatorjob_p.h | 2 ++ src/input/backend/keyeventdispatcherjob.cpp | 2 +- src/input/backend/keyeventdispatcherjob_p.h | 2 ++ src/input/backend/loadproxydevicejob.cpp | 2 +- src/input/backend/loadproxydevicejob_p.h | 2 ++ src/input/backend/mouseeventdispatcherjob.cpp | 2 +- src/input/backend/mouseeventdispatcherjob_p.h | 2 ++ src/input/backend/updateaxisactionjob.cpp | 4 ++-- src/input/backend/updateaxisactionjob_p.h | 2 ++ src/render/jobs/loadbufferjob.cpp | 4 ++-- src/render/jobs/loadbufferjob_p.h | 3 +++ src/render/jobs/loadgeometryjob.cpp | 2 +- src/render/jobs/loadgeometryjob_p.h | 3 +++ src/render/jobs/loadscenejob.cpp | 2 +- src/render/jobs/loadscenejob_p.h | 1 + src/render/jobs/loadskeletonjob.cpp | 4 ++-- src/render/jobs/loadskeletonjob_p.h | 3 +++ src/render/jobs/pickboundingvolumejob.cpp | 4 ++-- src/render/jobs/pickboundingvolumejob_p.h | 2 ++ src/render/jobs/raycastingjob.cpp | 2 +- src/render/jobs/raycastingjob_p.h | 2 ++ src/render/jobs/sendbuffercapturejob.cpp | 8 ++++---- src/render/jobs/sendbuffercapturejob_p.h | 1 + src/render/jobs/updatelevelofdetailjob.cpp | 2 +- src/render/jobs/updatelevelofdetailjob_p.h | 2 ++ src/render/jobs/updateworldtransformjob.cpp | 2 +- src/render/jobs/updateworldtransformjob_p.h | 1 + 37 files changed, 60 insertions(+), 34 deletions(-) diff --git a/src/animation/backend/abstractevaluateclipanimatorjob.cpp b/src/animation/backend/abstractevaluateclipanimatorjob.cpp index e3c8e9e40..5267d4526 100644 --- a/src/animation/backend/abstractevaluateclipanimatorjob.cpp +++ b/src/animation/backend/abstractevaluateclipanimatorjob.cpp @@ -75,7 +75,7 @@ void AbstractEvaluateClipAnimatorJob::setPostFrameData(const AnimationRecord &re }), mainThreadCB.end()); // Should now only have callbacks to be called on main thread - Q_DJOB(AbstractEvaluateClipAnimatorJob); + Q_D(AbstractEvaluateClipAnimatorJob); d->m_record = record; d->m_callbacks = mainThreadCB; } diff --git a/src/animation/backend/abstractevaluateclipanimatorjob_p.h b/src/animation/backend/abstractevaluateclipanimatorjob_p.h index 7027a8639..2a8914faa 100644 --- a/src/animation/backend/abstractevaluateclipanimatorjob_p.h +++ b/src/animation/backend/abstractevaluateclipanimatorjob_p.h @@ -64,6 +64,9 @@ protected: AbstractEvaluateClipAnimatorJob(); void setPostFrameData(const AnimationRecord &record, const QVector &callbacks); + +private: + Q_DECLARE_PRIVATE(AbstractEvaluateClipAnimatorJob) }; } // Animation diff --git a/src/animation/backend/loadanimationclipjob.cpp b/src/animation/backend/loadanimationclipjob.cpp index 86d7edf87..93d4c2d9d 100644 --- a/src/animation/backend/loadanimationclipjob.cpp +++ b/src/animation/backend/loadanimationclipjob.cpp @@ -85,7 +85,7 @@ void LoadAnimationClipJob::clearDirtyAnimationClips() void LoadAnimationClipJob::run() { Q_ASSERT(m_handler); - Q_DJOB(LoadAnimationClipJob); + Q_D(LoadAnimationClipJob); d->m_updatedNodes.reserve(m_animationClipHandles.size()); AnimationClipLoaderManager *animationClipManager = m_handler->animationClipLoaderManager(); diff --git a/src/animation/backend/loadanimationclipjob_p.h b/src/animation/backend/loadanimationclipjob_p.h index 42cf27854..07d78d416 100644 --- a/src/animation/backend/loadanimationclipjob_p.h +++ b/src/animation/backend/loadanimationclipjob_p.h @@ -76,6 +76,8 @@ protected: void run() override; private: + Q_DECLARE_PRIVATE(LoadAnimationClipJob) + QVector m_animationClipHandles; Handler *m_handler; }; diff --git a/src/core/jobs/qaspectjob.cpp b/src/core/jobs/qaspectjob.cpp index bdb2063ba..318a431ac 100644 --- a/src/core/jobs/qaspectjob.cpp +++ b/src/core/jobs/qaspectjob.cpp @@ -66,11 +66,6 @@ QAspectJobPrivate *QAspectJobPrivate::get(QAspectJob *job) return job->d_func(); } -const QAspectJobPrivate *QAspectJobPrivate::get(const QAspectJob *job) -{ - return job->d_func(); -} - void QAspectJobPrivate::postFrame(QAspectManager *aspectManager) { Q_UNUSED(aspectManager) diff --git a/src/core/jobs/qaspectjob.h b/src/core/jobs/qaspectjob.h index bd86a61e1..deb8cf2ed 100644 --- a/src/core/jobs/qaspectjob.h +++ b/src/core/jobs/qaspectjob.h @@ -66,11 +66,11 @@ public: protected: explicit QAspectJob(QAspectJobPrivate &dd); + QAspectJobPrivate *d_ptr; private: Q_DISABLE_COPY(QAspectJob) Q_DECLARE_PRIVATE(QAspectJob) - QAspectJobPrivate *d_ptr; }; typedef QSharedPointer QAspectJobPtr; diff --git a/src/core/jobs/qaspectjob_p.h b/src/core/jobs/qaspectjob_p.h index 5504bd936..b16c3cad2 100644 --- a/src/core/jobs/qaspectjob_p.h +++ b/src/core/jobs/qaspectjob_p.h @@ -111,7 +111,6 @@ public: virtual ~QAspectJobPrivate(); static QAspectJobPrivate *get(QAspectJob *job); - static const QAspectJobPrivate *get(const QAspectJob *job); virtual void postFrame(QAspectManager *aspectManager); @@ -123,9 +122,6 @@ public: } // Qt3D -#define Q_DJOB(Class) \ - Class##Private *d = static_cast(Qt3DCore::QAspectJobPrivate::get(this)) - #if QT_CONFIG(qt3d_profile_jobs) #include diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp index d5947f9c9..5fe329004 100644 --- a/src/input/backend/assignkeyboardfocusjob.cpp +++ b/src/input/backend/assignkeyboardfocusjob.cpp @@ -77,7 +77,7 @@ void AssignKeyboardFocusJob::setInputHandler(InputHandler *handler) void AssignKeyboardFocusJob::run() { - Q_DJOB(AssignKeyboardFocusJob); + Q_D(AssignKeyboardFocusJob); KeyboardDevice *keyboardDevice = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice); const auto handles = m_inputHandler->keyboardInputManager()->activeHandles(); diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h index 87cc2fbda..200fd72f1 100644 --- a/src/input/backend/assignkeyboardfocusjob_p.h +++ b/src/input/backend/assignkeyboardfocusjob_p.h @@ -70,6 +70,8 @@ public: void run() override; private: + Q_DECLARE_PRIVATE(AssignKeyboardFocusJob) + InputHandler *m_inputHandler; const Qt3DCore::QNodeId m_keyboardDevice; }; diff --git a/src/input/backend/axisaccumulatorjob.cpp b/src/input/backend/axisaccumulatorjob.cpp index b6c1c8482..16a68349e 100644 --- a/src/input/backend/axisaccumulatorjob.cpp +++ b/src/input/backend/axisaccumulatorjob.cpp @@ -73,7 +73,7 @@ AxisAccumulatorJob::AxisAccumulatorJob(AxisAccumulatorManager *axisAccumulatorma void AxisAccumulatorJob::run() { - Q_DJOB(AxisAccumulatorJob); + Q_D(AxisAccumulatorJob); // Iterate over the accumulators and ask each to step the integrations const auto activeHandles = m_axisAccumulatorManager->activeHandles(); d->updates.reserve(activeHandles.size()); diff --git a/src/input/backend/axisaccumulatorjob_p.h b/src/input/backend/axisaccumulatorjob_p.h index 3e8122287..702004dd2 100644 --- a/src/input/backend/axisaccumulatorjob_p.h +++ b/src/input/backend/axisaccumulatorjob_p.h @@ -75,6 +75,8 @@ public: void run() override; private: + Q_DECLARE_PRIVATE(AxisAccumulatorJob) + AxisAccumulatorManager *m_axisAccumulatorManager; AxisManager *m_axisManager; float m_dt; diff --git a/src/input/backend/keyeventdispatcherjob.cpp b/src/input/backend/keyeventdispatcherjob.cpp index 31db01e53..26a35e885 100644 --- a/src/input/backend/keyeventdispatcherjob.cpp +++ b/src/input/backend/keyeventdispatcherjob.cpp @@ -67,7 +67,7 @@ KeyEventDispatcherJob::KeyEventDispatcherJob(Qt3DCore::QNodeId input, const QLis : QAspectJob(*new KeyEventDispatcherJobPrivate) , m_inputHandler(nullptr) { - Q_DJOB(KeyEventDispatcherJob); + Q_D(KeyEventDispatcherJob); d->m_keyboardHandler = input; d->m_events = events; SET_JOB_RUN_STAT_TYPE(this, JobTypes::KeyEventDispatcher, 0) diff --git a/src/input/backend/keyeventdispatcherjob_p.h b/src/input/backend/keyeventdispatcherjob_p.h index 975dc3d31..bd0c770d4 100644 --- a/src/input/backend/keyeventdispatcherjob_p.h +++ b/src/input/backend/keyeventdispatcherjob_p.h @@ -71,6 +71,8 @@ public: void run() override; private: + Q_DECLARE_PRIVATE(KeyEventDispatcherJob) + InputHandler *m_inputHandler; }; diff --git a/src/input/backend/loadproxydevicejob.cpp b/src/input/backend/loadproxydevicejob.cpp index 059d14bc0..69f14beae 100644 --- a/src/input/backend/loadproxydevicejob.cpp +++ b/src/input/backend/loadproxydevicejob.cpp @@ -94,7 +94,7 @@ QVector LoadProxyDeviceJob::proxies() const void LoadProxyDeviceJob::run() { - Q_DJOB(LoadProxyDeviceJob); + Q_D(LoadProxyDeviceJob); d->updates.reserve(m_proxies.size()); Q_ASSERT(m_inputHandler); diff --git a/src/input/backend/loadproxydevicejob_p.h b/src/input/backend/loadproxydevicejob_p.h index 0a425f3a5..0848c8529 100644 --- a/src/input/backend/loadproxydevicejob_p.h +++ b/src/input/backend/loadproxydevicejob_p.h @@ -76,6 +76,8 @@ public: void run() final; private: + Q_DECLARE_PRIVATE(LoadProxyDeviceJob) + InputHandler *m_inputHandler; QVector m_proxies; }; diff --git a/src/input/backend/mouseeventdispatcherjob.cpp b/src/input/backend/mouseeventdispatcherjob.cpp index b91a7b638..0ee6862fb 100644 --- a/src/input/backend/mouseeventdispatcherjob.cpp +++ b/src/input/backend/mouseeventdispatcherjob.cpp @@ -75,7 +75,7 @@ MouseEventDispatcherJob::MouseEventDispatcherJob(Qt3DCore::QNodeId input, : QAspectJob(*new MouseEventDispatcherJobPrivate) , m_inputHandler(nullptr) { - Q_DJOB(MouseEventDispatcherJob); + Q_D(MouseEventDispatcherJob); d->m_mouseInput = input; d->m_mouseEvents = mouseEvents; #if QT_CONFIG(wheelevent) diff --git a/src/input/backend/mouseeventdispatcherjob_p.h b/src/input/backend/mouseeventdispatcherjob_p.h index 983837446..696d60da4 100644 --- a/src/input/backend/mouseeventdispatcherjob_p.h +++ b/src/input/backend/mouseeventdispatcherjob_p.h @@ -76,6 +76,8 @@ public: void run() final; private: + Q_DECLARE_PRIVATE(MouseEventDispatcherJob) + InputHandler *m_inputHandler; }; diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp index 5732c2a9b..58ed36639 100644 --- a/src/input/backend/updateaxisactionjob.cpp +++ b/src/input/backend/updateaxisactionjob.cpp @@ -89,7 +89,7 @@ void UpdateAxisActionJob::run() void UpdateAxisActionJob::updateAction(LogicalDevice *device) { - Q_DJOB(UpdateAxisActionJob); + Q_D(UpdateAxisActionJob); const auto actionIds = device->actions(); d->m_triggeredActions.reserve(actionIds.size()); @@ -117,7 +117,7 @@ bool UpdateAxisActionJob::processActionInput(const Qt3DCore::QNodeId actionInput void UpdateAxisActionJob::updateAxis(LogicalDevice *device) { - Q_DJOB(UpdateAxisActionJob); + Q_D(UpdateAxisActionJob); const auto axisIds = device->axes(); d->m_triggeredAxis.reserve(axisIds.size()); diff --git a/src/input/backend/updateaxisactionjob_p.h b/src/input/backend/updateaxisactionjob_p.h index 39b5f5cf6..040ed9775 100644 --- a/src/input/backend/updateaxisactionjob_p.h +++ b/src/input/backend/updateaxisactionjob_p.h @@ -76,6 +76,8 @@ public: void run() final; private: + Q_DECLARE_PRIVATE(UpdateAxisActionJob) + void updateAction(LogicalDevice *device); bool processActionInput(const Qt3DCore::QNodeId actionInputId); void updateAxis(LogicalDevice *device); diff --git a/src/render/jobs/loadbufferjob.cpp b/src/render/jobs/loadbufferjob.cpp index 68e92cfa7..c9cbb623d 100644 --- a/src/render/jobs/loadbufferjob.cpp +++ b/src/render/jobs/loadbufferjob.cpp @@ -68,7 +68,7 @@ LoadBufferJob::LoadBufferJob(const HBuffer &handle) , m_handle(handle) , m_nodeManagers(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::LoadBuffer, 0) + SET_JOB_RUN_STAT_TYPE(this, JobTypes::LoadBuffer, 0); } LoadBufferJob::~LoadBufferJob() @@ -77,7 +77,7 @@ LoadBufferJob::~LoadBufferJob() void LoadBufferJob::run() { - Q_DJOB(LoadBufferJob); + Q_D(LoadBufferJob); // Let's leave it for the moment until this has been properly tested qCDebug(Jobs) << Q_FUNC_INFO; Buffer *buffer = m_nodeManagers->data(m_handle); diff --git a/src/render/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h index 884870a62..e86e4f835 100644 --- a/src/render/jobs/loadbufferjob_p.h +++ b/src/render/jobs/loadbufferjob_p.h @@ -77,6 +77,9 @@ public: protected: HBuffer m_handle; NodeManagers *m_nodeManagers; + +private: + Q_DECLARE_PRIVATE(LoadBufferJob) }; typedef QSharedPointer LoadBufferJobPtr; diff --git a/src/render/jobs/loadgeometryjob.cpp b/src/render/jobs/loadgeometryjob.cpp index 3d32f7d4e..88930038a 100644 --- a/src/render/jobs/loadgeometryjob.cpp +++ b/src/render/jobs/loadgeometryjob.cpp @@ -75,7 +75,7 @@ LoadGeometryJob::~LoadGeometryJob() void LoadGeometryJob::run() { - Q_DJOB(LoadGeometryJob); + Q_D(LoadGeometryJob); GeometryRenderer *geometryRenderer = m_nodeManagers->geometryRendererManager()->data(m_handle); if (geometryRenderer != nullptr) d->m_updates.push_back({ geometryRenderer->peerId(), geometryRenderer->executeFunctor() }); diff --git a/src/render/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h index 869abbe18..998d543ac 100644 --- a/src/render/jobs/loadgeometryjob_p.h +++ b/src/render/jobs/loadgeometryjob_p.h @@ -76,6 +76,9 @@ protected: void run() override; HGeometryRenderer m_handle; NodeManagers *m_nodeManagers; + +private: + Q_DECLARE_PRIVATE(LoadGeometryJob) }; typedef QSharedPointer LoadGeometryJobPtr; diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp index 22d5da887..f858f82e3 100644 --- a/src/render/jobs/loadscenejob.cpp +++ b/src/render/jobs/loadscenejob.cpp @@ -139,7 +139,7 @@ void LoadSceneJob::run() } } - Q_DJOB(LoadSceneJob); + Q_D(LoadSceneJob); d->m_sceneSubtree = sceneSubTree; d->m_status = finalStatus; diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h index 79c8a2935..3675d94c1 100644 --- a/src/render/jobs/loadscenejob_p.h +++ b/src/render/jobs/loadscenejob_p.h @@ -113,6 +113,7 @@ private: Qt3DCore::QEntity *tryLoadScene(QSceneLoader::Status &finalStatus, const QStringList &extensions, const std::function &importerSetupFunc); + Q_DECLARE_PRIVATE(LoadSceneJob) }; typedef QSharedPointer LoadSceneJobPtr; diff --git a/src/render/jobs/loadskeletonjob.cpp b/src/render/jobs/loadskeletonjob.cpp index 6f7bcd9b7..e696cc434 100644 --- a/src/render/jobs/loadskeletonjob.cpp +++ b/src/render/jobs/loadskeletonjob.cpp @@ -75,7 +75,7 @@ LoadSkeletonJob::LoadSkeletonJob(const HSkeleton &handle) void LoadSkeletonJob::run() { - Q_DJOB(LoadSkeletonJob); + Q_D(LoadSkeletonJob); d->m_backendSkeleton = nullptr; Skeleton *skeleton = m_nodeManagers->skeletonManager()->data(m_handle); @@ -120,7 +120,7 @@ void LoadSkeletonJob::loadSkeleton(Skeleton *skeleton) void LoadSkeletonJob::loadSkeletonFromUrl(Skeleton *skeleton) { - Q_DJOB(LoadSkeletonJob); + Q_D(LoadSkeletonJob); using namespace Qt3DCore; diff --git a/src/render/jobs/loadskeletonjob_p.h b/src/render/jobs/loadskeletonjob_p.h index 5ea4912ee..0cc09da3d 100644 --- a/src/render/jobs/loadskeletonjob_p.h +++ b/src/render/jobs/loadskeletonjob_p.h @@ -88,6 +88,9 @@ protected: HSkeleton m_handle; NodeManagers *m_nodeManagers; + +private: + Q_DECLARE_PRIVATE(LoadSkeletonJob) }; typedef QSharedPointer LoadSkeletonJobPtr; diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index ae0cb2350..2973ee100 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -380,7 +380,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event, bool allHitsRequested, Qt3DCore::QNodeId viewportNodeId) { - Q_DJOB(PickBoundingVolumeJob); + Q_D(PickBoundingVolumeJob); ObjectPicker *lastCurrentPicker = m_manager->objectPickerManager()->data(m_currentPicker); // If we have hits @@ -541,7 +541,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event, void PickBoundingVolumeJob::clearPreviouslyHoveredPickers() { - Q_DJOB(PickBoundingVolumeJob); + Q_D(PickBoundingVolumeJob); for (const HObjectPicker &pickHandle : qAsConst(m_hoveredPickersToClear)) { ObjectPicker *pick = m_manager->objectPickerManager()->data(pickHandle); diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h index 751d0be7b..49b11b775 100644 --- a/src/render/jobs/pickboundingvolumejob_p.h +++ b/src/render/jobs/pickboundingvolumejob_p.h @@ -102,6 +102,8 @@ protected: Qt3DCore::QNodeId viewportNodeId); private: + Q_DECLARE_PRIVATE(PickBoundingVolumeJob) + void clearPreviouslyHoveredPickers(); QList> m_pendingMouseEvents; diff --git a/src/render/jobs/raycastingjob.cpp b/src/render/jobs/raycastingjob.cpp index a6f172b86..380447873 100644 --- a/src/render/jobs/raycastingjob.cpp +++ b/src/render/jobs/raycastingjob.cpp @@ -273,7 +273,7 @@ void RayCastingJob::dispatchHits(RayCaster *rayCaster, const PickingUtils::HitLi }; } - Q_DJOB(RayCastingJob); + Q_D(RayCastingJob); d->dispatches.push_back({rayCaster, hits}); } diff --git a/src/render/jobs/raycastingjob_p.h b/src/render/jobs/raycastingjob_p.h index ba0e2f309..4b8b91ad5 100644 --- a/src/render/jobs/raycastingjob_p.h +++ b/src/render/jobs/raycastingjob_p.h @@ -82,6 +82,8 @@ protected: void dispatchHits(RayCaster *rayCaster, const PickingUtils::HitList &sphereHits); private: + Q_DECLARE_PRIVATE(RayCastingJob) + bool m_castersDirty; bool m_oneEnabledAtLeast; }; diff --git a/src/render/jobs/sendbuffercapturejob.cpp b/src/render/jobs/sendbuffercapturejob.cpp index 889a86c68..3fa185684 100644 --- a/src/render/jobs/sendbuffercapturejob.cpp +++ b/src/render/jobs/sendbuffercapturejob.cpp @@ -69,7 +69,7 @@ SendBufferCaptureJob::SendBufferCaptureJob() : Qt3DCore::QAspectJob(*new SendBufferCaptureJobPrivate) , m_nodeManagers(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::SendBufferCapture, 0) + SET_JOB_RUN_STAT_TYPE(this, JobTypes::SendBufferCapture, 0); } SendBufferCaptureJob::~SendBufferCaptureJob() @@ -79,7 +79,7 @@ SendBufferCaptureJob::~SendBufferCaptureJob() // Called from SubmitRenderView while rendering void SendBufferCaptureJob::addRequest(QPair request) { - Q_DJOB(SendBufferCaptureJob); + Q_D(SendBufferCaptureJob); QMutexLocker locker(&d->m_mutex); d->m_buffersToCapture.push_back(request); } @@ -87,7 +87,7 @@ void SendBufferCaptureJob::addRequest(QPair reque // Called by aspect thread jobs to execute (we may still be rendering at this point) bool SendBufferCaptureJob::hasRequests() const { - Q_DJOB(const SendBufferCaptureJob); + Q_D(const SendBufferCaptureJob); QMutexLocker locker(&d->m_mutex); return d->m_buffersToCapture.size() > 0; } @@ -95,7 +95,7 @@ bool SendBufferCaptureJob::hasRequests() const void SendBufferCaptureJob::run() { Q_ASSERT(m_nodeManagers); - Q_DJOB(SendBufferCaptureJob); + Q_D(SendBufferCaptureJob); QMutexLocker locker(&d->m_mutex); for (const QPair &pendingCapture : qAsConst(d->m_buffersToCapture)) { Buffer *buffer = m_nodeManagers->bufferManager()->lookupResource(pendingCapture.first); diff --git a/src/render/jobs/sendbuffercapturejob_p.h b/src/render/jobs/sendbuffercapturejob_p.h index ce797f0a9..3b9f5d12b 100644 --- a/src/render/jobs/sendbuffercapturejob_p.h +++ b/src/render/jobs/sendbuffercapturejob_p.h @@ -83,6 +83,7 @@ public: void run() final; private: + Q_DECLARE_PRIVATE(SendBufferCaptureJob) NodeManagers *m_nodeManagers; }; diff --git a/src/render/jobs/updatelevelofdetailjob.cpp b/src/render/jobs/updatelevelofdetailjob.cpp index 9ac923d8b..0a28b7628 100644 --- a/src/render/jobs/updatelevelofdetailjob.cpp +++ b/src/render/jobs/updatelevelofdetailjob.cpp @@ -248,7 +248,7 @@ void UpdateLevelOfDetailJob::setFrameGraphRoot(FrameGraphNode *frameGraphRoot) void UpdateLevelOfDetailJob::run() { - Q_DJOB(UpdateLevelOfDetailJob); + Q_D(UpdateLevelOfDetailJob); Q_ASSERT(m_frameGraphRoot && m_root && m_manager); diff --git a/src/render/jobs/updatelevelofdetailjob_p.h b/src/render/jobs/updatelevelofdetailjob_p.h index e0f9bd064..9ac5cf0e9 100644 --- a/src/render/jobs/updatelevelofdetailjob_p.h +++ b/src/render/jobs/updatelevelofdetailjob_p.h @@ -82,6 +82,8 @@ public: Entity *root() const { return m_root; } private: + Q_DECLARE_PRIVATE(UpdateLevelOfDetailJob) + NodeManagers *m_manager; FrameGraphNode *m_frameGraphRoot; Entity *m_root; diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp index ea9aa778c..d72c0a3a8 100644 --- a/src/render/jobs/updateworldtransformjob.cpp +++ b/src/render/jobs/updateworldtransformjob.cpp @@ -131,7 +131,7 @@ void UpdateWorldTransformJob::run() // TODO: Parallelise this on each level using a parallel_for // implementation. - Q_DJOB(UpdateWorldTransformJob); + Q_D(UpdateWorldTransformJob); qCDebug(Jobs) << "Entering" << Q_FUNC_INFO << QThread::currentThread(); Matrix4x4 parentTransform; diff --git a/src/render/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h index ded501a07..e7ff592de 100644 --- a/src/render/jobs/updateworldtransformjob_p.h +++ b/src/render/jobs/updateworldtransformjob_p.h @@ -78,6 +78,7 @@ public: private: Entity *m_node; NodeManagers *m_manager; + Q_DECLARE_PRIVATE(UpdateWorldTransformJob) }; typedef QSharedPointer UpdateWorldTransformJobPtr; -- cgit v1.2.3