summaryrefslogtreecommitdiffstats
path: root/src/plugins/renderers/opengl/renderer/renderer.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-01-28 17:01:59 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-01-29 07:58:27 +0000
commit498b39a5136bc13f20a9cf0b3c92e6a7ff796fb5 (patch)
treec125c5ab01b48bc70fbd4278bd580acd5e1d43e5 /src/plugins/renderers/opengl/renderer/renderer.cpp
parent2335abeaf994950a2420c33802b4cdd63dbc3323 (diff)
Fix a number of MSVC int conversion warnings
- Port the qHash() functions to size_t - Add some casts - Adapt some types Change-Id: Ib889d46dd56c1a1c4bf6b87ae1f756c188069180 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 05767abb7ef1b3c9c84633e53c29483510ba746d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins/renderers/opengl/renderer/renderer.cpp')
-rw-r--r--src/plugins/renderers/opengl/renderer/renderer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index 085556a88..4fcf35496 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -1866,7 +1866,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
const size_t fgBranchCount = m_frameGraphLeaves.size();
if (fgBranchCount > 1) {
- int workBranches = fgBranchCount;
+ int workBranches = int(fgBranchCount);
for (auto leaf: m_frameGraphLeaves)
if (leaf->nodeType() == FrameGraphNode::NoDraw)
--workBranches;
@@ -1877,7 +1877,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
for (size_t i = 0; i < fgBranchCount; ++i) {
FrameGraphNode *leaf = m_frameGraphLeaves[i];
- RenderViewBuilder builder(leaf, i, this);
+ RenderViewBuilder builder(leaf, int(i), this);
builder.setOptimalJobCount(leaf->nodeType() == FrameGraphNode::NoDraw ? 1 : idealThreadCount);
// If we have a new RV (wasn't in the cache before, then it contains no cached data)
@@ -1896,7 +1896,7 @@ std::vector<Qt3DCore::QAspectJobPtr> Renderer::renderBinJobs()
}
// Set target number of RenderViews
- m_renderQueue.setTargetRenderViewCount(fgBranchCount);
+ m_renderQueue.setTargetRenderViewCount(int(fgBranchCount));
if (isRunning() && m_submissionContext->isInitialized()) {
if (dirtyBitsForFrame & AbstractRenderer::TechniquesDirty )