AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-09 20:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Non-functional: Very minor clean up.

Browse Source
This commit is contained in:
John Kessenich 2017-01-05 10:45:32 -07:00
parent acb9076a27
commit 64285c9e69
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // 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" #define GLSLANG_DATE "05-Jan-2017"

8
glslang/MachineIndependent/Intermediate.cpp
View File

@ -2256,8 +2256,8 @@ bool TIntermediate::promoteAggregate(TIntermAggregate& node)
case EOpDot: case EOpDot:
case EOpDst: case EOpDst:
case EOpFaceForward: case EOpFaceForward:
// case EOpFindMSB: TODO: ?? // case EOpFindMSB: TODO:
// case EOpFindLSB: TODO: ?? // case EOpFindLSB: TODO:
case EOpFma: case EOpFma:
case EOpMod: case EOpMod:
case EOpFrexp: case EOpFrexp:
@ -2267,11 +2267,11 @@ bool TIntermediate::promoteAggregate(TIntermAggregate& node)
case EOpMax: case EOpMax:
case EOpMin: case EOpMin:
case EOpModf: case EOpModf:
// case EOpGenMul: TODO: ?? // case EOpGenMul: TODO:
case EOpPow: case EOpPow:
case EOpReflect: case EOpReflect:
case EOpRefract: case EOpRefract:
// case EOpSinCos: TODO: ?? // case EOpSinCos: TODO:
case EOpSmoothStep: case EOpSmoothStep:
case EOpStep: case EOpStep:
break; break;

7
hlsl/hlslParseHelper.cpp
View File

@ -391,7 +391,7 @@ TIntermTyped* HlslParseContext::handleLvalue(const TSourceLoc& loc, const char*
// OpSequence // OpSequence
// coordtmp = load's param1 // coordtmp = load's param1
// rhsTmp = OpImageLoad(object, coordTmp) // rhsTmp = OpImageLoad(object, coordTmp)
// rhsTmp op = rhs // rhsTmp op= rhs
// OpImageStore(object, coordTmp, rhsTmp) // OpImageStore(object, coordTmp, rhsTmp)
// rhsTmp // rhsTmp
// //
@ -1073,7 +1073,7 @@ void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable)
// location in this linear sequence. // location in this linear sequence.
// //
// If the tree was N-ary, that can be directly calculated. However, we are dealing with // 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 // build a data structure to allow the sequence of bracket and dot operators on arrays and
// structs to arrive at the proper member. // structs to arrive at the proper member.
// //
@ -5528,9 +5528,8 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
emulatedConstructorArguments = initList->getSequence()[0]; emulatedConstructorArguments = initList->getSequence()[0];
else else
emulatedConstructorArguments = initList; 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 // Lengthen list to be long enough to cover any gap from the current list size