diff options
Diffstat (limited to 'src/plugins/renderers/rhi/managers')
-rw-r--r-- | src/plugins/renderers/rhi/managers/rhiresourcemanagers.cpp | 4 | ||||
-rw-r--r-- | src/plugins/renderers/rhi/managers/rhiresourcemanagers_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/renderers/rhi/managers/rhiresourcemanagers.cpp b/src/plugins/renderers/rhi/managers/rhiresourcemanagers.cpp index e653a364e..5be374aa2 100644 --- a/src/plugins/renderers/rhi/managers/rhiresourcemanagers.cpp +++ b/src/plugins/renderers/rhi/managers/rhiresourcemanagers.cpp @@ -94,7 +94,7 @@ int RHIGraphicsPipelineManager::getIdForAttributeVec(const std::vector<Attribute attributesInfo); if (it == m_attributesInfo.end()) { m_attributesInfo.emplace_back(attributesInfo); - return m_attributesInfo.size() - 1; + return int(m_attributesInfo.size()) - 1; } return std::distance(m_attributesInfo.begin(), it); } @@ -109,7 +109,7 @@ int RHIGraphicsPipelineManager::getIdForRenderStates(const RenderStateSetPtr &st states); if (it == m_renderStates.end()) { m_renderStates.emplace_back(states); - return m_renderStates.size() - 1; + return int(m_renderStates.size()) - 1; } return std::distance(m_renderStates.begin(), it); } diff --git a/src/plugins/renderers/rhi/managers/rhiresourcemanagers_p.h b/src/plugins/renderers/rhi/managers/rhiresourcemanagers_p.h index 677632675..0e15afe91 100644 --- a/src/plugins/renderers/rhi/managers/rhiresourcemanagers_p.h +++ b/src/plugins/renderers/rhi/managers/rhiresourcemanagers_p.h @@ -152,7 +152,7 @@ private: RHIComputePipelineManager *m_rhiComputePipelineManager; }; -inline uint qHash(const GraphicsPipelineIdentifier &key, uint seed = 0) +inline size_t qHash(const GraphicsPipelineIdentifier &key, size_t seed = 0) { const QPair<int, Qt3DCore::QNodeId> p = { key.geometryLayoutKey, key.shader }; using QT_PREPEND_NAMESPACE(qHash); @@ -172,7 +172,7 @@ inline bool operator==(const GraphicsPipelineIdentifier &a, const GraphicsPipeli a.primitiveType == b.primitiveType; } -inline uint qHash(const ComputePipelineIdentifier &key, uint seed = 0) +inline size_t qHash(const ComputePipelineIdentifier &key, size_t seed = 0) { using QT_PREPEND_NAMESPACE(qHash); seed = qHash(key.shader, seed); |