Skip to content

Commit 617bd49

Browse files
D3DShaderResourceLoader: don't use auto where unnecessary
1 parent 2eaa0cd commit 617bd49

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void LoadShaderCodeVariableDesc(TD3DShaderReflectionType* pd3dReflecionType, Sha
9797
ShaderCodeVariableDesc MemberDesc;
9898
MemberDesc.Name = pd3dReflecionType->GetMemberTypeName(m);
9999

100-
auto idx = TypeDesc.AddMember(MemberDesc);
100+
size_t idx = TypeDesc.AddMember(MemberDesc);
101101
VERIFY_EXPR(idx == m);
102102
auto* pd3dMemberType = pd3dReflecionType->GetMemberTypeByIndex(m);
103103
VERIFY_EXPR(pd3dMemberType != nullptr);
@@ -122,7 +122,7 @@ void LoadD3DShaderConstantBufferReflection(TShaderReflection* pBuffReflection, S
122122
VarDesc.Name = d3dShaderVarDesc.Name; // The variable name.
123123
VarDesc.Offset = d3dShaderVarDesc.StartOffset; // Offset from the start of the parent structure to the beginning of the variable.
124124

125-
auto idx = BufferDesc.AddVariable(VarDesc);
125+
size_t idx = BufferDesc.AddVariable(VarDesc);
126126
VERIFY_EXPR(idx == var);
127127

128128
auto* pd3dReflecionType = pVaribable->GetType();
@@ -187,7 +187,7 @@ void LoadD3DShaderResources(TShaderReflection* pShaderReflection,
187187
pShaderReflection->GetResourceBindingDesc(Res, &BindingDesc);
188188

189189
std::string Name;
190-
const auto ArrayIndex = Parsing::GetArrayIndex(BindingDesc.Name, Name);
190+
const int ArrayIndex = Parsing::GetArrayIndex(BindingDesc.Name, Name);
191191

192192
if (BindingDesc.BindPoint == UINT32_MAX)
193193
{
@@ -232,7 +232,7 @@ void LoadD3DShaderResources(TShaderReflection* pShaderReflection,
232232
VERIFY(BindCount == 1, "When array elements are enumerated individually, BindCount is expected to always be 1");
233233

234234
#ifdef DILIGENT_DEBUG
235-
for (const auto& ExistingRes : Resources)
235+
for (const D3DShaderResourceAttribs& ExistingRes : Resources)
236236
{
237237
VERIFY(Name.compare(ExistingRes.Name) != 0, "Resource with the same name has already been enumerated. All array elements are expected to be enumerated one after another");
238238
}
@@ -243,7 +243,7 @@ void LoadD3DShaderResources(TShaderReflection* pShaderReflection,
243243
pShaderReflection->GetResourceBindingDesc(ArrElem, &NextElemBindingDesc);
244244

245245
std::string NextElemName;
246-
const auto NextElemIndex = Parsing::GetArrayIndex(NextElemBindingDesc.Name, NextElemName);
246+
const int NextElemIndex = Parsing::GetArrayIndex(NextElemBindingDesc.Name, NextElemName);
247247

248248
// Make sure this case is handled correctly:
249249
// "g_tex2DDiffuse[.]" != "g_tex2DDiffuse2[.]"
@@ -271,7 +271,7 @@ void LoadD3DShaderResources(TShaderReflection* pShaderReflection,
271271

272272
switch (BindingDesc.Type)
273273
{
274-
// clang-format off
274+
// clang-format off
275275
case D3D_SIT_CBUFFER: ++RC.NumCBs; break;
276276
case D3D_SIT_TBUFFER: UNSUPPORTED( "TBuffers are not supported" ); break;
277277
case D3D_SIT_TEXTURE: ++(BindingDesc.Dimension == D3D_SRV_DIMENSION_BUFFER ? RC.NumBufSRVs : RC.NumTexSRVs); break;
@@ -315,7 +315,7 @@ void LoadD3DShaderResources(TShaderReflection* pShaderReflection,
315315

316316
for (size_t ResInd = 0; ResInd < Resources.size(); ++ResInd)
317317
{
318-
const auto& Res = Resources[ResInd];
318+
const D3DShaderResourceAttribs& Res = Resources[ResInd];
319319
switch (Res.GetInputType())
320320
{
321321
case D3D_SIT_CBUFFER:

0 commit comments

Comments
 (0)