diff --git a/Test/baseResults/hlsl.entry-in.frag.out b/Test/baseResults/hlsl.entry-in.frag.out index a5f8c7ee..010f27b5 100755 --- a/Test/baseResults/hlsl.entry-in.frag.out +++ b/Test/baseResults/hlsl.entry-in.frag.out @@ -58,23 +58,23 @@ gl_FragCoord origin is upper left 0:? Sequence 0:? move second child to first child (temp 2-component vector of float) 0:? v: direct index for structure (temp 2-component vector of float) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 0 (const int) 0:? 'v' (layout(location=0 ) in 2-component vector of float) 0:? move second child to first child (temp 4-component vector of float) 0:? fragCoord: direct index for structure (temp 4-component vector of float FragCoord) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 1 (const int) 0:? 'fragCoord' (in 4-component vector of float FragCoord) 0:? move second child to first child (temp 2-component vector of int) 0:? i2: direct index for structure (temp 2-component vector of int) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 2 (const int) 0:? 'i2' (layout(location=1 ) in 2-component vector of int) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) @@ -156,23 +156,23 @@ gl_FragCoord origin is upper left 0:? Sequence 0:? move second child to first child (temp 2-component vector of float) 0:? v: direct index for structure (temp 2-component vector of float) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 0 (const int) 0:? 'v' (layout(location=0 ) in 2-component vector of float) 0:? move second child to first child (temp 4-component vector of float) 0:? fragCoord: direct index for structure (temp 4-component vector of float FragCoord) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 1 (const int) 0:? 'fragCoord' (in 4-component vector of float FragCoord) 0:? move second child to first child (temp 2-component vector of int) 0:? i2: direct index for structure (temp 2-component vector of int) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:? Constant: 0:? 2 (const int) 0:? 'i2' (layout(location=1 ) in 2-component vector of int) -0:? 'aggShadow' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) +0:? 'aggShadow' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2}) 0:19 Sequence 0:19 move second child to first child (temp 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 8469dcf1..0a9710cf 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.1493" +#define GLSLANG_REVISION "Overload400-PrecQual.1494" #define GLSLANG_DATE "19-Sep-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 07d96ea3..6f60a594 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -2271,6 +2271,7 @@ void HlslParseContext::addInputArgumentConversions(const TFunction& function, TI TSourceLoc dummyLoc; dummyLoc.init(); TVariable* internalAggregate = makeInternalVariable("aggShadow", *function[i].type); + internalAggregate->getWritableType().getQualifier().makeTemporary(); TIntermSymbol* internalSymbolNode = new TIntermSymbol(internalAggregate->getUniqueId(), internalAggregate->getName(), internalAggregate->getType());