From 925dae358913d7c614223a57552837dcc6e171e7 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Tue, 12 Jul 2022 08:25:10 +0200
Subject: 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.

Pick-to: 6.4 6.3 6.2 5.15
Change-Id: Icb5fa81c93aa95af7bf020739bfefdf7e298f986
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp | 5 ++---
 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
-- 
cgit v1.2.3