Skip to content

Commit 5e1f642

Browse files
GLSLUtils: don't use auto where unnecessary
1 parent 7e4b2e0 commit 5e1f642

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Graphics/ShaderTools/src/GLSLUtils.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
257257
return "";
258258
}
259259

260-
const auto SourceData = ReadShaderSourceFile(ShaderCI);
260+
const ShaderSourceFileData SourceData = ReadShaderSourceFile(ShaderCI);
261261
if (ShaderCI.SourceLanguage == SHADER_SOURCE_LANGUAGE_GLSL_VERBATIM)
262262
{
263263
if (ShaderCI.Macros)
@@ -272,7 +272,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
272272
bool IsES = false;
273273
GetGLSLVersion(ShaderCI, Attribs.TargetCompiler, Attribs.DeviceType, Attribs.MaxShaderVersion, GLSLVer, IsES);
274274

275-
const auto ShaderType = ShaderCI.Desc.ShaderType;
275+
const SHADER_TYPE ShaderType = ShaderCI.Desc.ShaderType;
276276

277277
String GLSLSource;
278278
{
@@ -369,7 +369,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
369369
LOG_ERROR_AND_THROW("Combined texture samplers are required to convert HLSL source to GLSL");
370370
}
371371
// Convert HLSL to GLSL
372-
const auto& Converter = HLSL2GLSLConverterImpl::GetInstance();
372+
const HLSL2GLSLConverterImpl& Converter = HLSL2GLSLConverterImpl::GetInstance();
373373

374374
HLSL2GLSLConverterImpl::ConversionAttribs ConvertAttribs;
375375
ConvertAttribs.pSourceStreamFactory = ShaderCI.pShaderSourceStreamFactory;
@@ -389,7 +389,7 @@ String BuildGLSLSourceString(const BuildGLSLSourceStringAttribs& Attribs) noexce
389389
// (search for "Input Layout Qualifiers" and "Output Layout Qualifiers").
390390
ConvertAttribs.UseInOutLocationQualifiers = Attribs.Features.SeparablePrograms;
391391
ConvertAttribs.UseRowMajorMatrices = (ShaderCI.CompileFlags & SHADER_COMPILE_FLAG_PACK_MATRIX_ROW_MAJOR) != 0;
392-
auto ConvertedSource = Converter.Convert(ConvertAttribs);
392+
String ConvertedSource = Converter.Convert(ConvertAttribs);
393393
if (ConvertedSource.empty())
394394
{
395395
LOG_ERROR_AND_THROW("Failed to convert HLSL source to GLSL");
@@ -415,8 +415,8 @@ std::vector<std::pair<std::string, std::string>> GetGLSLExtensions(const char* S
415415

416416
std::vector<std::pair<std::string, std::string>> Extensions;
417417

418-
const auto* Pos = Source;
419-
const auto* const End = Source + SourceLen;
418+
const char* Pos = Source;
419+
const char* const End = Source + SourceLen;
420420
while (Pos != End)
421421
{
422422
const char *NameStart = nullptr, *NameEnd = nullptr;
@@ -432,17 +432,17 @@ std::vector<std::pair<std::string, std::string>> GetGLSLExtensions(const char* S
432432
// | NameStart
433433
// Pos
434434

435-
const auto* LineEnd = Parsing::SkipLine(NameEnd, End, /* GoToNextLine = */ false);
435+
const char* LineEnd = Parsing::SkipLine(NameEnd, End, /* GoToNextLine = */ false);
436436

437437
std::string DirectiveIdentifier{NameStart, NameEnd};
438438
if (DirectiveIdentifier == "extension")
439439
{
440-
const auto* ExtNameStart = Parsing::SkipDelimiters(NameEnd, LineEnd, " \t");
440+
const char* ExtNameStart = Parsing::SkipDelimiters(NameEnd, LineEnd, " \t");
441441
// # extension GL_ARB_shader_draw_parameters : enable
442442
// ^
443443
// ExtNameStart
444444

445-
const auto* ExtNameEnd = Parsing::SkipIdentifier(ExtNameStart, LineEnd);
445+
const char* ExtNameEnd = Parsing::SkipIdentifier(ExtNameStart, LineEnd);
446446
// # extension GL_ARB_shader_draw_parameters : enable
447447
// ^
448448
// ExtNameStart
@@ -457,12 +457,12 @@ std::vector<std::pair<std::string, std::string>> GetGLSLExtensions(const char* S
457457
std::string ExtensionBehavior;
458458
if (Pos != LineEnd && *Pos == ':')
459459
{
460-
const auto* BehaviorStart = Parsing::SkipDelimiters(Pos + 1, LineEnd, " \t");
460+
const char* BehaviorStart = Parsing::SkipDelimiters(Pos + 1, LineEnd, " \t");
461461
// # extension GL_ARB_shader_draw_parameters : enable
462462
// ^
463463
// BehaviorStart
464464

465-
const auto* BehaviorEnd = Parsing::SkipIdentifier(BehaviorStart, LineEnd);
465+
const char* BehaviorEnd = Parsing::SkipIdentifier(BehaviorStart, LineEnd);
466466
// # extension GL_ARB_shader_draw_parameters : enable
467467
// ^
468468
// BehaviorEnd

0 commit comments

Comments
 (0)