From 64285c9e692ba3c932d360ef8b2ec563897b10a9 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 5 Jan 2017 10:45:32 -0700 Subject: [PATCH] Non-functional: Very minor clean up. --- glslang/Include/revision.h | 2 +- glslang/MachineIndependent/Intermediate.cpp | 8 ++++---- hlsl/hlslParseHelper.cpp | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 777826d4..dc1f9d02 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1739" +#define GLSLANG_REVISION "Overload400-PrecQual.1742" #define GLSLANG_DATE "05-Jan-2017" diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index 999fd5d8..8d02cc7e 100644 --- a/glslang/MachineIndependent/Intermediate.cpp +++ b/glslang/MachineIndependent/Intermediate.cpp @@ -2256,8 +2256,8 @@ bool TIntermediate::promoteAggregate(TIntermAggregate& node) case EOpDot: case EOpDst: case EOpFaceForward: - // case EOpFindMSB: TODO: ?? - // case EOpFindLSB: TODO: ?? + // case EOpFindMSB: TODO: + // case EOpFindLSB: TODO: case EOpFma: case EOpMod: case EOpFrexp: @@ -2267,11 +2267,11 @@ bool TIntermediate::promoteAggregate(TIntermAggregate& node) case EOpMax: case EOpMin: case EOpModf: - // case EOpGenMul: TODO: ?? + // case EOpGenMul: TODO: case EOpPow: case EOpReflect: case EOpRefract: - // case EOpSinCos: TODO: ?? + // case EOpSinCos: TODO: case EOpSmoothStep: case EOpStep: break; diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 508c90a6..c1920baf 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -391,7 +391,7 @@ TIntermTyped* HlslParseContext::handleLvalue(const TSourceLoc& loc, const char* // OpSequence // coordtmp = load's param1 // rhsTmp = OpImageLoad(object, coordTmp) - // rhsTmp op = rhs + // rhsTmp op= rhs // OpImageStore(object, coordTmp, rhsTmp) // rhsTmp // @@ -1073,7 +1073,7 @@ void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable) // location in this linear sequence. // // If the tree was N-ary, that can be directly calculated. However, we are dealing with -// arbitrary numbers - peraps a struct of 7 members containing an array of 3. Thus, we must +// arbitrary numbers - perhaps a struct of 7 members containing an array of 3. Thus, we must // build a data structure to allow the sequence of bracket and dot operators on arrays and // structs to arrive at the proper member. // @@ -5528,9 +5528,8 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co emulatedConstructorArguments = initList->getSequence()[0]; else emulatedConstructorArguments = initList; - TIntermTyped* constructor = addConstructor(loc, emulatedConstructorArguments, type); - return constructor; + return addConstructor(loc, emulatedConstructorArguments, type); } // Lengthen list to be long enough to cover any gap from the current list size