Skip to content

Commit f6c8447

Browse files
TheMostDiligentTheMostDiligent
committed
ShaderTools: don't use auto where unnecessary
1 parent ec815e7 commit f6c8447

File tree

8 files changed

+125
-115
lines changed

8 files changed

+125
-115
lines changed

‎Graphics/ShaderTools/include/SPIRVShaderResources.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class SPIRVShaderResources
194194
const SPIRVShaderStageInputAttribs& GetShaderStageInputAttribs(Uint32 n) const noexcept
195195
{
196196
VERIFY(n < m_NumShaderStageInputs, "Shader stage input index (", n, ") is out of range. Total input count: ", m_NumShaderStageInputs);
197-
auto* ResourceMemoryEnd = reinterpret_cast<const SPIRVShaderResourceAttribs*>(m_MemoryBuffer.get()) + m_TotalResources;
197+
const SPIRVShaderResourceAttribs* ResourceMemoryEnd = reinterpret_cast<const SPIRVShaderResourceAttribs*>(m_MemoryBuffer.get()) + m_TotalResources;
198198
return reinterpret_cast<const SPIRVShaderStageInputAttribs*>(ResourceMemoryEnd)[n];
199199
}
200200

@@ -256,55 +256,55 @@ class SPIRVShaderResources
256256
{
257257
for (Uint32 n = 0; n < GetNumUBs(); ++n)
258258
{
259-
const auto& UB = GetUB(n);
259+
const SPIRVShaderResourceAttribs& UB = GetUB(n);
260260
HandleUB(UB, n);
261261
}
262262

263263
for (Uint32 n = 0; n < GetNumSBs(); ++n)
264264
{
265-
const auto& SB = GetSB(n);
265+
const SPIRVShaderResourceAttribs& SB = GetSB(n);
266266
HandleSB(SB, n);
267267
}
268268

269269
for (Uint32 n = 0; n < GetNumImgs(); ++n)
270270
{
271-
const auto& Img = GetImg(n);
271+
const SPIRVShaderResourceAttribs& Img = GetImg(n);
272272
HandleImg(Img, n);
273273
}
274274

275275
for (Uint32 n = 0; n < GetNumSmpldImgs(); ++n)
276276
{
277-
const auto& SmplImg = GetSmpldImg(n);
277+
const SPIRVShaderResourceAttribs& SmplImg = GetSmpldImg(n);
278278
HandleSmplImg(SmplImg, n);
279279
}
280280

281281
for (Uint32 n = 0; n < GetNumACs(); ++n)
282282
{
283-
const auto& AC = GetAC(n);
283+
const SPIRVShaderResourceAttribs& AC = GetAC(n);
284284
HandleAC(AC, n);
285285
}
286286

287287
for (Uint32 n = 0; n < GetNumSepSmplrs(); ++n)
288288
{
289-
const auto& SepSmpl = GetSepSmplr(n);
289+
const SPIRVShaderResourceAttribs& SepSmpl = GetSepSmplr(n);
290290
HandleSepSmpl(SepSmpl, n);
291291
}
292292

293293
for (Uint32 n = 0; n < GetNumSepImgs(); ++n)
294294
{
295-
const auto& SepImg = GetSepImg(n);
295+
const SPIRVShaderResourceAttribs& SepImg = GetSepImg(n);
296296
HandleSepImg(SepImg, n);
297297
}
298298

299299
for (Uint32 n = 0; n < GetNumInptAtts(); ++n)
300300
{
301-
const auto& InptAtt = GetInptAtt(n);
301+
const SPIRVShaderResourceAttribs& InptAtt = GetInptAtt(n);
302302
HandleInptAtt(InptAtt, n);
303303
}
304304

305305
for (Uint32 n = 0; n < GetNumAccelStructs(); ++n)
306306
{
307-
const auto& AccelStruct = GetAccelStruct(n);
307+
const SPIRVShaderResourceAttribs& AccelStruct = GetAccelStruct(n);
308308
HandleAccelStruct(AccelStruct, n);
309309
}
310310

@@ -316,7 +316,7 @@ class SPIRVShaderResources
316316
{
317317
for (Uint32 n = 0; n < GetTotalResources(); ++n)
318318
{
319-
const auto& Res = GetResource(n);
319+
const SPIRVShaderResourceAttribs& Res = GetResource(n);
320320
Handler(Res, n);
321321
}
322322
}

‎Graphics/ShaderTools/include/ShaderToolsCommon.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -199,7 +199,7 @@ struct ShaderCodeVariableDescX : ShaderCodeVariableDesc
199199

200200
size_t AddMember(const ShaderCodeVariableDesc& Member)
201201
{
202-
const auto idx = Members.size();
202+
const size_t idx = Members.size();
203203
Members.emplace_back(Member);
204204
NumMembers = static_cast<Uint32>(Members.size());
205205
pMembers = Members.data();
@@ -208,7 +208,7 @@ struct ShaderCodeVariableDescX : ShaderCodeVariableDesc
208208

209209
size_t AddMember(ShaderCodeVariableDescX&& Member)
210210
{
211-
const auto idx = Members.size();
211+
const size_t idx = Members.size();
212212
Members.emplace_back(std::move(Member));
213213
NumMembers = static_cast<Uint32>(Members.size());
214214
pMembers = Members.data();
@@ -248,7 +248,7 @@ struct ShaderCodeVariableDescX : ShaderCodeVariableDesc
248248
ShaderCodeVariableDescX* FindMember(const char* MemberName)
249249
{
250250
VERIFY_EXPR(MemberName != nullptr);
251-
for (auto& Member : Members)
251+
for (ShaderCodeVariableDescX& Member : Members)
252252
{
253253
if (strcmp(Member.Name, MemberName) == 0)
254254
return &Member;
@@ -262,13 +262,13 @@ struct ShaderCodeVariableDescX : ShaderCodeVariableDesc
262262
return;
263263

264264
Allocator.AddSpace<ShaderCodeVariableDesc>(Members.size());
265-
for (const auto& Member : Members)
265+
for (const ShaderCodeVariableDescX& Member : Members)
266266
{
267267
Allocator.AddSpaceForString(Member.Name);
268268
Allocator.AddSpaceForString(Member.TypeName);
269269
}
270270

271-
for (const auto& Member : Members)
271+
for (const ShaderCodeVariableDescX& Member : Members)
272272
ReserveSpaceForMembers(Allocator, Member.Members);
273273
}
274274

@@ -277,7 +277,7 @@ struct ShaderCodeVariableDescX : ShaderCodeVariableDesc
277277
if (Members.empty())
278278
return nullptr;
279279

280-
auto* pMembers = Allocator.ConstructArray<ShaderCodeVariableDesc>(Members.size());
280+
ShaderCodeVariableDesc* pMembers = Allocator.ConstructArray<ShaderCodeVariableDesc>(Members.size());
281281
for (size_t i = 0; i < Members.size(); ++i)
282282
{
283283
pMembers[i] = Members[i];
@@ -313,7 +313,7 @@ struct ShaderCodeBufferDescX : ShaderCodeBufferDesc
313313

314314
size_t AddVariable(const ShaderCodeVariableDesc& Var)
315315
{
316-
const auto idx = Variables.size();
316+
const size_t idx = Variables.size();
317317
Variables.emplace_back(Var);
318318
NumVariables = static_cast<Uint32>(Variables.size());
319319
pVariables = Variables.data();
@@ -322,7 +322,7 @@ struct ShaderCodeBufferDescX : ShaderCodeBufferDesc
322322

323323
size_t AddVariable(ShaderCodeVariableDescX&& Var)
324324
{
325-
const auto idx = Variables.size();
325+
const size_t idx = Variables.size();
326326
Variables.emplace_back(std::move(Var));
327327
NumVariables = static_cast<Uint32>(Variables.size());
328328
pVariables = Variables.data();
@@ -366,7 +366,7 @@ struct ShaderCodeBufferDescX : ShaderCodeBufferDesc
366366
Allocator.Reserve();
367367
std::unique_ptr<void, STDDeleterRawMem<void>> DataBuffer{Allocator.ReleaseOwnership(), STDDeleterRawMem<void>{RawAllocator}};
368368

369-
auto* pRefl = Allocator.ConstructArray<ShaderCodeBufferDesc>(Size);
369+
ShaderCodeBufferDesc* pRefl = Allocator.ConstructArray<ShaderCodeBufferDesc>(Size);
370370
VERIFY_EXPR(pRefl == DataBuffer.get());
371371
for (auto Refl = RangeStart; Refl != RangeEnd; ++Refl)
372372
*(pRefl++) = Refl->MakeCopy(Allocator);

‎Graphics/ShaderTools/src/DXCompilerLibrary.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2024 Diligent Graphics LLC
2+
* Copyright 2024-2025 Diligent Graphics LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ float4 main() : SV_Target0
106106

107107
CComPtr<IDxcOperationResult> pdxcResult;
108108

109-
auto hr = pdxcCompiler->Compile(
109+
HRESULT hr = pdxcCompiler->Compile(
110110
pSourceBlob,
111111
L"",
112112
L"main",

‎Graphics/ShaderTools/src/GLSLangUtils.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2024 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -246,8 +246,8 @@ void LogCompilerError(const char* DebugOutputMessage,
246246

247247
if (ppCompilerOutput != nullptr)
248248
{
249-
auto pOutputDataBlob = DataBlobImpl::Create(SourceCodeLen + 1 + ErrorLog.length() + 1);
250-
char* DataPtr = pOutputDataBlob->GetDataPtr<char>();
249+
RefCntAutoPtr<DataBlobImpl> pOutputDataBlob = DataBlobImpl::Create(SourceCodeLen + 1 + ErrorLog.length() + 1);
250+
char* DataPtr = pOutputDataBlob->GetDataPtr<char>();
251251
memcpy(DataPtr, ErrorLog.data(), ErrorLog.length() + 1);
252252
memcpy(DataPtr + ErrorLog.length() + 1, ShaderSource, SourceCodeLen + 1);
253253
pOutputDataBlob->QueryInterface(IID_DataBlob, reinterpret_cast<IObject**>(ppCompilerOutput));
@@ -267,7 +267,7 @@ std::vector<unsigned int> CompileShaderInternal(::glslang::TShader& Sh
267267
Shader.setAutoMapLocations(true);
268268
TBuiltInResource Resources = InitResources();
269269

270-
auto ParseResult = pIncluder != nullptr ?
270+
bool ParseResult = pIncluder != nullptr ?
271271
Shader.parse(&Resources, 100, shProfile, false, false, messages, *pIncluder) :
272272
Shader.parse(&Resources, 100, shProfile, false, false, messages);
273273
if (!ParseResult)
@@ -316,9 +316,9 @@ class IncluderImpl : public ::glslang::TShader::Includer
316316
return nullptr;
317317
}
318318

319-
auto pFileData = DataBlobImpl::Create();
319+
RefCntAutoPtr<DataBlobImpl> pFileData = DataBlobImpl::Create();
320320
pSourceStream->ReadBlob(pFileData);
321-
auto* pNewInclude =
321+
IncludeResult* pNewInclude =
322322
new IncludeResult{
323323
headerName,
324324
pFileData->GetConstDataPtr<char>(),
@@ -449,7 +449,7 @@ std::vector<unsigned int> HLSLtoSPIRV(const ShaderCreateInfo& ShaderCI,
449449
Shader.setEntryPoint(ShaderCI.EntryPoint);
450450
Shader.setEnvTargetHlslFunctionality1();
451451

452-
const auto SourceData = ReadShaderSourceFile(ShaderCI);
452+
const ShaderSourceFileData SourceData = ReadShaderSourceFile(ShaderCI);
453453

454454
std::string Preamble;
455455
if ((ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_PACK_MATRIX_ROW_MAJOR) != 0)
@@ -480,14 +480,14 @@ std::vector<unsigned int> HLSLtoSPIRV(const ShaderCreateInfo& ShaderCI,
480480

481481
IncluderImpl Includer{ShaderCI.pShaderSourceStreamFactory};
482482

483-
auto SPIRV = CompileShaderInternal(Shader, messages, &Includer, SourceData.Source, SourceData.SourceLength, true, shProfile, ppCompilerOutput);
483+
std::vector<unsigned int> SPIRV = CompileShaderInternal(Shader, messages, &Includer, SourceData.Source, SourceData.SourceLength, true, shProfile, ppCompilerOutput);
484484
if (SPIRV.empty())
485485
return SPIRV;
486486

487487
#ifdef USE_SPIRV_TOOLS
488488
// SPIR-V bytecode generated from HLSL must be legalized to
489489
// turn it into a valid vulkan SPIR-V shader.
490-
auto LegalizedSPIRV = OptimizeSPIRV(SPIRV, SpirvVersionToSpvTargetEnv(Version), SPIRV_OPTIMIZATION_FLAG_LEGALIZATION | SPIRV_OPTIMIZATION_FLAG_PERFORMANCE);
490+
std::vector<uint32_t> LegalizedSPIRV = OptimizeSPIRV(SPIRV, SpirvVersionToSpvTargetEnv(Version), SPIRV_OPTIMIZATION_FLAG_LEGALIZATION | SPIRV_OPTIMIZATION_FLAG_PERFORMANCE);
491491
if (!LegalizedSPIRV.empty())
492492
{
493493
return LegalizedSPIRV;
@@ -529,12 +529,12 @@ std::vector<unsigned int> GLSLtoSPIRV(const GLSLtoSPIRVAttribs& Attribs)
529529

530530
IncluderImpl Includer{Attribs.pShaderSourceStreamFactory};
531531

532-
auto SPIRV = CompileShaderInternal(Shader, messages, &Includer, Attribs.ShaderSource, Attribs.SourceCodeLen, Attribs.AssignBindings, shProfile, Attribs.ppCompilerOutput);
532+
std::vector<unsigned int> SPIRV = CompileShaderInternal(Shader, messages, &Includer, Attribs.ShaderSource, Attribs.SourceCodeLen, Attribs.AssignBindings, shProfile, Attribs.ppCompilerOutput);
533533
if (SPIRV.empty())
534534
return SPIRV;
535535

536536
#ifdef USE_SPIRV_TOOLS
537-
auto OptimizedSPIRV = OptimizeSPIRV(SPIRV, SpirvVersionToSpvTargetEnv(Attribs.Version), SPIRV_OPTIMIZATION_FLAG_PERFORMANCE);
537+
std::vector<uint32_t> OptimizedSPIRV = OptimizeSPIRV(SPIRV, SpirvVersionToSpvTargetEnv(Attribs.Version), SPIRV_OPTIMIZATION_FLAG_PERFORMANCE);
538538
if (!OptimizedSPIRV.empty())
539539
{
540540
return OptimizedSPIRV;

0 commit comments

Comments
 (0)