From 248c889369ec0ca236a0dca83c50811a82018747 Mon Sep 17 00:00:00 2001 From: Tanner Van De Walle Date: Wed, 1 May 2024 15:34:09 -0700 Subject: [PATCH] Fix narrow/wide type comparison in loop condition --- include/InputLayout.inl | 2 +- src/device.cpp | 4 ++-- src/shader.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/InputLayout.inl b/include/InputLayout.inl index fb5466b..f382ed5 100644 --- a/include/InputLayout.inl +++ b/include/InputLayout.inl @@ -39,7 +39,7 @@ namespace D3D11On12 UINT NumParameters = pVS->m_IOSemantics.m_InputSignature.GetParameters(&pParameters); // Find each input element's semantic by matching registers - for (UINT i = 0; i < m_APIElements.size(); ++i) + for (size_t i = 0; i < m_APIElements.size(); ++i) { UINT Register = m_Registers[i]; auto iter = std::find_if(pParameters, pParameters + NumParameters, diff --git a/src/device.cpp b/src/device.cpp index eb06cf2..eff38ff 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -804,12 +804,12 @@ namespace D3D11On12 GetBatchedContext().RenameAndMapBuffer(m_spInterfaceBuffers[eShaderType].get(), &Data); UINT* pDataUINTs = reinterpret_cast(Data.pData); - for (UINT i = 0; i < m_InterfaceInstances[eShaderType].size(); ++i) + for (size_t i = 0; i < m_InterfaceInstances[eShaderType].size(); ++i) { *pDataUINTs = m_InterfaceInstances[eShaderType][i]; pDataUINTs += 4; // Legacy CB alignment issues } - for (UINT i = 0; i < m_InterfacePointerData[eShaderType].size(); ++i) + for (size_t i = 0; i < m_InterfacePointerData[eShaderType].size(); ++i) { pDataUINTs[0] = m_InterfacePointerData[eShaderType][i].uCBID; pDataUINTs[1] = m_InterfacePointerData[eShaderType][i].uCBOffset; diff --git a/src/shader.cpp b/src/shader.cpp index 871466c..d938804 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -209,7 +209,7 @@ namespace D3D11On12 // API and DDI decls might be different sizes, because the DDI only allows gaps 4 components at a time // Walk the DDI decls, and increment the API decl when: 1. We have a non-gap, or // 2. When we've consumed all the DDI decls related to an API gap - UINT CurrentAPIDecl = 0, CurrentDDIDecl = 0; + size_t CurrentAPIDecl = 0, CurrentDDIDecl = 0; UINT CurrentGapOffset = 0; for (; CurrentAPIDecl < m_APISODecls.size() && CurrentDDIDecl < m_DDISODecls.size(); ++CurrentDDIDecl) {