From 567396b6b40c08adc50d823d47755dc7612a1bfd Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Mon, 11 Feb 2019 03:43:12 -0700 Subject: [PATCH] Whitespace: Fix some tabs->spaces, mostly to retriggered failed bots. --- glslang/MachineIndependent/Versions.cpp | 2 +- hlsl/hlslGrammar.cpp | 4 ++-- hlsl/hlslParseHelper.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/glslang/MachineIndependent/Versions.cpp b/glslang/MachineIndependent/Versions.cpp index 708432d..f78ffd0 100755 --- a/glslang/MachineIndependent/Versions.cpp +++ b/glslang/MachineIndependent/Versions.cpp @@ -1025,7 +1025,7 @@ void TParseVersions::float16OpaqueCheck(const TSourceLoc& loc, const char* op, b void TParseVersions::explicitInt16Check(const TSourceLoc& loc, const char* op, bool builtIn) { if (! builtIn) { - const char* const extensions[] = { + const char* const extensions[] = { #if AMD_EXTENSIONS E_GL_AMD_gpu_shader_int16, #endif diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index 277d33a..45cf5d5 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -1197,7 +1197,7 @@ bool HlslGrammar::acceptSamplerTypeDX9(TType &type) TSampler sampler; sampler.set(txType.getBasicType(), dim, false, isShadow, false); - if (!parseContext.setTextureReturnType(sampler, txType, token.loc)) + if (!parseContext.setTextureReturnType(sampler, txType, token.loc)) return false; type.shallowCopy(TType(sampler, EvqUniform, arraySizes)); @@ -1489,7 +1489,7 @@ bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList) case EHTokSampler3d: // ... case EHTokSamplerCube: // ... if (parseContext.hlslDX9Compatible()) - return acceptSamplerTypeDX9(type); + return acceptSamplerTypeDX9(type); else return acceptSamplerType(type); break; diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 2634f91..c313372 100644 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -3255,8 +3255,8 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte if (argAggregate) { if (argAggregate->getSequence().empty()) return; - if (argAggregate->getSequence()[0]) - bufferObj = argAggregate->getSequence()[0]->getAsTyped(); + if (argAggregate->getSequence()[0]) + bufferObj = argAggregate->getSequence()[0]->getAsTyped(); } else { bufferObj = arguments->getAsSymbolNode(); } @@ -3756,7 +3756,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType return; } else { if (argAggregate->getSequence().size() == 0 || - argAggregate->getSequence()[0] == nullptr || + argAggregate->getSequence()[0] == nullptr || argAggregate->getSequence()[0]->getAsTyped()->getBasicType() != EbtSampler) return; } -- 2.7.4