diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2022-07-12 08:25:10 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-12 12:29:54 +0000 |
| commit | 6489474107c1ea00cb1d683b22c47353cd7df326 (patch) | |
| tree | a28076cfaab8ed4593ccc51953867c861a8ec9eb | |
| parent | 0d1fb8274180fe80146db4d17408950f938ae0a2 (diff) | |
| download | qt3d-6489474107c1ea00cb1d683b22c47353cd7df326.tar.gz | |
RenderViewBuilder: use QAspectManager::idealThreadCount
Rather than QThread::idealThreadCount which isn't cached and could potentially
return different values over time unlike QAspectManager::idealThreadCount
which is cached and constant.
Change-Id: Icb5fa81c93aa95af7bf020739bfefdf7e298f986
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
(cherry picked from commit 925dae358913d7c614223a57552837dcc6e171e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp index 0914a8b8c..7f7829b40 100644 --- a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp +++ b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp @@ -4,8 +4,7 @@ #include "renderviewbuilder_p.h" #include <Qt3DRender/private/qrenderaspect_p.h> #include <Qt3DRender/private/rendersyncjobs_p.h> - -#include <QThread> +#include <Qt3DCore/private/qaspectjobmanager_p.h> QT_BEGIN_NAMESPACE @@ -54,7 +53,7 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende // In some cases having less jobs is better (especially on fast cpus where // splitting just adds more overhead). Ideally, we should try to set the value // depending on the platform/CPU/nbr of cores - m_optimalParallelJobCount = QThread::idealThreadCount(); + m_optimalParallelJobCount = Qt3DCore::QAspectJobManager::idealThreadCount(); } RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const diff --git a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp index 2686b9bf9..035848e13 100644 --- a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp +++ b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp @@ -3,8 +3,7 @@ #include "renderviewbuilder_p.h" #include <Qt3DRender/private/qrenderaspect_p.h> - -#include <QThread> +#include <Qt3DCore/private/qaspectjobmanager_p.h> QT_BEGIN_NAMESPACE @@ -27,7 +26,7 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende // In some cases having less jobs is better (especially on fast cpus where // splitting just adds more overhead). Ideally, we should try to set the value // depending on the platform/CPU/nbr of cores - m_optimalParallelJobCount = QThread::idealThreadCount(); + m_optimalParallelJobCount = Qt3DCore::QAspectJobManager::idealThreadCount(); } RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const |