summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/backend/attachmentpack.cpp2
-rw-r--r--src/render/backend/stringtoint.cpp2
-rw-r--r--src/render/jobs/rendersyncjobs_p.h10
3 files changed, 7 insertions, 7 deletions
diff --git a/src/render/backend/attachmentpack.cpp b/src/render/backend/attachmentpack.cpp
index 834b82bed..2acd08585 100644
--- a/src/render/backend/attachmentpack.cpp
+++ b/src/render/backend/attachmentpack.cpp
@@ -92,7 +92,7 @@ int AttachmentPack::getDrawBufferIndex(QRenderTargetOutput::AttachmentPoint atta
{
for (size_t i = 0; i < m_drawBuffers.size(); i++)
if (m_drawBuffers.at(i) == (int)attachmentPoint)
- return i;
+ return int(i);
return -1;
}
diff --git a/src/render/backend/stringtoint.cpp b/src/render/backend/stringtoint.cpp
index b08d4336e..0114bcff3 100644
--- a/src/render/backend/stringtoint.cpp
+++ b/src/render/backend/stringtoint.cpp
@@ -85,7 +85,7 @@ int StringToInt::lookupId(const QString &str)
std::unique_lock writeLocker(cache.lock);
idx = cache.map.value(str, -1);
if (idx < 0) {
- idx = cache.reverseMap.size();
+ idx = int(cache.reverseMap.size());
Q_ASSERT(size_t(cache.map.size()) == cache.reverseMap.size());
cache.map.insert(str, idx);
cache.reverseMap.push_back(str);
diff --git a/src/render/jobs/rendersyncjobs_p.h b/src/render/jobs/rendersyncjobs_p.h
index 856126e24..2307e509f 100644
--- a/src/render/jobs/rendersyncjobs_p.h
+++ b/src/render/jobs/rendersyncjobs_p.h
@@ -112,8 +112,8 @@ public:
rv->setMaterialParameterTable(dataCacheForLeaf.materialParameterGatherer);
// Split among the ideal number of command builders
- const int jobCount = m_renderViewCommandBuilderJobs.size();
- const int entityCount = entities.size();
+ const int jobCount = int(m_renderViewCommandBuilderJobs.size());
+ const int entityCount = int(entities.size());
const int idealPacketSize = std::min(std::max(10, entityCount / jobCount), entityCount);
// Try to split work into an ideal number of workers
const int m = findIdealNumberOfWorkers(entityCount, idealPacketSize, jobCount);
@@ -319,7 +319,7 @@ public:
{
int totalCommandCount = 0;
for (const RenderViewCommandBuilderJobPtrAlias &renderViewCommandBuilder : qAsConst(m_renderViewCommandBuilderJobs))
- totalCommandCount += renderViewCommandBuilder->commandData().size();
+ totalCommandCount += int(renderViewCommandBuilder->commandData().size());
commandData.reserve(totalCommandCount);
for (const RenderViewCommandBuilderJobPtrAlias &renderViewCommandBuilder : qAsConst(m_renderViewCommandBuilderJobs))
commandData += std::move(renderViewCommandBuilder->commandData());
@@ -439,8 +439,8 @@ public:
}
// Split among the number of command updaters
- const int jobCount = m_renderViewCommandUpdaterJobs.size();
- const int commandCount = filteredCommandData->size();
+ const int jobCount = int(m_renderViewCommandUpdaterJobs.size());
+ const int commandCount = int(filteredCommandData->size());
const int idealPacketSize = std::min(std::max(10, commandCount), commandCount);
const int m = findIdealNumberOfWorkers(commandCount, idealPacketSize, jobCount);