diff --git a/Test/baseResults/hlsl.aliasOpaque.frag.out b/Test/baseResults/hlsl.aliasOpaque.frag.out index 370dcb1a..222322e4 100755 --- a/Test/baseResults/hlsl.aliasOpaque.frag.out +++ b/Test/baseResults/hlsl.aliasOpaque.frag.out @@ -4,17 +4,17 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: osCall(struct-OS-p1-f1-t211; ( temp 4-component vector of float) 0:12 Function Parameters: -0:? 'ss' ( in sampler) -0:? 'a' ( in float) -0:? 'tex' ( in texture2D) +0:? 's.ss' ( in sampler) +0:? 's.a' ( in float) +0:? 's.tex' ( in texture2D) 0:? Sequence 0:13 Branch: Return with expression 0:13 vector-scale ( temp 4-component vector of float) -0:? 'a' ( in float) +0:? 's.a' ( in float) 0:13 texture ( temp 4-component vector of float) 0:13 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'ss' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.ss' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -25,13 +25,13 @@ gl_FragCoord origin is upper left 0:20 'gss' ( uniform sampler) 0:21 'gtex' ( uniform texture2D) 0:22 move second child to first child ( temp float) -0:? 'a' ( temp float) +0:? 'os.a' ( temp float) 0:22 Constant: 0:22 3.000000 0:28 Branch: Return with expression 0:28 Function Call: osCall(struct-OS-p1-f1-t211; ( temp 4-component vector of float) 0:? 'gss' ( uniform sampler) -0:? 'a' ( temp float) +0:? 'os.a' ( temp float) 0:? 'gtex' ( uniform texture2D) 0:17 Function Definition: main( ( temp void) 0:17 Function Parameters: @@ -54,17 +54,17 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Function Definition: osCall(struct-OS-p1-f1-t211; ( temp 4-component vector of float) 0:12 Function Parameters: -0:? 'ss' ( in sampler) -0:? 'a' ( in float) -0:? 'tex' ( in texture2D) +0:? 's.ss' ( in sampler) +0:? 's.a' ( in float) +0:? 's.tex' ( in texture2D) 0:? Sequence 0:13 Branch: Return with expression 0:13 vector-scale ( temp 4-component vector of float) -0:? 'a' ( in float) +0:? 's.a' ( in float) 0:13 texture ( temp 4-component vector of float) 0:13 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'ss' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.ss' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -75,13 +75,13 @@ gl_FragCoord origin is upper left 0:20 'gss' ( uniform sampler) 0:21 'gtex' ( uniform texture2D) 0:22 move second child to first child ( temp float) -0:? 'a' ( temp float) +0:? 'os.a' ( temp float) 0:22 Constant: 0:22 3.000000 0:28 Branch: Return with expression 0:28 Function Call: osCall(struct-OS-p1-f1-t211; ( temp 4-component vector of float) 0:? 'gss' ( uniform sampler) -0:? 'a' ( temp float) +0:? 'os.a' ( temp float) 0:? 'gtex' ( uniform texture2D) 0:17 Function Definition: main( ( temp void) 0:17 Function Parameters: @@ -107,14 +107,14 @@ gl_FragCoord origin is upper left Source HLSL 500 Name 4 "main" Name 17 "osCall(struct-OS-p1-f1-t211;" - Name 14 "ss" - Name 15 "a" - Name 16 "tex" + Name 14 "s.ss" + Name 15 "s.a" + Name 16 "s.tex" Name 20 "@main(" Name 35 "gss2" Name 36 "gss" Name 37 "gtex" - Name 38 "a" + Name 38 "os.a" Name 40 "param" Name 46 "@entryPointOutput" Decorate 35(gss2) DescriptorSet 0 @@ -150,13 +150,13 @@ gl_FragCoord origin is upper left Return FunctionEnd 17(osCall(struct-OS-p1-f1-t211;): 12(fvec4) Function None 13 - 14(ss): 7(ptr) FunctionParameter - 15(a): 9(ptr) FunctionParameter - 16(tex): 11(ptr) FunctionParameter + 14(s.ss): 7(ptr) FunctionParameter + 15(s.a): 9(ptr) FunctionParameter + 16(s.tex): 11(ptr) FunctionParameter 18: Label - 22: 8(float) Load 15(a) - 23: 10 Load 16(tex) - 24: 6 Load 14(ss) + 22: 8(float) Load 15(s.a) + 23: 10 Load 16(s.tex) + 24: 6 Load 14(s.ss) 26: 25 SampledImage 23 24 31: 12(fvec4) ImageSampleImplicitLod 26 30 32: 12(fvec4) VectorTimesScalar 31 22 @@ -164,10 +164,10 @@ gl_FragCoord origin is upper left FunctionEnd 20(@main(): 12(fvec4) Function None 19 21: Label - 38(a): 9(ptr) Variable Function + 38(os.a): 9(ptr) Variable Function 40(param): 9(ptr) Variable Function - Store 38(a) 39 - 41: 8(float) Load 38(a) + Store 38(os.a) 39 + 41: 8(float) Load 38(os.a) Store 40(param) 41 42: 12(fvec4) FunctionCall 17(osCall(struct-OS-p1-f1-t211;) 36(gss) 40(param) 37(gtex) ReturnValue 42 diff --git a/Test/baseResults/hlsl.array.flatten.frag.out b/Test/baseResults/hlsl.array.flatten.frag.out index 7385ceab..0129eded 100644 --- a/Test/baseResults/hlsl.array.flatten.frag.out +++ b/Test/baseResults/hlsl.array.flatten.frag.out @@ -147,7 +147,7 @@ gl_FragCoord origin is upper left 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:31 Sequence 0:31 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) 0:31 color: direct index for structure ( temp 4-component vector of float) 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:31 Constant: @@ -167,7 +167,7 @@ gl_FragCoord origin is upper left 0:? 'g_samp_explicit[2]' (layout( binding=7) uniform sampler) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-element array of 3X3 matrix of float g_mats, layout( binding=10) uniform 4-element array of 3X3 matrix of float g_mats_explicit, uniform 4-element array of float g_floats}) 0:? 'not_flattened_a' ( global 5-element array of int) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -321,7 +321,7 @@ gl_FragCoord origin is upper left 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:31 Sequence 0:31 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) 0:31 color: direct index for structure ( temp 4-component vector of float) 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:31 Constant: @@ -341,7 +341,7 @@ gl_FragCoord origin is upper left 0:? 'g_samp_explicit[2]' (layout( binding=7) uniform sampler) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-element array of 3X3 matrix of float g_mats, layout( binding=10) uniform 4-element array of 3X3 matrix of float g_mats_explicit, uniform 4-element array of float g_floats}) 0:? 'not_flattened_a' ( global 5-element array of int) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -382,7 +382,7 @@ gl_FragCoord origin is upper left Name 112 "aggShadow" Name 123 "ps_output" Name 124 "param" - Name 128 "color" + Name 128 "ps_output.color" Name 131 "g_tex_explicit[0]" Name 132 "g_tex_explicit[1]" Name 133 "g_tex_explicit[2]" @@ -407,7 +407,7 @@ gl_FragCoord origin is upper left MemberDecorate 89($Global) 2 Offset 384 Decorate 89($Global) Block Decorate 91 DescriptorSet 0 - Decorate 128(color) Location 0 + Decorate 128(ps_output.color) Location 0 Decorate 131(g_tex_explicit[0]) DescriptorSet 0 Decorate 131(g_tex_explicit[0]) Binding 1 Decorate 132(g_tex_explicit[1]) DescriptorSet 0 @@ -478,7 +478,7 @@ gl_FragCoord origin is upper left 112(aggShadow): 18(ptr) Variable UniformConstant 121: TypePointer Function 7(fvec4) 127: TypePointer Output 7(fvec4) - 128(color): 127(ptr) Variable Output +128(ps_output.color): 127(ptr) Variable Output 131(g_tex_explicit[0]): 41(ptr) Variable UniformConstant 132(g_tex_explicit[1]): 41(ptr) Variable UniformConstant 133(g_tex_explicit[2]): 41(ptr) Variable UniformConstant @@ -495,7 +495,7 @@ gl_FragCoord origin is upper left Store 123(ps_output) 126 129: 121(ptr) AccessChain 123(ps_output) 62 130: 7(fvec4) Load 129 - Store 128(color) 130 + Store 128(ps_output.color) 130 Return FunctionEnd 9(TestFn1(): 7(fvec4) Function None 8 diff --git a/Test/baseResults/hlsl.array.multidim.frag.out b/Test/baseResults/hlsl.array.multidim.frag.out index 72fa2ec3..c62fd7d0 100644 --- a/Test/baseResults/hlsl.array.multidim.frag.out +++ b/Test/baseResults/hlsl.array.multidim.frag.out @@ -55,14 +55,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 5-element array of 4-element array of 3-element array of float float_array}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -124,14 +124,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 5-element array of 4-element array of 3-element array of float float_array}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -153,14 +153,14 @@ gl_FragCoord origin is upper left Name 29 "" Name 40 "float4_array_2" Name 46 "psout" - Name 54 "Color" + Name 54 "@entryPointOutput.Color" Decorate 22 ArrayStride 16 Decorate 24 ArrayStride 48 Decorate 26 ArrayStride 192 MemberDecorate 27($Global) 0 Offset 0 Decorate 27($Global) Block Decorate 29 DescriptorSet 0 - Decorate 54(Color) Location 0 + Decorate 54(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -193,12 +193,12 @@ gl_FragCoord origin is upper left 41: TypePointer Function 14 45: TypePointer Function 8(PS_OUTPUT) 53: TypePointer Output 7(fvec4) - 54(Color): 53(ptr) Variable Output +54(@entryPointOutput.Color): 53(ptr) Variable Output 4(main): 2 Function None 3 5: Label 55:8(PS_OUTPUT) FunctionCall 10(@main() 56: 7(fvec4) CompositeExtract 55 0 - Store 54(Color) 56 + Store 54(@entryPointOutput.Color) 56 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.basic.geom.out b/Test/baseResults/hlsl.basic.geom.out index 9e9628ec..220180c9 100644 --- a/Test/baseResults/hlsl.basic.geom.out +++ b/Test/baseResults/hlsl.basic.geom.out @@ -44,13 +44,13 @@ output primitive = line_strip 0:22 Sequence 0:22 Sequence 0:22 move second child to first child ( temp float) -0:? 'myfloat' (layout( location=0) out float) +0:? 'OutputStream.myfloat' (layout( location=0) out float) 0:22 myfloat: direct index for structure ( temp float) 0:22 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp int) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.something' (layout( location=1) out int) 0:22 something: direct index for structure ( temp int) 0:22 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:22 Constant: @@ -59,13 +59,13 @@ output primitive = line_strip 0:23 Sequence 0:23 Sequence 0:23 move second child to first child ( temp float) -0:? 'myfloat' (layout( location=0) out float) +0:? 'OutputStream.myfloat' (layout( location=0) out float) 0:23 myfloat: direct index for structure ( temp float) 0:23 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:23 Constant: 0:23 0 (const int) 0:23 move second child to first child ( temp int) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.something' (layout( location=1) out int) 0:23 something: direct index for structure ( temp int) 0:23 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:23 Constant: @@ -88,8 +88,8 @@ output primitive = line_strip 0:? Linker Objects 0:? 'VertexID' (layout( location=0) in 3-element array of uint) 0:? 'test' (layout( location=1) in 3-element array of uint) -0:? 'myfloat' (layout( location=0) out float) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.myfloat' (layout( location=0) out float) +0:? 'OutputStream.something' (layout( location=1) out int) Linked geometry stage: @@ -140,13 +140,13 @@ output primitive = line_strip 0:22 Sequence 0:22 Sequence 0:22 move second child to first child ( temp float) -0:? 'myfloat' (layout( location=0) out float) +0:? 'OutputStream.myfloat' (layout( location=0) out float) 0:22 myfloat: direct index for structure ( temp float) 0:22 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp int) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.something' (layout( location=1) out int) 0:22 something: direct index for structure ( temp int) 0:22 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:22 Constant: @@ -155,13 +155,13 @@ output primitive = line_strip 0:23 Sequence 0:23 Sequence 0:23 move second child to first child ( temp float) -0:? 'myfloat' (layout( location=0) out float) +0:? 'OutputStream.myfloat' (layout( location=0) out float) 0:23 myfloat: direct index for structure ( temp float) 0:23 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:23 Constant: 0:23 0 (const int) 0:23 move second child to first child ( temp int) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.something' (layout( location=1) out int) 0:23 something: direct index for structure ( temp int) 0:23 'Vert' ( temp structure{ temp float myfloat, temp int something}) 0:23 Constant: @@ -184,8 +184,8 @@ output primitive = line_strip 0:? Linker Objects 0:? 'VertexID' (layout( location=0) in 3-element array of uint) 0:? 'test' (layout( location=1) in 3-element array of uint) -0:? 'myfloat' (layout( location=0) out float) -0:? 'something' (layout( location=1) out int) +0:? 'OutputStream.myfloat' (layout( location=0) out float) +0:? 'OutputStream.something' (layout( location=1) out int) // Module Version 10000 // Generated by (magic number): 80001 @@ -209,8 +209,8 @@ output primitive = line_strip Name 16 "test" Name 17 "OutputStream" Name 20 "Vert" - Name 42 "myfloat" - Name 46 "something" + Name 42 "OutputStream.myfloat" + Name 46 "OutputStream.something" Name 53 "VertexID" Name 55 "VertexID" Name 57 "test" @@ -219,8 +219,8 @@ output primitive = line_strip Name 61 "param" Name 63 "param" Name 65 "param" - Decorate 42(myfloat) Location 0 - Decorate 46(something) Location 1 + Decorate 42(OutputStream.myfloat) Location 0 + Decorate 46(OutputStream.something) Location 1 Decorate 55(VertexID) Location 0 Decorate 58(test) Location 1 2: TypeVoid @@ -241,9 +241,9 @@ output primitive = line_strip 34: TypePointer Function 10(float) 39: TypePointer Function 11(int) 41: TypePointer Output 10(float) - 42(myfloat): 41(ptr) Variable Output +42(OutputStream.myfloat): 41(ptr) Variable Output 45: TypePointer Output 11(int) - 46(something): 45(ptr) Variable Output +46(OutputStream.something): 45(ptr) Variable Output 54: TypePointer Input 8 55(VertexID): 54(ptr) Variable Input 58(test): 54(ptr) Variable Input @@ -292,17 +292,17 @@ output primitive = line_strip Store 40 38 43: 34(ptr) AccessChain 20(Vert) 21 44: 10(float) Load 43 - Store 42(myfloat) 44 + Store 42(OutputStream.myfloat) 44 47: 39(ptr) AccessChain 20(Vert) 25 48: 11(int) Load 47 - Store 46(something) 48 + Store 46(OutputStream.something) 48 EmitVertex 49: 34(ptr) AccessChain 20(Vert) 21 50: 10(float) Load 49 - Store 42(myfloat) 50 + Store 42(OutputStream.myfloat) 50 51: 39(ptr) AccessChain 20(Vert) 25 52: 11(int) Load 51 - Store 46(something) 52 + Store 46(OutputStream.something) 52 EmitVertex EndPrimitive Return diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index bed52c43..217edf06 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -329,13 +329,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -394,8 +394,8 @@ gl_FragCoord origin is upper left Name 115 "g_tTexcdu4a" Name 127 "psout" Name 137 "flattenTemp" - Name 140 "Color" - Name 144 "@entryPointOutput_Depth" + Name 140 "@entryPointOutput.Color" + Name 144 "@entryPointOutput.Depth" Name 147 "g_tTex1df4" Decorate 16(g_tTex1df4a) DescriptorSet 0 Decorate 16(g_tTex1df4a) Binding 1 @@ -409,8 +409,8 @@ gl_FragCoord origin is upper left Decorate 92(g_tTexcdf4a) DescriptorSet 0 Decorate 104(g_tTexcdi4a) DescriptorSet 0 Decorate 115(g_tTexcdu4a) DescriptorSet 0 - Decorate 140(Color) Location 0 - Decorate 144(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 140(@entryPointOutput.Color) Location 0 + Decorate 144(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 147(g_tTex1df4) DescriptorSet 0 Decorate 147(g_tTex1df4) Binding 0 2: TypeVoid @@ -485,9 +485,9 @@ gl_FragCoord origin is upper left 130: TypePointer Function 7(fvec4) 132: 27(int) Constant 1 139: TypePointer Output 7(fvec4) - 140(Color): 139(ptr) Variable Output +140(@entryPointOutput.Color): 139(ptr) Variable Output 143: TypePointer Output 6(float) -144(@entryPointOutput_Depth): 143(ptr) Variable Output +144(@entryPointOutput.Depth): 143(ptr) Variable Output 147(g_tTex1df4): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -496,10 +496,10 @@ gl_FragCoord origin is upper left Store 137(flattenTemp) 138 141: 130(ptr) AccessChain 137(flattenTemp) 28 142: 7(fvec4) Load 141 - Store 140(Color) 142 + Store 140(@entryPointOutput.Color) 142 145: 12(ptr) AccessChain 137(flattenTemp) 132 146: 6(float) Load 145 - Store 144(@entryPointOutput_Depth) 146 + Store 144(@entryPointOutput.Depth) 146 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index 9d64bd3a..f85d9b51 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -161,13 +161,13 @@ ERROR: node is still EOpNull! 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -184,8 +184,8 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -341,13 +341,13 @@ ERROR: node is still EOpNull! 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -364,7 +364,7 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.clipdistance-4.vert.out b/Test/baseResults/hlsl.clipdistance-4.vert.out index f06d2124..617f05b3 100644 --- a/Test/baseResults/hlsl.clipdistance-4.vert.out +++ b/Test/baseResults/hlsl.clipdistance-4.vert.out @@ -66,14 +66,14 @@ Shader version: 500 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 Constant: 0:11 0 (const int) -0:? 'Position' (layout( location=0) in 4-component vector of float) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) 0:11 Sequence 0:11 move second child to first child ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 Function Call: @main(struct-VS_INPUT-vf41; ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:11 Position: direct index for structure ( temp 4-component vector of float) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 Constant: @@ -81,7 +81,7 @@ Shader version: 500 0:? Sequence 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 0 (const int) 0:11 direct index ( temp float) @@ -93,7 +93,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 1 (const int) 0:11 direct index ( temp float) @@ -105,7 +105,7 @@ Shader version: 500 0:11 1 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 2 (const int) 0:11 direct index ( temp float) @@ -117,7 +117,7 @@ Shader version: 500 0:11 2 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 3 (const int) 0:11 direct index ( temp float) @@ -128,9 +128,9 @@ Shader version: 500 0:11 Constant: 0:11 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? 'Position' (layout( location=0) in 4-component vector of float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) Linked vertex stage: @@ -203,14 +203,14 @@ Shader version: 500 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 Constant: 0:11 0 (const int) -0:? 'Position' (layout( location=0) in 4-component vector of float) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) 0:11 Sequence 0:11 move second child to first child ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 Function Call: @main(struct-VS_INPUT-vf41; ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:11 Position: direct index for structure ( temp 4-component vector of float) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float ClipRect}) 0:11 Constant: @@ -218,7 +218,7 @@ Shader version: 500 0:? Sequence 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 0 (const int) 0:11 direct index ( temp float) @@ -230,7 +230,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 1 (const int) 0:11 direct index ( temp float) @@ -242,7 +242,7 @@ Shader version: 500 0:11 1 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 2 (const int) 0:11 direct index ( temp float) @@ -254,7 +254,7 @@ Shader version: 500 0:11 2 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 3 (const int) 0:11 direct index ( temp float) @@ -265,9 +265,9 @@ Shader version: 500 0:11 Constant: 0:11 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? 'Position' (layout( location=0) in 4-component vector of float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -289,13 +289,13 @@ Shader version: 500 Name 11 "v" Name 15 "Output" Name 41 "v" - Name 43 "Position" + Name 43 "v.Position" Name 46 "flattenTemp" - Name 50 "@entryPointOutput_Position" - Name 56 "@entryPointOutput_ClipRect" - Decorate 43(Position) Location 0 - Decorate 50(@entryPointOutput_Position) BuiltIn Position - Decorate 56(@entryPointOutput_ClipRect) BuiltIn ClipDistance + Name 50 "@entryPointOutput.Position" + Name 56 "@entryPointOutput.ClipRect" + Decorate 43(v.Position) Location 0 + Decorate 50(@entryPointOutput.Position) BuiltIn Position + Decorate 56(@entryPointOutput.ClipRect) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -322,13 +322,13 @@ Shader version: 500 35: 24(int) Constant 3 40: TypePointer Function 8(VS_INPUT) 42: TypePointer Input 7(fvec4) - 43(Position): 42(ptr) Variable Input + 43(v.Position): 42(ptr) Variable Input 49: TypePointer Output 7(fvec4) -50(@entryPointOutput_Position): 49(ptr) Variable Output +50(@entryPointOutput.Position): 49(ptr) Variable Output 53: 24(int) Constant 4 54: TypeArray 6(float) 53 55: TypePointer Output 54 -56(@entryPointOutput_ClipRect): 55(ptr) Variable Output +56(@entryPointOutput.ClipRect): 55(ptr) Variable Output 59: TypePointer Output 6(float) 64: 16(int) Constant 2 68: 16(int) Constant 3 @@ -336,7 +336,7 @@ Shader version: 500 5: Label 41(v): 40(ptr) Variable Function 46(flattenTemp): 14(ptr) Variable Function - 44: 7(fvec4) Load 43(Position) + 44: 7(fvec4) Load 43(v.Position) 45: 20(ptr) AccessChain 41(v) 17 Store 45 44 47: 8(VS_INPUT) Load 41(v) @@ -344,22 +344,22 @@ Shader version: 500 Store 46(flattenTemp) 48 51: 20(ptr) AccessChain 46(flattenTemp) 17 52: 7(fvec4) Load 51 - Store 50(@entryPointOutput_Position) 52 + Store 50(@entryPointOutput.Position) 52 57: 26(ptr) AccessChain 46(flattenTemp) 22 25 58: 6(float) Load 57 - 60: 59(ptr) AccessChain 56(@entryPointOutput_ClipRect) 17 + 60: 59(ptr) AccessChain 56(@entryPointOutput.ClipRect) 17 Store 60 58 61: 26(ptr) AccessChain 46(flattenTemp) 22 29 62: 6(float) Load 61 - 63: 59(ptr) AccessChain 56(@entryPointOutput_ClipRect) 22 + 63: 59(ptr) AccessChain 56(@entryPointOutput.ClipRect) 22 Store 63 62 65: 26(ptr) AccessChain 46(flattenTemp) 22 32 66: 6(float) Load 65 - 67: 59(ptr) AccessChain 56(@entryPointOutput_ClipRect) 64 + 67: 59(ptr) AccessChain 56(@entryPointOutput.ClipRect) 64 Store 67 66 69: 26(ptr) AccessChain 46(flattenTemp) 22 35 70: 6(float) Load 69 - 71: 59(ptr) AccessChain 56(@entryPointOutput_ClipRect) 68 + 71: 59(ptr) AccessChain 56(@entryPointOutput.ClipRect) 68 Store 71 70 Return FunctionEnd diff --git a/Test/baseResults/hlsl.clipdistance-5.vert.out b/Test/baseResults/hlsl.clipdistance-5.vert.out index d462850d..35a966bb 100644 --- a/Test/baseResults/hlsl.clipdistance-5.vert.out +++ b/Test/baseResults/hlsl.clipdistance-5.vert.out @@ -78,14 +78,14 @@ Shader version: 500 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 Constant: 0:11 0 (const int) -0:? 'Position' (layout( location=0) in 4-component vector of float) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) 0:11 Sequence 0:11 move second child to first child ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 Function Call: @main(struct-VS_INPUT-vf41; ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:11 Position: direct index for structure ( temp 4-component vector of float) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 Constant: @@ -93,7 +93,7 @@ Shader version: 500 0:? Sequence 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 0 (const int) 0:11 direct index ( temp float) @@ -108,7 +108,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 1 (const int) 0:11 direct index ( temp float) @@ -123,7 +123,7 @@ Shader version: 500 0:11 1 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 2 (const int) 0:11 direct index ( temp float) @@ -138,7 +138,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 3 (const int) 0:11 direct index ( temp float) @@ -152,9 +152,9 @@ Shader version: 500 0:11 Constant: 0:11 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? 'Position' (layout( location=0) in 4-component vector of float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) Linked vertex stage: @@ -239,14 +239,14 @@ Shader version: 500 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 Constant: 0:11 0 (const int) -0:? 'Position' (layout( location=0) in 4-component vector of float) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) 0:11 Sequence 0:11 move second child to first child ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 Function Call: @main(struct-VS_INPUT-vf41; ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:? 'v' ( temp structure{ temp 4-component vector of float Position}) 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:11 Position: direct index for structure ( temp 4-component vector of float) 0:11 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 2-element array of 2-component vector of float ClipRect}) 0:11 Constant: @@ -254,7 +254,7 @@ Shader version: 500 0:? Sequence 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 0 (const int) 0:11 direct index ( temp float) @@ -269,7 +269,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 1 (const int) 0:11 direct index ( temp float) @@ -284,7 +284,7 @@ Shader version: 500 0:11 1 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 2 (const int) 0:11 direct index ( temp float) @@ -299,7 +299,7 @@ Shader version: 500 0:11 0 (const int) 0:11 move second child to first child ( temp float) 0:11 direct index ( temp float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) 0:11 Constant: 0:11 3 (const int) 0:11 direct index ( temp float) @@ -313,9 +313,9 @@ Shader version: 500 0:11 Constant: 0:11 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? 'Position' (layout( location=0) in 4-component vector of float) -0:? '@entryPointOutput_ClipRect' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? 'v.Position' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -337,13 +337,13 @@ Shader version: 500 Name 15 "v" Name 19 "Output" Name 42 "v" - Name 44 "Position" + Name 44 "v.Position" Name 47 "flattenTemp" - Name 51 "@entryPointOutput_Position" - Name 57 "@entryPointOutput_ClipRect" - Decorate 44(Position) Location 0 - Decorate 51(@entryPointOutput_Position) BuiltIn Position - Decorate 57(@entryPointOutput_ClipRect) BuiltIn ClipDistance + Name 51 "@entryPointOutput.Position" + Name 57 "@entryPointOutput.ClipRect" + Decorate 44(v.Position) Location 0 + Decorate 51(@entryPointOutput.Position) BuiltIn Position + Decorate 57(@entryPointOutput.ClipRect) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -371,13 +371,13 @@ Shader version: 500 36: 6(float) Constant 1082130432 41: TypePointer Function 8(VS_INPUT) 43: TypePointer Input 7(fvec4) - 44(Position): 43(ptr) Variable Input + 44(v.Position): 43(ptr) Variable Input 50: TypePointer Output 7(fvec4) -51(@entryPointOutput_Position): 50(ptr) Variable Output +51(@entryPointOutput.Position): 50(ptr) Variable Output 54: 10(int) Constant 4 55: TypeArray 6(float) 54 56: TypePointer Output 55 -57(@entryPointOutput_ClipRect): 56(ptr) Variable Output +57(@entryPointOutput.ClipRect): 56(ptr) Variable Output 60: TypePointer Output 6(float) 65: 20(int) Constant 2 69: 20(int) Constant 3 @@ -385,7 +385,7 @@ Shader version: 500 5: Label 42(v): 41(ptr) Variable Function 47(flattenTemp): 18(ptr) Variable Function - 45: 7(fvec4) Load 44(Position) + 45: 7(fvec4) Load 44(v.Position) 46: 24(ptr) AccessChain 42(v) 21 Store 46 45 48: 8(VS_INPUT) Load 42(v) @@ -393,22 +393,22 @@ Shader version: 500 Store 47(flattenTemp) 49 52: 24(ptr) AccessChain 47(flattenTemp) 21 53: 7(fvec4) Load 52 - Store 51(@entryPointOutput_Position) 53 + Store 51(@entryPointOutput.Position) 53 58: 29(ptr) AccessChain 47(flattenTemp) 26 21 28 59: 6(float) Load 58 - 61: 60(ptr) AccessChain 57(@entryPointOutput_ClipRect) 21 + 61: 60(ptr) AccessChain 57(@entryPointOutput.ClipRect) 21 Store 61 59 62: 29(ptr) AccessChain 47(flattenTemp) 26 21 32 63: 6(float) Load 62 - 64: 60(ptr) AccessChain 57(@entryPointOutput_ClipRect) 26 + 64: 60(ptr) AccessChain 57(@entryPointOutput.ClipRect) 26 Store 64 63 66: 29(ptr) AccessChain 47(flattenTemp) 26 26 28 67: 6(float) Load 66 - 68: 60(ptr) AccessChain 57(@entryPointOutput_ClipRect) 65 + 68: 60(ptr) AccessChain 57(@entryPointOutput.ClipRect) 65 Store 68 67 70: 29(ptr) AccessChain 47(flattenTemp) 26 26 32 71: 6(float) Load 70 - 72: 60(ptr) AccessChain 57(@entryPointOutput_ClipRect) 69 + 72: 60(ptr) AccessChain 57(@entryPointOutput.ClipRect) 69 Store 72 71 Return FunctionEnd diff --git a/Test/baseResults/hlsl.clipdistance-6.vert.out b/Test/baseResults/hlsl.clipdistance-6.vert.out index 09d4b094..44ce6fd6 100644 --- a/Test/baseResults/hlsl.clipdistance-6.vert.out +++ b/Test/baseResults/hlsl.clipdistance-6.vert.out @@ -104,7 +104,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Constant: @@ -112,7 +112,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -124,7 +124,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -136,7 +136,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -148,7 +148,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 3 (const int) 0:8 direct index ( temp float) @@ -161,7 +161,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 4 (const int) 0:8 direct index ( temp float) @@ -173,7 +173,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 5 (const int) 0:8 direct index ( temp float) @@ -185,7 +185,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 6 (const int) 0:8 direct index ( temp float) @@ -197,7 +197,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 7 (const int) 0:8 direct index ( temp float) @@ -208,8 +208,8 @@ Shader version: 500 0:8 Constant: 0:8 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) Linked vertex stage: @@ -320,7 +320,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 4-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Constant: @@ -328,7 +328,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -340,7 +340,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -352,7 +352,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -364,7 +364,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 3 (const int) 0:8 direct index ( temp float) @@ -377,7 +377,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 4 (const int) 0:8 direct index ( temp float) @@ -389,7 +389,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 5 (const int) 0:8 direct index ( temp float) @@ -401,7 +401,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 6 (const int) 0:8 direct index ( temp float) @@ -413,7 +413,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 7 (const int) 0:8 direct index ( temp float) @@ -424,8 +424,8 @@ Shader version: 500 0:8 Constant: 0:8 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -445,10 +445,10 @@ Shader version: 500 Name 10 "@main(" Name 13 "Output" Name 46 "flattenTemp" - Name 49 "@entryPointOutput_Position" - Name 55 "@entryPointOutput_clip1" - Decorate 49(@entryPointOutput_Position) BuiltIn Position - Decorate 55(@entryPointOutput_clip1) BuiltIn ClipDistance + Name 49 "@entryPointOutput.Position" + Name 55 "@entryPointOutput.clip1" + Decorate 49(@entryPointOutput.Position) BuiltIn Position + Decorate 55(@entryPointOutput.clip1) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -477,11 +477,11 @@ Shader version: 500 39: 6(float) Constant 1086324736 41: 6(float) Constant 1088421888 48: TypePointer Output 7(fvec4) -49(@entryPointOutput_Position): 48(ptr) Variable Output +49(@entryPointOutput.Position): 48(ptr) Variable Output 52: 21(int) Constant 8 53: TypeArray 6(float) 52 54: TypePointer Output 53 -55(@entryPointOutput_clip1): 54(ptr) Variable Output +55(@entryPointOutput.clip1): 54(ptr) Variable Output 58: TypePointer Output 6(float) 66: 14(int) Constant 3 70: 14(int) Constant 4 @@ -495,38 +495,38 @@ Shader version: 500 Store 46(flattenTemp) 47 50: 18(ptr) AccessChain 46(flattenTemp) 15 51: 7(fvec4) Load 50 - Store 49(@entryPointOutput_Position) 51 + Store 49(@entryPointOutput.Position) 51 56: 23(ptr) AccessChain 46(flattenTemp) 20 22 57: 6(float) Load 56 - 59: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 15 + 59: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 15 Store 59 57 60: 23(ptr) AccessChain 46(flattenTemp) 20 26 61: 6(float) Load 60 - 62: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 20 + 62: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 20 Store 62 61 63: 23(ptr) AccessChain 46(flattenTemp) 20 29 64: 6(float) Load 63 - 65: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 34 + 65: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 34 Store 65 64 67: 23(ptr) AccessChain 46(flattenTemp) 20 32 68: 6(float) Load 67 - 69: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 66 + 69: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 66 Store 69 68 71: 23(ptr) AccessChain 46(flattenTemp) 34 22 72: 6(float) Load 71 - 73: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 70 + 73: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 70 Store 73 72 75: 23(ptr) AccessChain 46(flattenTemp) 34 26 76: 6(float) Load 75 - 77: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 74 + 77: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 74 Store 77 76 79: 23(ptr) AccessChain 46(flattenTemp) 34 29 80: 6(float) Load 79 - 81: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 78 + 81: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 78 Store 81 80 83: 23(ptr) AccessChain 46(flattenTemp) 34 32 84: 6(float) Load 83 - 85: 58(ptr) AccessChain 55(@entryPointOutput_clip1) 82 + 85: 58(ptr) AccessChain 55(@entryPointOutput.clip1) 82 Store 85 84 Return FunctionEnd diff --git a/Test/baseResults/hlsl.clipdistance-7.vert.out b/Test/baseResults/hlsl.clipdistance-7.vert.out index d358c7a1..49e6aee8 100644 --- a/Test/baseResults/hlsl.clipdistance-7.vert.out +++ b/Test/baseResults/hlsl.clipdistance-7.vert.out @@ -94,7 +94,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Constant: @@ -102,7 +102,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -114,7 +114,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -126,7 +126,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -139,7 +139,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 4 (const int) 0:8 direct index ( temp float) @@ -151,7 +151,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 5 (const int) 0:8 direct index ( temp float) @@ -163,7 +163,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 6 (const int) 0:8 direct index ( temp float) @@ -175,7 +175,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 7 (const int) 0:8 direct index ( temp float) @@ -186,8 +186,8 @@ Shader version: 500 0:8 Constant: 0:8 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) Linked vertex stage: @@ -288,7 +288,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp 4-component vector of float clip1}) 0:8 Constant: @@ -296,7 +296,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -308,7 +308,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -320,7 +320,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -333,7 +333,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 4 (const int) 0:8 direct index ( temp float) @@ -345,7 +345,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 5 (const int) 0:8 direct index ( temp float) @@ -357,7 +357,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 6 (const int) 0:8 direct index ( temp float) @@ -369,7 +369,7 @@ Shader version: 500 0:8 2 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) 0:8 Constant: 0:8 7 (const int) 0:8 direct index ( temp float) @@ -380,8 +380,8 @@ Shader version: 500 0:8 Constant: 0:8 3 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 8-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -401,10 +401,10 @@ Shader version: 500 Name 11 "@main(" Name 14 "Output" Name 45 "flattenTemp" - Name 48 "@entryPointOutput_Position" - Name 54 "@entryPointOutput_clip1" - Decorate 48(@entryPointOutput_Position) BuiltIn Position - Decorate 54(@entryPointOutput_clip1) BuiltIn ClipDistance + Name 48 "@entryPointOutput.Position" + Name 54 "@entryPointOutput.clip1" + Decorate 48(@entryPointOutput.Position) BuiltIn Position + Decorate 54(@entryPointOutput.clip1) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -433,11 +433,11 @@ Shader version: 500 39: 6(float) Constant 1088421888 40: 22(int) Constant 3 47: TypePointer Output 7(fvec4) -48(@entryPointOutput_Position): 47(ptr) Variable Output +48(@entryPointOutput.Position): 47(ptr) Variable Output 51: 22(int) Constant 8 52: TypeArray 6(float) 51 53: TypePointer Output 52 -54(@entryPointOutput_clip1): 53(ptr) Variable Output +54(@entryPointOutput.clip1): 53(ptr) Variable Output 57: TypePointer Output 6(float) 65: 15(int) Constant 4 69: 15(int) Constant 5 @@ -450,34 +450,34 @@ Shader version: 500 Store 45(flattenTemp) 46 49: 19(ptr) AccessChain 45(flattenTemp) 16 50: 7(fvec4) Load 49 - Store 48(@entryPointOutput_Position) 50 + Store 48(@entryPointOutput.Position) 50 55: 24(ptr) AccessChain 45(flattenTemp) 21 23 56: 6(float) Load 55 - 58: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 16 + 58: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 16 Store 58 56 59: 24(ptr) AccessChain 45(flattenTemp) 21 27 60: 6(float) Load 59 - 61: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 21 + 61: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 21 Store 61 60 62: 24(ptr) AccessChain 45(flattenTemp) 21 30 63: 6(float) Load 62 - 64: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 32 + 64: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 32 Store 64 63 66: 24(ptr) AccessChain 45(flattenTemp) 32 23 67: 6(float) Load 66 - 68: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 65 + 68: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 65 Store 68 67 70: 24(ptr) AccessChain 45(flattenTemp) 32 27 71: 6(float) Load 70 - 72: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 69 + 72: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 69 Store 72 71 74: 24(ptr) AccessChain 45(flattenTemp) 32 30 75: 6(float) Load 74 - 76: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 73 + 76: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 73 Store 76 75 78: 24(ptr) AccessChain 45(flattenTemp) 32 40 79: 6(float) Load 78 - 80: 57(ptr) AccessChain 54(@entryPointOutput_clip1) 77 + 80: 57(ptr) AccessChain 54(@entryPointOutput.clip1) 77 Store 80 79 Return FunctionEnd diff --git a/Test/baseResults/hlsl.clipdistance-8.vert.out b/Test/baseResults/hlsl.clipdistance-8.vert.out index 901b3a99..80a29091 100644 --- a/Test/baseResults/hlsl.clipdistance-8.vert.out +++ b/Test/baseResults/hlsl.clipdistance-8.vert.out @@ -61,7 +61,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 Constant: @@ -69,7 +69,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -81,7 +81,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -93,7 +93,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -106,7 +106,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 3 (const int) 0:8 clip1: direct index for structure ( temp float) @@ -114,8 +114,8 @@ Shader version: 500 0:8 Constant: 0:8 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) Linked vertex stage: @@ -183,7 +183,7 @@ Shader version: 500 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 Function Call: @main( ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:8 Position: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 4-component vector of float Position, temp 3-component vector of float clip0, temp float clip1}) 0:8 Constant: @@ -191,7 +191,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 0 (const int) 0:8 direct index ( temp float) @@ -203,7 +203,7 @@ Shader version: 500 0:8 0 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 1 (const int) 0:8 direct index ( temp float) @@ -215,7 +215,7 @@ Shader version: 500 0:8 1 (const int) 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 2 (const int) 0:8 direct index ( temp float) @@ -228,7 +228,7 @@ Shader version: 500 0:? Sequence 0:8 move second child to first child ( temp float) 0:8 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) 0:8 Constant: 0:8 3 (const int) 0:8 clip1: direct index for structure ( temp float) @@ -236,8 +236,8 @@ Shader version: 500 0:8 Constant: 0:8 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) -0:? '@entryPointOutput_clip1' ( out 4-element array of float ClipDistance) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -257,10 +257,10 @@ Shader version: 500 Name 11 "@main(" Name 14 "Output" Name 38 "flattenTemp" - Name 41 "@entryPointOutput_Position" - Name 47 "@entryPointOutput_clip1" - Decorate 41(@entryPointOutput_Position) BuiltIn Position - Decorate 47(@entryPointOutput_clip1) BuiltIn ClipDistance + Name 41 "@entryPointOutput.Position" + Name 47 "@entryPointOutput.clip1" + Decorate 41(@entryPointOutput.Position) BuiltIn Position + Decorate 47(@entryPointOutput.clip1) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -285,11 +285,11 @@ Shader version: 500 32: 15(int) Constant 2 33: 6(float) Constant 1077936128 40: TypePointer Output 7(fvec4) -41(@entryPointOutput_Position): 40(ptr) Variable Output +41(@entryPointOutput.Position): 40(ptr) Variable Output 44: 22(int) Constant 4 45: TypeArray 6(float) 44 46: TypePointer Output 45 -47(@entryPointOutput_clip1): 46(ptr) Variable Output +47(@entryPointOutput.clip1): 46(ptr) Variable Output 50: TypePointer Output 6(float) 58: 15(int) Constant 3 4(main): 2 Function None 3 @@ -299,22 +299,22 @@ Shader version: 500 Store 38(flattenTemp) 39 42: 19(ptr) AccessChain 38(flattenTemp) 16 43: 7(fvec4) Load 42 - Store 41(@entryPointOutput_Position) 43 + Store 41(@entryPointOutput.Position) 43 48: 24(ptr) AccessChain 38(flattenTemp) 21 23 49: 6(float) Load 48 - 51: 50(ptr) AccessChain 47(@entryPointOutput_clip1) 16 + 51: 50(ptr) AccessChain 47(@entryPointOutput.clip1) 16 Store 51 49 52: 24(ptr) AccessChain 38(flattenTemp) 21 27 53: 6(float) Load 52 - 54: 50(ptr) AccessChain 47(@entryPointOutput_clip1) 21 + 54: 50(ptr) AccessChain 47(@entryPointOutput.clip1) 21 Store 54 53 55: 24(ptr) AccessChain 38(flattenTemp) 21 30 56: 6(float) Load 55 - 57: 50(ptr) AccessChain 47(@entryPointOutput_clip1) 32 + 57: 50(ptr) AccessChain 47(@entryPointOutput.clip1) 32 Store 57 56 59: 24(ptr) AccessChain 38(flattenTemp) 32 60: 6(float) Load 59 - 61: 50(ptr) AccessChain 47(@entryPointOutput_clip1) 58 + 61: 50(ptr) AccessChain 47(@entryPointOutput.clip1) 58 Store 61 60 Return FunctionEnd diff --git a/Test/baseResults/hlsl.clipdistance-9.vert.out b/Test/baseResults/hlsl.clipdistance-9.vert.out index 49ae59f2..8e5b3dd3 100644 --- a/Test/baseResults/hlsl.clipdistance-9.vert.out +++ b/Test/baseResults/hlsl.clipdistance-9.vert.out @@ -48,7 +48,7 @@ Shader version: 500 0:? Sequence 0:7 Sequence 0:7 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:7 Position: direct index for structure ( temp 4-component vector of float) 0:7 Function Call: @main(vf3;f1; ( temp structure{ temp 4-component vector of float Position}) 0:? 'clip0' ( temp 3-component vector of float) @@ -91,7 +91,7 @@ Shader version: 500 0:7 3 (const int) 0:? 'clip1' ( temp float) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:? 'clip0' ( out 4-element array of float ClipDistance) @@ -147,7 +147,7 @@ Shader version: 500 0:? Sequence 0:7 Sequence 0:7 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:7 Position: direct index for structure ( temp 4-component vector of float) 0:7 Function Call: @main(vf3;f1; ( temp structure{ temp 4-component vector of float Position}) 0:? 'clip0' ( temp 3-component vector of float) @@ -190,7 +190,7 @@ Shader version: 500 0:7 3 (const int) 0:? 'clip1' ( temp float) 0:? Linker Objects -0:? '@entryPointOutput_Position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Position' ( out 4-component vector of float Position) 0:? 'clip0' ( out 4-element array of float ClipDistance) // Module Version 10000 @@ -210,13 +210,13 @@ Shader version: 500 Name 13 "clip0" Name 14 "clip1" Name 18 "Output" - Name 39 "@entryPointOutput_Position" + Name 39 "@entryPointOutput.Position" Name 40 "clip0" Name 41 "clip1" Name 42 "param" Name 43 "param" Name 51 "clip0" - Decorate 39(@entryPointOutput_Position) BuiltIn Position + Decorate 39(@entryPointOutput.Position) BuiltIn Position Decorate 51(clip0) BuiltIn ClipDistance 2: TypeVoid 3: TypeFunction 2 @@ -241,7 +241,7 @@ Shader version: 500 32: 25(int) Constant 2 34: 6(float) Constant 1077936128 38: TypePointer Output 10(fvec4) -39(@entryPointOutput_Position): 38(ptr) Variable Output +39(@entryPointOutput.Position): 38(ptr) Variable Output 48: 25(int) Constant 4 49: TypeArray 6(float) 48 50: TypePointer Output 49 @@ -262,7 +262,7 @@ Shader version: 500 46: 6(float) Load 43(param) Store 41(clip1) 46 47: 10(fvec4) CompositeExtract 44 0 - Store 39(@entryPointOutput_Position) 47 + Store 39(@entryPointOutput.Position) 47 52: 9(ptr) AccessChain 40(clip0) 26 53: 6(float) Load 52 55: 54(ptr) AccessChain 51(clip0) 20 diff --git a/Test/baseResults/hlsl.comparison.vec.frag.out b/Test/baseResults/hlsl.comparison.vec.frag.out index dd363c6a..2e571702 100644 --- a/Test/baseResults/hlsl.comparison.vec.frag.out +++ b/Test/baseResults/hlsl.comparison.vec.frag.out @@ -119,14 +119,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:30 Sequence 0:30 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:30 Color: direct index for structure ( temp 4-component vector of float) 0:30 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:30 Constant: 0:30 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float uf4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -252,14 +252,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:30 Sequence 0:30 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:30 Color: direct index for structure ( temp 4-component vector of float) 0:30 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:30 Constant: 0:30 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float uf4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -292,11 +292,11 @@ gl_FragCoord origin is upper left Name 71 "r22" Name 76 "r23" Name 82 "psout" - Name 90 "Color" + Name 90 "@entryPointOutput.Color" Name 93 "$Global" MemberName 93($Global) 0 "uf4" Name 95 "" - Decorate 90(Color) Location 0 + Decorate 90(@entryPointOutput.Color) Location 0 MemberDecorate 93($Global) 0 Offset 0 Decorate 93($Global) Block Decorate 95 DescriptorSet 0 @@ -318,7 +318,7 @@ gl_FragCoord origin is upper left 83: TypeInt 32 1 84: 83(int) Constant 0 89: TypePointer Output 7(fvec4) - 90(Color): 89(ptr) Variable Output +90(@entryPointOutput.Color): 89(ptr) Variable Output 93($Global): TypeStruct 7(fvec4) 94: TypePointer Uniform 93($Global) 95: 94(ptr) Variable Uniform @@ -326,7 +326,7 @@ gl_FragCoord origin is upper left 5: Label 91:13(PS_OUTPUT) FunctionCall 15(@main() 92: 7(fvec4) CompositeExtract 91 0 - Store 90(Color) 92 + Store 90(@entryPointOutput.Color) 92 Return FunctionEnd 11(Bug1(vf4;): 2 Function None 9 diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index 90c667a3..ecaf95a7 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -41,13 +41,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:4 Sequence 0:4 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:4 color: direct index for structure ( temp 4-component vector of float) 0:4 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:4 Constant: 0:4 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -95,13 +95,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:4 Sequence 0:4 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:4 color: direct index for structure ( temp 4-component vector of float) 0:4 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:4 Constant: 0:4 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -118,8 +118,8 @@ gl_FragCoord origin is upper left MemberName 8(PS_OUTPUT) 0 "color" Name 10 "@main(" Name 27 "ps_output" - Name 37 "color" - Decorate 37(color) Location 0 + Name 37 "@entryPointOutput.color" + Decorate 37(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -146,12 +146,12 @@ gl_FragCoord origin is upper left 30: 7(fvec4) ConstantComposite 29 29 29 29 31: TypePointer Function 7(fvec4) 36: TypePointer Output 7(fvec4) - 37(color): 36(ptr) Variable Output +37(@entryPointOutput.color): 36(ptr) Variable Output 4(main): 2 Function None 3 5: Label 38:8(PS_OUTPUT) FunctionCall 10(@main() 39: 7(fvec4) CompositeExtract 38 0 - Store 37(color) 39 + Store 37(@entryPointOutput.color) 39 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.domain.1.tese.out b/Test/baseResults/hlsl.domain.1.tese.out index 1bb09275..9cdf297e 100644 --- a/Test/baseResults/hlsl.domain.1.tese.out +++ b/Test/baseResults/hlsl.domain.1.tese.out @@ -69,7 +69,7 @@ triangle order = none 0:22 Constant: 0:22 0 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp float) @@ -81,7 +81,7 @@ triangle order = none 0:22 Constant: 0:22 1 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 1 (const int) 0:22 move second child to first child ( temp float) @@ -93,7 +93,7 @@ triangle order = none 0:22 Constant: 0:22 2 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 2 (const int) 0:22 move second child to first child ( temp float) @@ -102,7 +102,7 @@ triangle order = none 0:22 Constant: 0:22 1 (const int) 0:22 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:22 Constant: 0:22 0 (const int) 0:22 Sequence @@ -113,24 +113,24 @@ triangle order = none 0:? 'tesscoord' ( temp 3-component vector of float) 0:? 'pcf_data' ( temp structure{ temp 3-element array of float flTessFactor, temp float flInsideTessFactor}) 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:22 pos: direct index for structure ( temp 4-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:22 norm: direct index for structure ( temp 3-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:22 Constant: 0:22 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) Linked tessellation evaluation stage: @@ -206,7 +206,7 @@ triangle order = none 0:22 Constant: 0:22 0 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp float) @@ -218,7 +218,7 @@ triangle order = none 0:22 Constant: 0:22 1 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 1 (const int) 0:22 move second child to first child ( temp float) @@ -230,7 +230,7 @@ triangle order = none 0:22 Constant: 0:22 2 (const int) 0:22 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:22 Constant: 0:22 2 (const int) 0:22 move second child to first child ( temp float) @@ -239,7 +239,7 @@ triangle order = none 0:22 Constant: 0:22 1 (const int) 0:22 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:22 Constant: 0:22 0 (const int) 0:22 Sequence @@ -250,24 +250,24 @@ triangle order = none 0:? 'tesscoord' ( temp 3-component vector of float) 0:? 'pcf_data' ( temp structure{ temp 3-element array of float flTessFactor, temp float flInsideTessFactor}) 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:22 pos: direct index for structure ( temp 4-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:22 norm: direct index for structure ( temp 3-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:22 Constant: 0:22 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) // Module Version 10000 // Generated by (magic number): 80001 @@ -299,22 +299,22 @@ triangle order = none Name 53 "tesscoord" Name 55 "tesscoord" Name 57 "pcf_data" - Name 61 "pcf_data_flTessFactor" - Name 76 "pcf_data_flInsideTessFactor" + Name 61 "pcf_data.flTessFactor" + Name 76 "pcf_data.flInsideTessFactor" Name 80 "flattenTemp" Name 82 "param" Name 84 "param" - Name 88 "pos" - Name 92 "norm" + Name 88 "@entryPointOutput.pos" + Name 92 "@entryPointOutput.norm" Decorate 51(i) Location 0 Decorate 55(tesscoord) Patch Decorate 55(tesscoord) BuiltIn TessCoord - Decorate 61(pcf_data_flTessFactor) Patch - Decorate 61(pcf_data_flTessFactor) BuiltIn TessLevelOuter - Decorate 76(pcf_data_flInsideTessFactor) Patch - Decorate 76(pcf_data_flInsideTessFactor) BuiltIn TessLevelInner - Decorate 88(pos) Location 0 - Decorate 92(norm) Location 1 + Decorate 61(pcf_data.flTessFactor) Patch + Decorate 61(pcf_data.flTessFactor) BuiltIn TessLevelOuter + Decorate 76(pcf_data.flInsideTessFactor) Patch + Decorate 76(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner + Decorate 88(@entryPointOutput.pos) Location 0 + Decorate 92(@entryPointOutput.norm) Location 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -346,17 +346,17 @@ triangle order = none 58: 10(int) Constant 4 59: TypeArray 6(float) 58 60: TypePointer Input 59 -61(pcf_data_flTessFactor): 60(ptr) Variable Input +61(pcf_data.flTessFactor): 60(ptr) Variable Input 62: TypePointer Input 6(float) 69: 26(int) Constant 2 73: 10(int) Constant 2 74: TypeArray 6(float) 73 75: TypePointer Input 74 -76(pcf_data_flInsideTessFactor): 75(ptr) Variable Input +76(pcf_data.flInsideTessFactor): 75(ptr) Variable Input 87: TypePointer Output 7(fvec4) - 88(pos): 87(ptr) Variable Output +88(@entryPointOutput.pos): 87(ptr) Variable Output 91: TypePointer Output 8(fvec3) - 92(norm): 91(ptr) Variable Output +92(@entryPointOutput.norm): 91(ptr) Variable Output 4(main): 2 Function None 3 5: Label 49(i): 48(ptr) Variable Function @@ -369,19 +369,19 @@ triangle order = none Store 49(i) 52 56: 8(fvec3) Load 55(tesscoord) Store 53(tesscoord) 56 - 63: 62(ptr) AccessChain 61(pcf_data_flTessFactor) 27 + 63: 62(ptr) AccessChain 61(pcf_data.flTessFactor) 27 64: 6(float) Load 63 65: 30(ptr) AccessChain 57(pcf_data) 27 27 Store 65 64 - 66: 62(ptr) AccessChain 61(pcf_data_flTessFactor) 37 + 66: 62(ptr) AccessChain 61(pcf_data.flTessFactor) 37 67: 6(float) Load 66 68: 30(ptr) AccessChain 57(pcf_data) 27 37 Store 68 67 - 70: 62(ptr) AccessChain 61(pcf_data_flTessFactor) 69 + 70: 62(ptr) AccessChain 61(pcf_data.flTessFactor) 69 71: 6(float) Load 70 72: 30(ptr) AccessChain 57(pcf_data) 27 69 Store 72 71 - 77: 62(ptr) AccessChain 76(pcf_data_flInsideTessFactor) 27 + 77: 62(ptr) AccessChain 76(pcf_data.flInsideTessFactor) 27 78: 6(float) Load 77 79: 30(ptr) AccessChain 57(pcf_data) 37 Store 79 78 @@ -394,10 +394,10 @@ triangle order = none Store 80(flattenTemp) 86 89: 35(ptr) AccessChain 80(flattenTemp) 27 90: 7(fvec4) Load 89 - Store 88(pos) 90 + Store 88(@entryPointOutput.pos) 90 93: 13(ptr) AccessChain 80(flattenTemp) 37 94: 8(fvec3) Load 93 - Store 92(norm) 94 + Store 92(@entryPointOutput.norm) 94 Return FunctionEnd 22(@main(struct-ds_in_t-vf4-vf31[3];vf3;struct-pcf_in_t-f1[3]-f11;): 17(gs_in_t) Function None 18 diff --git a/Test/baseResults/hlsl.domain.2.tese.out b/Test/baseResults/hlsl.domain.2.tese.out index 35c8daa0..75e22656 100644 --- a/Test/baseResults/hlsl.domain.2.tese.out +++ b/Test/baseResults/hlsl.domain.2.tese.out @@ -63,7 +63,7 @@ triangle order = none 0:25 Constant: 0:25 0 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp float) @@ -75,7 +75,7 @@ triangle order = none 0:25 Constant: 0:25 1 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 1 (const int) 0:25 move second child to first child ( temp float) @@ -87,7 +87,7 @@ triangle order = none 0:25 Constant: 0:25 2 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 2 (const int) 0:25 move second child to first child ( temp float) @@ -96,7 +96,7 @@ triangle order = none 0:25 Constant: 0:25 1 (const int) 0:25 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp float) @@ -122,24 +122,24 @@ triangle order = none 0:? 'i' ( temp 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( temp 3-component vector of float) 0:25 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:25 pos: direct index for structure ( temp 4-component vector of float) 0:25 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:25 norm: direct index for structure ( temp 3-component vector of float) 0:25 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:25 Constant: 0:25 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:? 'pcf_data' (layout( location=2) patch in structure{ temp float foo}) @@ -210,7 +210,7 @@ triangle order = none 0:25 Constant: 0:25 0 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp float) @@ -222,7 +222,7 @@ triangle order = none 0:25 Constant: 0:25 1 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 1 (const int) 0:25 move second child to first child ( temp float) @@ -234,7 +234,7 @@ triangle order = none 0:25 Constant: 0:25 2 (const int) 0:25 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:25 Constant: 0:25 2 (const int) 0:25 move second child to first child ( temp float) @@ -243,7 +243,7 @@ triangle order = none 0:25 Constant: 0:25 1 (const int) 0:25 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp float) @@ -269,24 +269,24 @@ triangle order = none 0:? 'i' ( temp 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( temp 3-component vector of float) 0:25 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:25 pos: direct index for structure ( temp 4-component vector of float) 0:25 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:25 Constant: 0:25 0 (const int) 0:25 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:25 norm: direct index for structure ( temp 3-component vector of float) 0:25 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:25 Constant: 0:25 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:? 'pcf_data' (layout( location=2) patch in structure{ temp float foo}) // Module Version 10000 @@ -316,8 +316,8 @@ triangle order = none Name 21 "tesscoord" Name 25 "o" Name 48 "pcf_data" - Name 52 "pcf_data_flTessFactor" - Name 67 "pcf_data_flInsideTessFactor" + Name 52 "pcf_data.flTessFactor" + Name 67 "pcf_data.flInsideTessFactor" Name 71 "pcf_in_t" MemberName 71(pcf_in_t) 0 "foo" Name 73 "pcf_data" @@ -328,20 +328,20 @@ triangle order = none Name 86 "flattenTemp" Name 88 "param" Name 90 "param" - Name 94 "pos" - Name 98 "norm" - Decorate 52(pcf_data_flTessFactor) Patch - Decorate 52(pcf_data_flTessFactor) BuiltIn TessLevelOuter - Decorate 67(pcf_data_flInsideTessFactor) Patch - Decorate 67(pcf_data_flInsideTessFactor) BuiltIn TessLevelInner + Name 94 "@entryPointOutput.pos" + Name 98 "@entryPointOutput.norm" + Decorate 52(pcf_data.flTessFactor) Patch + Decorate 52(pcf_data.flTessFactor) BuiltIn TessLevelOuter + Decorate 67(pcf_data.flInsideTessFactor) Patch + Decorate 67(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner MemberDecorate 71(pcf_in_t) 0 Patch Decorate 73(pcf_data) Patch Decorate 73(pcf_data) Location 2 Decorate 80(i) Location 0 Decorate 84(tesscoord) Patch Decorate 84(tesscoord) BuiltIn TessCoord - Decorate 94(pos) Location 0 - Decorate 98(norm) Location 1 + Decorate 94(@entryPointOutput.pos) Location 0 + Decorate 98(@entryPointOutput.norm) Location 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -368,13 +368,13 @@ triangle order = none 49: 7(int) Constant 4 50: TypeArray 6(float) 49 51: TypePointer Input 50 -52(pcf_data_flTessFactor): 51(ptr) Variable Input +52(pcf_data.flTessFactor): 51(ptr) Variable Input 53: TypePointer Input 6(float) 60: 26(int) Constant 2 64: 7(int) Constant 2 65: TypeArray 6(float) 64 66: TypePointer Input 65 -67(pcf_data_flInsideTessFactor): 66(ptr) Variable Input +67(pcf_data.flInsideTessFactor): 66(ptr) Variable Input 71(pcf_in_t): TypeStruct 6(float) 72: TypePointer Input 71(pcf_in_t) 73(pcf_data): 72(ptr) Variable Input @@ -384,9 +384,9 @@ triangle order = none 83: TypePointer Input 13(fvec3) 84(tesscoord): 83(ptr) Variable Input 93: TypePointer Output 12(fvec4) - 94(pos): 93(ptr) Variable Output +94(@entryPointOutput.pos): 93(ptr) Variable Output 97: TypePointer Output 13(fvec3) - 98(norm): 97(ptr) Variable Output +98(@entryPointOutput.norm): 97(ptr) Variable Output 4(main): 2 Function None 3 5: Label 48(pcf_data): 11(ptr) Variable Function @@ -395,19 +395,19 @@ triangle order = none 86(flattenTemp): 24(ptr) Variable Function 88(param): 11(ptr) Variable Function 90(param): 16(ptr) Variable Function - 54: 53(ptr) AccessChain 52(pcf_data_flTessFactor) 27 + 54: 53(ptr) AccessChain 52(pcf_data.flTessFactor) 27 55: 6(float) Load 54 56: 30(ptr) AccessChain 48(pcf_data) 27 27 Store 56 55 - 57: 53(ptr) AccessChain 52(pcf_data_flTessFactor) 37 + 57: 53(ptr) AccessChain 52(pcf_data.flTessFactor) 37 58: 6(float) Load 57 59: 30(ptr) AccessChain 48(pcf_data) 27 37 Store 59 58 - 61: 53(ptr) AccessChain 52(pcf_data_flTessFactor) 60 + 61: 53(ptr) AccessChain 52(pcf_data.flTessFactor) 60 62: 6(float) Load 61 63: 30(ptr) AccessChain 48(pcf_data) 27 60 Store 63 62 - 68: 53(ptr) AccessChain 67(pcf_data_flInsideTessFactor) 27 + 68: 53(ptr) AccessChain 67(pcf_data.flInsideTessFactor) 27 69: 6(float) Load 68 70: 30(ptr) AccessChain 48(pcf_data) 37 Store 70 69 @@ -428,10 +428,10 @@ triangle order = none Store 86(flattenTemp) 92 95: 35(ptr) AccessChain 86(flattenTemp) 27 96: 12(fvec4) Load 95 - Store 94(pos) 96 + Store 94(@entryPointOutput.pos) 96 99: 16(ptr) AccessChain 86(flattenTemp) 37 100: 13(fvec3) Load 99 - Store 98(norm) 100 + Store 98(@entryPointOutput.norm) 100 Return FunctionEnd 22(@main(struct-pcf_in_t-f1[3]-f1-f11;struct-ds_in_t-vf4-vf31[3];vf3;): 17(gs_in_t) Function None 18 diff --git a/Test/baseResults/hlsl.domain.3.tese.out b/Test/baseResults/hlsl.domain.3.tese.out index e0124579..254afe68 100644 --- a/Test/baseResults/hlsl.domain.3.tese.out +++ b/Test/baseResults/hlsl.domain.3.tese.out @@ -66,7 +66,7 @@ triangle order = none 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) @@ -78,7 +78,7 @@ triangle order = none 0:24 Constant: 0:24 1 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 1 (const int) 0:24 move second child to first child ( temp float) @@ -90,7 +90,7 @@ triangle order = none 0:24 Constant: 0:24 2 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 2 (const int) 0:24 move second child to first child ( temp float) @@ -99,7 +99,7 @@ triangle order = none 0:24 Constant: 0:24 1 (const int) 0:24 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:24 Constant: 0:24 0 (const int) 0:24 Sequence @@ -110,24 +110,24 @@ triangle order = none 0:? 'tesscoord' ( temp 2-component vector of float) 0:? 'pcf_data' ( temp structure{ temp 3-element array of float flTessFactor, temp float flInsideTessFactor}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:24 pos: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:24 norm: direct index for structure ( temp 3-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:24 Constant: 0:24 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 2-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) Linked tessellation evaluation stage: @@ -200,7 +200,7 @@ triangle order = none 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) @@ -212,7 +212,7 @@ triangle order = none 0:24 Constant: 0:24 1 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 1 (const int) 0:24 move second child to first child ( temp float) @@ -224,7 +224,7 @@ triangle order = none 0:24 Constant: 0:24 2 (const int) 0:24 direct index ( patch in float TessLevelOuter) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) 0:24 Constant: 0:24 2 (const int) 0:24 move second child to first child ( temp float) @@ -233,7 +233,7 @@ triangle order = none 0:24 Constant: 0:24 1 (const int) 0:24 direct index ( patch in float TessLevelInner) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) 0:24 Constant: 0:24 0 (const int) 0:24 Sequence @@ -244,24 +244,24 @@ triangle order = none 0:? 'tesscoord' ( temp 2-component vector of float) 0:? 'pcf_data' ( temp structure{ temp 3-element array of float flTessFactor, temp float flInsideTessFactor}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) 0:24 pos: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp 3-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:24 norm: direct index for structure ( temp 3-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:24 Constant: 0:24 1 (const int) 0:? Linker Objects -0:? 'pos' (layout( location=0) out 4-component vector of float) -0:? 'norm' (layout( location=1) out 3-component vector of float) +0:? '@entryPointOutput.pos' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.norm' (layout( location=1) out 3-component vector of float) 0:? 'i' (layout( location=0) in 2-element array of structure{ temp 4-component vector of float pos, temp 3-component vector of float norm}) 0:? 'tesscoord' ( patch in 3-component vector of float TessCoord) -0:? 'pcf_data_flTessFactor' ( patch in 4-element array of float TessLevelOuter) -0:? 'pcf_data_flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) +0:? 'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter) +0:? 'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner) // Module Version 10000 // Generated by (magic number): 80001 @@ -293,22 +293,22 @@ triangle order = none Name 56 "tesscoord" Name 58 "tesscoord" Name 63 "pcf_data" - Name 67 "pcf_data_flTessFactor" - Name 81 "pcf_data_flInsideTessFactor" + Name 67 "pcf_data.flTessFactor" + Name 81 "pcf_data.flInsideTessFactor" Name 85 "flattenTemp" Name 87 "param" Name 89 "param" - Name 93 "pos" - Name 97 "norm" + Name 93 "@entryPointOutput.pos" + Name 97 "@entryPointOutput.norm" Decorate 54(i) Location 0 Decorate 58(tesscoord) Patch Decorate 58(tesscoord) BuiltIn TessCoord - Decorate 67(pcf_data_flTessFactor) Patch - Decorate 67(pcf_data_flTessFactor) BuiltIn TessLevelOuter - Decorate 81(pcf_data_flInsideTessFactor) Patch - Decorate 81(pcf_data_flInsideTessFactor) BuiltIn TessLevelInner - Decorate 93(pos) Location 0 - Decorate 97(norm) Location 1 + Decorate 67(pcf_data.flTessFactor) Patch + Decorate 67(pcf_data.flTessFactor) BuiltIn TessLevelOuter + Decorate 81(pcf_data.flInsideTessFactor) Patch + Decorate 81(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner + Decorate 93(@entryPointOutput.pos) Location 0 + Decorate 97(@entryPointOutput.norm) Location 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -343,16 +343,16 @@ triangle order = none 64: 10(int) Constant 4 65: TypeArray 6(float) 64 66: TypePointer Input 65 -67(pcf_data_flTessFactor): 66(ptr) Variable Input +67(pcf_data.flTessFactor): 66(ptr) Variable Input 68: TypePointer Input 6(float) 75: 28(int) Constant 2 79: TypeArray 6(float) 11 80: TypePointer Input 79 -81(pcf_data_flInsideTessFactor): 80(ptr) Variable Input +81(pcf_data.flInsideTessFactor): 80(ptr) Variable Input 92: TypePointer Output 7(fvec4) - 93(pos): 92(ptr) Variable Output +93(@entryPointOutput.pos): 92(ptr) Variable Output 96: TypePointer Output 8(fvec3) - 97(norm): 96(ptr) Variable Output +97(@entryPointOutput.norm): 96(ptr) Variable Output 4(main): 2 Function None 3 5: Label 52(i): 51(ptr) Variable Function @@ -368,19 +368,19 @@ triangle order = none 61: 6(float) CompositeExtract 59 1 62: 13(fvec2) CompositeConstruct 60 61 Store 56(tesscoord) 62 - 69: 68(ptr) AccessChain 67(pcf_data_flTessFactor) 29 + 69: 68(ptr) AccessChain 67(pcf_data.flTessFactor) 29 70: 6(float) Load 69 71: 32(ptr) AccessChain 63(pcf_data) 29 29 Store 71 70 - 72: 68(ptr) AccessChain 67(pcf_data_flTessFactor) 39 + 72: 68(ptr) AccessChain 67(pcf_data.flTessFactor) 39 73: 6(float) Load 72 74: 32(ptr) AccessChain 63(pcf_data) 29 39 Store 74 73 - 76: 68(ptr) AccessChain 67(pcf_data_flTessFactor) 75 + 76: 68(ptr) AccessChain 67(pcf_data.flTessFactor) 75 77: 6(float) Load 76 78: 32(ptr) AccessChain 63(pcf_data) 29 75 Store 78 77 - 82: 68(ptr) AccessChain 81(pcf_data_flInsideTessFactor) 29 + 82: 68(ptr) AccessChain 81(pcf_data.flInsideTessFactor) 29 83: 6(float) Load 82 84: 32(ptr) AccessChain 63(pcf_data) 39 Store 84 83 @@ -393,10 +393,10 @@ triangle order = none Store 85(flattenTemp) 91 94: 37(ptr) AccessChain 85(flattenTemp) 29 95: 7(fvec4) Load 94 - Store 93(pos) 95 + Store 93(@entryPointOutput.pos) 95 98: 46(ptr) AccessChain 85(flattenTemp) 39 99: 8(fvec3) Load 98 - Store 97(norm) 99 + Store 97(@entryPointOutput.norm) 99 Return FunctionEnd 24(@main(struct-ds_in_t-vf4-vf31[2];vf2;struct-pcf_in_t-f1[3]-f11;): 19(gs_in_t) Function None 20 diff --git a/Test/baseResults/hlsl.entry-in.frag.out b/Test/baseResults/hlsl.entry-in.frag.out index b0cac035..454b2f95 100755 --- a/Test/baseResults/hlsl.entry-in.frag.out +++ b/Test/baseResults/hlsl.entry-in.frag.out @@ -66,7 +66,7 @@ gl_FragCoord origin is upper left 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:13 Constant: 0:13 1 (const int) -0:? 'i_fragCoord' ( in 4-component vector of float FragCoord) +0:? 'i.fragCoord' ( in 4-component vector of float FragCoord) 0:13 move second child to first child ( temp 2-component vector of int) 0:13 i2: direct index for structure ( temp 2-component vector of int) 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) @@ -82,7 +82,7 @@ gl_FragCoord origin is upper left 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) -0:? 'i_fragCoord' ( in 4-component vector of float FragCoord) +0:? 'i.fragCoord' ( in 4-component vector of float FragCoord) 0:? 'i' (layout( location=0) in structure{ temp 2-component vector of float v, flat temp 2-component vector of int i2}) @@ -156,7 +156,7 @@ gl_FragCoord origin is upper left 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:13 Constant: 0:13 1 (const int) -0:? 'i_fragCoord' ( in 4-component vector of float FragCoord) +0:? 'i.fragCoord' ( in 4-component vector of float FragCoord) 0:13 move second child to first child ( temp 2-component vector of int) 0:13 i2: direct index for structure ( temp 2-component vector of int) 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) @@ -172,7 +172,7 @@ gl_FragCoord origin is upper left 0:? 'i' ( temp structure{ temp 2-component vector of float v, temp 4-component vector of float fragCoord, temp 2-component vector of int i2}) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) -0:? 'i_fragCoord' ( in 4-component vector of float FragCoord) +0:? 'i.fragCoord' ( in 4-component vector of float FragCoord) 0:? 'i' (layout( location=0) in structure{ temp 2-component vector of float v, flat temp 2-component vector of int i2}) // Module Version 10000 @@ -204,12 +204,12 @@ gl_FragCoord origin is upper left MemberName 54(InParam) 0 "v" MemberName 54(InParam) 1 "i2" Name 56 "i" - Name 63 "i_fragCoord" + Name 63 "i.fragCoord" Name 73 "@entryPointOutput" Name 74 "param" MemberDecorate 54(InParam) 1 Flat Decorate 56(i) Location 0 - Decorate 63(i_fragCoord) BuiltIn FragCoord + Decorate 63(i.fragCoord) BuiltIn FragCoord Decorate 73(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -235,7 +235,7 @@ gl_FragCoord origin is upper left 57: TypePointer Input 7(fvec2) 60: TypePointer Function 7(fvec2) 62: TypePointer Input 8(fvec4) - 63(i_fragCoord): 62(ptr) Variable Input + 63(i.fragCoord): 62(ptr) Variable Input 66: 9(int) Constant 2 67: TypePointer Input 10(ivec2) 70: TypePointer Function 10(ivec2) @@ -249,7 +249,7 @@ gl_FragCoord origin is upper left 59: 7(fvec2) Load 58 61: 60(ptr) AccessChain 53(i) 21 Store 61 59 - 64: 8(fvec4) Load 63(i_fragCoord) + 64: 8(fvec4) Load 63(i.fragCoord) 65: 44(ptr) AccessChain 53(i) 27 Store 65 64 68: 67(ptr) AccessChain 56(i) 27 diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index 1324112a..9ff7d33d 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -86,26 +86,26 @@ gl_FragCoord origin is upper left 0:? 'out1' ( temp 4-component vector of float) 0:13 Sequence 0:13 move second child to first child ( temp 2-component vector of float) -0:? 'v' (layout( location=2) out 2-component vector of float) +0:? 'out2.v' (layout( location=2) out 2-component vector of float) 0:13 v: direct index for structure ( temp 2-component vector of float) 0:? 'out2' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp 2-component vector of int) -0:? 'i' (layout( location=3) out 2-component vector of int) +0:? 'out2.i' (layout( location=3) out 2-component vector of int) 0:13 i: direct index for structure ( temp 2-component vector of int) 0:? 'out2' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 1 (const int) 0:13 Sequence 0:13 move second child to first child ( temp 2-component vector of float) -0:? 'v' (layout( location=4) out 2-component vector of float) +0:? 'out3.v' (layout( location=4) out 2-component vector of float) 0:13 v: direct index for structure ( temp 2-component vector of float) 0:? 'out3' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp 2-component vector of int) -0:? 'i' (layout( location=5) out 2-component vector of int) +0:? 'out3.i' (layout( location=5) out 2-component vector of int) 0:13 i: direct index for structure ( temp 2-component vector of int) 0:? 'out3' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: @@ -114,10 +114,10 @@ gl_FragCoord origin is upper left 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) 0:? 'out1' (layout( location=1) out 4-component vector of float) -0:? 'v' (layout( location=2) out 2-component vector of float) -0:? 'i' (layout( location=3) out 2-component vector of int) -0:? 'v' (layout( location=4) out 2-component vector of float) -0:? 'i' (layout( location=5) out 2-component vector of int) +0:? 'out2.v' (layout( location=2) out 2-component vector of float) +0:? 'out2.i' (layout( location=3) out 2-component vector of int) +0:? 'out3.v' (layout( location=4) out 2-component vector of float) +0:? 'out3.i' (layout( location=5) out 2-component vector of int) Linked fragment stage: @@ -210,26 +210,26 @@ gl_FragCoord origin is upper left 0:? 'out1' ( temp 4-component vector of float) 0:13 Sequence 0:13 move second child to first child ( temp 2-component vector of float) -0:? 'v' (layout( location=2) out 2-component vector of float) +0:? 'out2.v' (layout( location=2) out 2-component vector of float) 0:13 v: direct index for structure ( temp 2-component vector of float) 0:? 'out2' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp 2-component vector of int) -0:? 'i' (layout( location=3) out 2-component vector of int) +0:? 'out2.i' (layout( location=3) out 2-component vector of int) 0:13 i: direct index for structure ( temp 2-component vector of int) 0:? 'out2' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 1 (const int) 0:13 Sequence 0:13 move second child to first child ( temp 2-component vector of float) -0:? 'v' (layout( location=4) out 2-component vector of float) +0:? 'out3.v' (layout( location=4) out 2-component vector of float) 0:13 v: direct index for structure ( temp 2-component vector of float) 0:? 'out3' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp 2-component vector of int) -0:? 'i' (layout( location=5) out 2-component vector of int) +0:? 'out3.i' (layout( location=5) out 2-component vector of int) 0:13 i: direct index for structure ( temp 2-component vector of int) 0:? 'out3' ( temp structure{ temp 2-component vector of float v, temp 2-component vector of int i}) 0:13 Constant: @@ -238,10 +238,10 @@ gl_FragCoord origin is upper left 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) 0:? 'out1' (layout( location=1) out 4-component vector of float) -0:? 'v' (layout( location=2) out 2-component vector of float) -0:? 'i' (layout( location=3) out 2-component vector of int) -0:? 'v' (layout( location=4) out 2-component vector of float) -0:? 'i' (layout( location=5) out 2-component vector of int) +0:? 'out2.v' (layout( location=2) out 2-component vector of float) +0:? 'out2.i' (layout( location=3) out 2-component vector of int) +0:? 'out3.v' (layout( location=4) out 2-component vector of float) +0:? 'out3.i' (layout( location=5) out 2-component vector of int) // Module Version 10000 // Generated by (magic number): 80001 @@ -277,17 +277,17 @@ gl_FragCoord origin is upper left Name 67 "param" Name 68 "param" Name 73 "out1" - Name 76 "v" - Name 80 "i" - Name 83 "v" - Name 86 "i" + Name 76 "out2.v" + Name 80 "out2.i" + Name 83 "out3.v" + Name 86 "out3.i" Decorate 57(input) Location 0 Decorate 60(@entryPointOutput) Location 0 Decorate 73(out1) Location 1 - Decorate 76(v) Location 2 - Decorate 80(i) Location 3 - Decorate 83(v) Location 4 - Decorate 86(i) Location 5 + Decorate 76(out2.v) Location 2 + Decorate 80(out2.i) Location 3 + Decorate 83(out3.v) Location 4 + Decorate 86(out3.i) Location 5 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -322,11 +322,11 @@ gl_FragCoord origin is upper left 60(@entryPointOutput): 59(ptr) Variable Output 73(out1): 59(ptr) Variable Output 75: TypePointer Output 7(fvec2) - 76(v): 75(ptr) Variable Output + 76(out2.v): 75(ptr) Variable Output 79: TypePointer Output 9(ivec2) - 80(i): 79(ptr) Variable Output - 83(v): 75(ptr) Variable Output - 86(i): 79(ptr) Variable Output + 80(out2.i): 79(ptr) Variable Output + 83(out3.v): 75(ptr) Variable Output + 86(out3.i): 79(ptr) Variable Output 4(PixelShaderFunction): 2 Function None 3 5: Label 55(input): 17(ptr) Variable Function @@ -353,16 +353,16 @@ gl_FragCoord origin is upper left Store 73(out1) 74 77: 28(ptr) AccessChain 62(out2) 25 78: 7(fvec2) Load 77 - Store 76(v) 78 + Store 76(out2.v) 78 81: 33(ptr) AccessChain 62(out2) 30 82: 9(ivec2) Load 81 - Store 80(i) 82 + Store 80(out2.i) 82 84: 28(ptr) AccessChain 63(out3) 25 85: 7(fvec2) Load 84 - Store 83(v) 85 + Store 83(out3.v) 85 87: 33(ptr) AccessChain 63(out3) 30 88: 9(ivec2) Load 87 - Store 86(i) 88 + Store 86(out3.i) 88 Return FunctionEnd 14(fun(struct-OutParam-vf2-vi21;): 2 Function None 12 diff --git a/Test/baseResults/hlsl.entry.rename.frag.out b/Test/baseResults/hlsl.entry.rename.frag.out index c6a43355..a85123d1 100644 --- a/Test/baseResults/hlsl.entry.rename.frag.out +++ b/Test/baseResults/hlsl.entry.rename.frag.out @@ -24,14 +24,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:11 Color: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main_in_spv( ( temp structure{ temp 4-component vector of float Color}) 0:11 Constant: 0:11 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int also_not_the_entry_point}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -62,14 +62,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:11 Color: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main_in_spv( ( temp structure{ temp 4-component vector of float Color}) 0:11 Constant: 0:11 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int also_not_the_entry_point}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -87,11 +87,11 @@ gl_FragCoord origin is upper left MemberName 10(PS_OUTPUT) 0 "Color" Name 12 "@main_in_spv(" Name 15 "psout" - Name 26 "Color" + Name 26 "@entryPointOutput.Color" Name 29 "$Global" MemberName 29($Global) 0 "also_not_the_entry_point" Name 31 "" - Decorate 26(Color) Location 0 + Decorate 26(@entryPointOutput.Color) Location 0 MemberDecorate 29($Global) 0 Offset 0 Decorate 29($Global) Block Decorate 31 DescriptorSet 0 @@ -108,7 +108,7 @@ gl_FragCoord origin is upper left 19: 9(fvec4) ConstantComposite 18 18 18 18 20: TypePointer Function 9(fvec4) 25: TypePointer Output 9(fvec4) - 26(Color): 25(ptr) Variable Output +26(@entryPointOutput.Color): 25(ptr) Variable Output 29($Global): TypeStruct 16(int) 30: TypePointer Uniform 29($Global) 31: 30(ptr) Variable Uniform @@ -116,7 +116,7 @@ gl_FragCoord origin is upper left 5: Label 27:10(PS_OUTPUT) FunctionCall 12(@main_in_spv() 28: 9(fvec4) CompositeExtract 27 0 - Store 26(Color) 28 + Store 26(@entryPointOutput.Color) 28 Return FunctionEnd 6(not_the_entry_point(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.flatten.return.frag.out b/Test/baseResults/hlsl.flatten.return.frag.out index ee2c3f03..fd344c90 100644 --- a/Test/baseResults/hlsl.flatten.return.frag.out +++ b/Test/baseResults/hlsl.flatten.return.frag.out @@ -27,34 +27,34 @@ gl_FragCoord origin is upper left 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Function Call: @main( ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:16 color: direct index for structure ( temp 4-component vector of float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member1' (layout( location=1) out float) +0:? '@entryPointOutput.other_struct_member1' (layout( location=1) out float) 0:16 other_struct_member1: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 1 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member2' (layout( location=2) out float) +0:? '@entryPointOutput.other_struct_member2' (layout( location=2) out float) 0:16 other_struct_member2: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 2 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member3' (layout( location=3) out float) +0:? '@entryPointOutput.other_struct_member3' (layout( location=3) out float) 0:16 other_struct_member3: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 3 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) -0:? 'other_struct_member1' (layout( location=1) out float) -0:? 'other_struct_member2' (layout( location=2) out float) -0:? 'other_struct_member3' (layout( location=3) out float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.other_struct_member1' (layout( location=1) out float) +0:? '@entryPointOutput.other_struct_member2' (layout( location=2) out float) +0:? '@entryPointOutput.other_struct_member3' (layout( location=3) out float) Linked fragment stage: @@ -88,34 +88,34 @@ gl_FragCoord origin is upper left 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Function Call: @main( ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:16 color: direct index for structure ( temp 4-component vector of float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member1' (layout( location=1) out float) +0:? '@entryPointOutput.other_struct_member1' (layout( location=1) out float) 0:16 other_struct_member1: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 1 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member2' (layout( location=2) out float) +0:? '@entryPointOutput.other_struct_member2' (layout( location=2) out float) 0:16 other_struct_member2: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 2 (const int) 0:16 move second child to first child ( temp float) -0:? 'other_struct_member3' (layout( location=3) out float) +0:? '@entryPointOutput.other_struct_member3' (layout( location=3) out float) 0:16 other_struct_member3: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float color, temp float other_struct_member1, temp float other_struct_member2, temp float other_struct_member3}) 0:16 Constant: 0:16 3 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) -0:? 'other_struct_member1' (layout( location=1) out float) -0:? 'other_struct_member2' (layout( location=2) out float) -0:? 'other_struct_member3' (layout( location=3) out float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.other_struct_member1' (layout( location=1) out float) +0:? '@entryPointOutput.other_struct_member2' (layout( location=2) out float) +0:? '@entryPointOutput.other_struct_member3' (layout( location=3) out float) // Module Version 10000 // Generated by (magic number): 80001 @@ -136,14 +136,14 @@ gl_FragCoord origin is upper left Name 10 "Func1(" Name 12 "@main(" Name 26 "flattenTemp" - Name 29 "color" - Name 36 "other_struct_member1" - Name 41 "other_struct_member2" - Name 45 "other_struct_member3" - Decorate 29(color) Location 0 - Decorate 36(other_struct_member1) Location 1 - Decorate 41(other_struct_member2) Location 2 - Decorate 45(other_struct_member3) Location 3 + Name 29 "@entryPointOutput.color" + Name 36 "@entryPointOutput.other_struct_member1" + Name 41 "@entryPointOutput.other_struct_member2" + Name 45 "@entryPointOutput.other_struct_member3" + Decorate 29(@entryPointOutput.color) Location 0 + Decorate 36(@entryPointOutput.other_struct_member1) Location 1 + Decorate 41(@entryPointOutput.other_struct_member2) Location 2 + Decorate 45(@entryPointOutput.other_struct_member3) Location 3 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -158,17 +158,17 @@ gl_FragCoord origin is upper left 19:8(PS_OUTPUT) ConstantComposite 15 16 17 18 25: TypePointer Function 8(PS_OUTPUT) 28: TypePointer Output 7(fvec4) - 29(color): 28(ptr) Variable Output +29(@entryPointOutput.color): 28(ptr) Variable Output 30: TypeInt 32 1 31: 30(int) Constant 0 32: TypePointer Function 7(fvec4) 35: TypePointer Output 6(float) -36(other_struct_member1): 35(ptr) Variable Output +36(@entryPointOutput.other_struct_member1): 35(ptr) Variable Output 37: 30(int) Constant 1 38: TypePointer Function 6(float) -41(other_struct_member2): 35(ptr) Variable Output +41(@entryPointOutput.other_struct_member2): 35(ptr) Variable Output 42: 30(int) Constant 2 -45(other_struct_member3): 35(ptr) Variable Output +45(@entryPointOutput.other_struct_member3): 35(ptr) Variable Output 46: 30(int) Constant 3 4(main): 2 Function None 3 5: Label @@ -177,16 +177,16 @@ gl_FragCoord origin is upper left Store 26(flattenTemp) 27 33: 32(ptr) AccessChain 26(flattenTemp) 31 34: 7(fvec4) Load 33 - Store 29(color) 34 + Store 29(@entryPointOutput.color) 34 39: 38(ptr) AccessChain 26(flattenTemp) 37 40: 6(float) Load 39 - Store 36(other_struct_member1) 40 + Store 36(@entryPointOutput.other_struct_member1) 40 43: 38(ptr) AccessChain 26(flattenTemp) 42 44: 6(float) Load 43 - Store 41(other_struct_member2) 44 + Store 41(@entryPointOutput.other_struct_member2) 44 47: 38(ptr) AccessChain 26(flattenTemp) 46 48: 6(float) Load 47 - Store 45(other_struct_member3) 48 + Store 45(@entryPointOutput.other_struct_member3) 48 Return FunctionEnd 10(Func1():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.flattenOpaque.frag.out b/Test/baseResults/hlsl.flattenOpaque.frag.out index 90b28c4d..aa721248 100755 --- a/Test/baseResults/hlsl.flattenOpaque.frag.out +++ b/Test/baseResults/hlsl.flattenOpaque.frag.out @@ -4,51 +4,51 @@ gl_FragCoord origin is upper left 0:? Sequence 0:15 Function Definition: osCall1(struct-os-p11; ( temp 4-component vector of float) 0:15 Function Parameters: -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:? Sequence 0:16 Branch: Return with expression 0:16 texture ( temp 4-component vector of float) 0:16 Construct combined texture-sampler ( temp sampler2D) 0:16 'tex' ( uniform texture2D) -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:20 Function Definition: osCall2(struct-os-p11;vf2; ( temp 4-component vector of float) 0:20 Function Parameters: -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:20 'f2' ( in 2-component vector of float) 0:? Sequence 0:21 Branch: Return with expression 0:21 texture ( temp 4-component vector of float) 0:21 Construct combined texture-sampler ( temp sampler2D) 0:21 'tex' ( uniform texture2D) -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:21 'f2' ( in 2-component vector of float) 0:25 Function Definition: os2Call1(struct-os2-p1-t211; ( temp 4-component vector of float) 0:25 Function Parameters: -0:? 's2D' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 's.s2D' ( in sampler) +0:? 's.tex' ( in texture2D) 0:? Sequence 0:26 Branch: Return with expression 0:26 texture ( temp 4-component vector of float) 0:26 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 's2D' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.s2D' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:30 Function Definition: os2Call2(struct-os2-p1-t211;vf2; ( temp 4-component vector of float) 0:30 Function Parameters: -0:? 's2D' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 's.s2D' ( in sampler) +0:? 's.tex' ( in texture2D) 0:30 'f2' ( in 2-component vector of float) 0:? Sequence 0:31 Branch: Return with expression 0:31 texture ( temp 4-component vector of float) 0:31 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 's2D' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.s2D' ( in sampler) 0:31 'f2' ( in 2-component vector of float) 0:35 Function Definition: @main( ( temp 4-component vector of float) 0:35 Function Parameters: @@ -58,18 +58,18 @@ gl_FragCoord origin is upper left 0:37 add ( temp 4-component vector of float) 0:36 add ( temp 4-component vector of float) 0:36 Function Call: osCall1(struct-os-p11; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) +0:? 's.s2D' ( uniform sampler) 0:37 Function Call: osCall2(struct-os-p11;vf2; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) +0:? 's.s2D' ( uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:38 Function Call: os2Call1(struct-os2-p1-t211; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:39 Function Call: os2Call2(struct-os2-p1-t211;vf2; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -81,9 +81,9 @@ gl_FragCoord origin is upper left 0:35 Function Call: @main( ( temp 4-component vector of float) 0:? Linker Objects 0:? 'tex' ( uniform texture2D) -0:? 's2D' ( uniform sampler) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's.s2D' ( uniform sampler) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) @@ -95,51 +95,51 @@ gl_FragCoord origin is upper left 0:? Sequence 0:15 Function Definition: osCall1(struct-os-p11; ( temp 4-component vector of float) 0:15 Function Parameters: -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:? Sequence 0:16 Branch: Return with expression 0:16 texture ( temp 4-component vector of float) 0:16 Construct combined texture-sampler ( temp sampler2D) 0:16 'tex' ( uniform texture2D) -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:20 Function Definition: osCall2(struct-os-p11;vf2; ( temp 4-component vector of float) 0:20 Function Parameters: -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:20 'f2' ( in 2-component vector of float) 0:? Sequence 0:21 Branch: Return with expression 0:21 texture ( temp 4-component vector of float) 0:21 Construct combined texture-sampler ( temp sampler2D) 0:21 'tex' ( uniform texture2D) -0:? 's2D' ( in sampler) +0:? 's.s2D' ( in sampler) 0:21 'f2' ( in 2-component vector of float) 0:25 Function Definition: os2Call1(struct-os2-p1-t211; ( temp 4-component vector of float) 0:25 Function Parameters: -0:? 's2D' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 's.s2D' ( in sampler) +0:? 's.tex' ( in texture2D) 0:? Sequence 0:26 Branch: Return with expression 0:26 texture ( temp 4-component vector of float) 0:26 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 's2D' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.s2D' ( in sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:30 Function Definition: os2Call2(struct-os2-p1-t211;vf2; ( temp 4-component vector of float) 0:30 Function Parameters: -0:? 's2D' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 's.s2D' ( in sampler) +0:? 's.tex' ( in texture2D) 0:30 'f2' ( in 2-component vector of float) 0:? Sequence 0:31 Branch: Return with expression 0:31 texture ( temp 4-component vector of float) 0:31 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 's2D' ( in sampler) +0:? 's.tex' ( in texture2D) +0:? 's.s2D' ( in sampler) 0:31 'f2' ( in 2-component vector of float) 0:35 Function Definition: @main( ( temp 4-component vector of float) 0:35 Function Parameters: @@ -149,18 +149,18 @@ gl_FragCoord origin is upper left 0:37 add ( temp 4-component vector of float) 0:36 add ( temp 4-component vector of float) 0:36 Function Call: osCall1(struct-os-p11; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) +0:? 's.s2D' ( uniform sampler) 0:37 Function Call: osCall2(struct-os-p11;vf2; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) +0:? 's.s2D' ( uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 0:38 Function Call: os2Call1(struct-os2-p1-t211; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:39 Function Call: os2Call2(struct-os2-p1-t211;vf2; ( temp 4-component vector of float) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -172,9 +172,9 @@ gl_FragCoord origin is upper left 0:35 Function Call: @main( ( temp 4-component vector of float) 0:? Linker Objects 0:? 'tex' ( uniform texture2D) -0:? 's2D' ( uniform sampler) -0:? 's2D' ( uniform sampler) -0:? 'tex' ( uniform texture2D) +0:? 's.s2D' ( uniform sampler) +0:? 's2.s2D' ( uniform sampler) +0:? 's2.tex' ( uniform texture2D) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) // Module Version 10000 @@ -189,29 +189,29 @@ gl_FragCoord origin is upper left Source HLSL 500 Name 4 "main" Name 12 "osCall1(struct-os-p11;" - Name 11 "s2D" + Name 11 "s.s2D" Name 19 "osCall2(struct-os-p11;vf2;" - Name 17 "s2D" + Name 17 "s.s2D" Name 18 "f2" Name 26 "os2Call1(struct-os2-p1-t211;" - Name 24 "s2D" - Name 25 "tex" + Name 24 "s.s2D" + Name 25 "s.tex" Name 32 "os2Call2(struct-os2-p1-t211;vf2;" - Name 29 "s2D" - Name 30 "tex" + Name 29 "s.s2D" + Name 30 "s.tex" Name 31 "f2" Name 35 "@main(" Name 37 "tex" - Name 68 "s2D" + Name 68 "s.s2D" Name 70 "param" - Name 73 "s2D" - Name 74 "tex" + Name 73 "s2.s2D" + Name 74 "s2.tex" Name 77 "param" Name 83 "@entryPointOutput" Decorate 37(tex) DescriptorSet 0 - Decorate 68(s2D) DescriptorSet 0 - Decorate 73(s2D) DescriptorSet 0 - Decorate 74(tex) DescriptorSet 0 + Decorate 68(s.s2D) DescriptorSet 0 + Decorate 73(s2.s2D) DescriptorSet 0 + Decorate 74(s2.tex) DescriptorSet 0 Decorate 83(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -233,9 +233,9 @@ gl_FragCoord origin is upper left 42: 8(float) Constant 1045220557 43: 8(float) Constant 1050253722 44: 14(fvec2) ConstantComposite 42 43 - 68(s2D): 7(ptr) Variable UniformConstant - 73(s2D): 7(ptr) Variable UniformConstant - 74(tex): 22(ptr) Variable UniformConstant + 68(s.s2D): 7(ptr) Variable UniformConstant + 73(s2.s2D): 7(ptr) Variable UniformConstant + 74(s2.tex): 22(ptr) Variable UniformConstant 82: TypePointer Output 9(fvec4) 83(@entryPointOutput): 82(ptr) Variable Output 4(main): 2 Function None 3 @@ -245,42 +245,42 @@ gl_FragCoord origin is upper left Return FunctionEnd 12(osCall1(struct-os-p11;): 9(fvec4) Function None 10 - 11(s2D): 7(ptr) FunctionParameter + 11(s.s2D): 7(ptr) FunctionParameter 13: Label 38: 21 Load 37(tex) - 39: 6 Load 11(s2D) + 39: 6 Load 11(s.s2D) 41: 40 SampledImage 38 39 45: 9(fvec4) ImageSampleImplicitLod 41 44 ReturnValue 45 FunctionEnd 19(osCall2(struct-os-p11;vf2;): 9(fvec4) Function None 16 - 17(s2D): 7(ptr) FunctionParameter + 17(s.s2D): 7(ptr) FunctionParameter 18(f2): 15(ptr) FunctionParameter 20: Label 48: 21 Load 37(tex) - 49: 6 Load 17(s2D) + 49: 6 Load 17(s.s2D) 50: 40 SampledImage 48 49 51: 14(fvec2) Load 18(f2) 52: 9(fvec4) ImageSampleImplicitLod 50 51 ReturnValue 52 FunctionEnd 26(os2Call1(struct-os2-p1-t211;): 9(fvec4) Function None 23 - 24(s2D): 7(ptr) FunctionParameter - 25(tex): 22(ptr) FunctionParameter + 24(s.s2D): 7(ptr) FunctionParameter + 25(s.tex): 22(ptr) FunctionParameter 27: Label - 55: 21 Load 25(tex) - 56: 6 Load 24(s2D) + 55: 21 Load 25(s.tex) + 56: 6 Load 24(s.s2D) 57: 40 SampledImage 55 56 58: 9(fvec4) ImageSampleImplicitLod 57 44 ReturnValue 58 FunctionEnd 32(os2Call2(struct-os2-p1-t211;vf2;): 9(fvec4) Function None 28 - 29(s2D): 7(ptr) FunctionParameter - 30(tex): 22(ptr) FunctionParameter + 29(s.s2D): 7(ptr) FunctionParameter + 30(s.tex): 22(ptr) FunctionParameter 31(f2): 15(ptr) FunctionParameter 33: Label - 61: 21 Load 30(tex) - 62: 6 Load 29(s2D) + 61: 21 Load 30(s.tex) + 62: 6 Load 29(s.s2D) 63: 40 SampledImage 61 62 64: 14(fvec2) Load 31(f2) 65: 9(fvec4) ImageSampleImplicitLod 63 64 @@ -290,14 +290,14 @@ gl_FragCoord origin is upper left 36: Label 70(param): 15(ptr) Variable Function 77(param): 15(ptr) Variable Function - 69: 9(fvec4) FunctionCall 12(osCall1(struct-os-p11;) 68(s2D) + 69: 9(fvec4) FunctionCall 12(osCall1(struct-os-p11;) 68(s.s2D) Store 70(param) 44 - 71: 9(fvec4) FunctionCall 19(osCall2(struct-os-p11;vf2;) 68(s2D) 70(param) + 71: 9(fvec4) FunctionCall 19(osCall2(struct-os-p11;vf2;) 68(s.s2D) 70(param) 72: 9(fvec4) FAdd 69 71 - 75: 9(fvec4) FunctionCall 26(os2Call1(struct-os2-p1-t211;) 73(s2D) 74(tex) + 75: 9(fvec4) FunctionCall 26(os2Call1(struct-os2-p1-t211;) 73(s2.s2D) 74(s2.tex) 76: 9(fvec4) FAdd 72 75 Store 77(param) 44 - 78: 9(fvec4) FunctionCall 32(os2Call2(struct-os2-p1-t211;vf2;) 73(s2D) 74(tex) 77(param) + 78: 9(fvec4) FunctionCall 32(os2Call2(struct-os2-p1-t211;vf2;) 73(s2.s2D) 74(s2.tex) 77(param) 79: 9(fvec4) FAdd 76 78 ReturnValue 79 FunctionEnd diff --git a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseResults/hlsl.flattenOpaqueInit.vert.out index 774260fe..99f6512c 100755 --- a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out +++ b/Test/baseResults/hlsl.flattenOpaqueInit.vert.out @@ -3,14 +3,14 @@ Shader version: 500 0:? Sequence 0:5 Function Definition: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:5 Function Parameters: -0:? 'smpl' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) 0:? Sequence 0:6 Branch: Return with expression 0:6 texture ( temp 4-component vector of float) 0:6 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -40,14 +40,14 @@ Shader version: 500 0:? Sequence 0:5 Function Definition: lookUp(struct-FxaaTex-p1-t211; ( temp 4-component vector of float) 0:5 Function Parameters: -0:? 'smpl' ( in sampler) -0:? 'tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) 0:? Sequence 0:6 Branch: Return with expression 0:6 texture ( temp 4-component vector of float) 0:6 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -80,8 +80,8 @@ Shader version: 500 Source HLSL 500 Name 4 "main" Name 15 "lookUp(struct-FxaaTex-p1-t211;" - Name 13 "smpl" - Name 14 "tex" + Name 13 "tex.smpl" + Name 14 "tex.tex" Name 18 "@main(" Name 32 "g_tInputTexture_sampler" Name 33 "g_tInputTexture" @@ -116,11 +116,11 @@ Shader version: 500 Return FunctionEnd 15(lookUp(struct-FxaaTex-p1-t211;): 11(fvec4) Function None 12 - 13(smpl): 7(ptr) FunctionParameter - 14(tex): 10(ptr) FunctionParameter + 13(tex.smpl): 7(ptr) FunctionParameter + 14(tex.tex): 10(ptr) FunctionParameter 16: Label - 20: 9 Load 14(tex) - 21: 6 Load 13(smpl) + 20: 9 Load 14(tex.tex) + 21: 6 Load 13(tex.smpl) 23: 22 SampledImage 20 21 29: 11(fvec4) ImageSampleExplicitLod 23 27 Lod 28 ReturnValue 29 diff --git a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out index 3deaddd8..1dbc3c35 100755 --- a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out +++ b/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out @@ -3,32 +3,32 @@ Shader version: 500 0:? Sequence 0:5 Function Definition: lookUp(struct-FxaaTex-p1-t21-f11; ( temp 4-component vector of float) 0:5 Function Parameters: -0:? 'smpl' ( in sampler) -0:? 'tex' ( in texture2D) -0:? 'f' ( in float) +0:? 'tex.smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.f' ( in float) 0:? Sequence 0:6 Branch: Return with expression 0:6 texture ( temp 4-component vector of float) 0:6 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) 0:? Construct vec2 ( temp 2-component vector of float) -0:? 'f' ( in float) -0:? 'f' ( in float) +0:? 'tex.f' ( in float) +0:? 'tex.f' ( in float) 0:10 Function Definition: @main( ( temp 4-component vector of float) 0:10 Function Parameters: 0:? Sequence 0:11 Sequence 0:? Sequence 0:11 move second child to first child ( temp float) -0:? 'f' ( temp float) +0:? 'tex.f' ( temp float) 0:11 Constant: 0:11 0.500000 0:12 Branch: Return with expression 0:12 Function Call: lookUp(struct-FxaaTex-p1-t21-f11; ( temp 4-component vector of float) 0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture' ( uniform texture2D) -0:? 'f' ( temp float) +0:? 'tex.f' ( temp float) 0:10 Function Definition: main( ( temp void) 0:10 Function Parameters: 0:? Sequence @@ -48,32 +48,32 @@ Shader version: 500 0:? Sequence 0:5 Function Definition: lookUp(struct-FxaaTex-p1-t21-f11; ( temp 4-component vector of float) 0:5 Function Parameters: -0:? 'smpl' ( in sampler) -0:? 'tex' ( in texture2D) -0:? 'f' ( in float) +0:? 'tex.smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.f' ( in float) 0:? Sequence 0:6 Branch: Return with expression 0:6 texture ( temp 4-component vector of float) 0:6 Construct combined texture-sampler ( temp sampler2D) -0:? 'tex' ( in texture2D) -0:? 'smpl' ( in sampler) +0:? 'tex.tex' ( in texture2D) +0:? 'tex.smpl' ( in sampler) 0:? Construct vec2 ( temp 2-component vector of float) -0:? 'f' ( in float) -0:? 'f' ( in float) +0:? 'tex.f' ( in float) +0:? 'tex.f' ( in float) 0:10 Function Definition: @main( ( temp 4-component vector of float) 0:10 Function Parameters: 0:? Sequence 0:11 Sequence 0:? Sequence 0:11 move second child to first child ( temp float) -0:? 'f' ( temp float) +0:? 'tex.f' ( temp float) 0:11 Constant: 0:11 0.500000 0:12 Branch: Return with expression 0:12 Function Call: lookUp(struct-FxaaTex-p1-t21-f11; ( temp 4-component vector of float) 0:? 'g_tInputTexture_sampler' ( uniform sampler) 0:? 'g_tInputTexture' ( uniform texture2D) -0:? 'f' ( temp float) +0:? 'tex.f' ( temp float) 0:10 Function Definition: main( ( temp void) 0:10 Function Parameters: 0:? Sequence @@ -96,11 +96,11 @@ Shader version: 500 Source HLSL 500 Name 4 "main" Name 17 "lookUp(struct-FxaaTex-p1-t21-f11;" - Name 14 "smpl" - Name 15 "tex" - Name 16 "f" + Name 14 "tex.smpl" + Name 15 "tex.tex" + Name 16 "tex.f" Name 20 "@main(" - Name 34 "f" + Name 34 "tex.f" Name 36 "g_tInputTexture_sampler" Name 37 "g_tInputTexture" Name 38 "param" @@ -134,25 +134,25 @@ Shader version: 500 Return FunctionEnd 17(lookUp(struct-FxaaTex-p1-t21-f11;): 12(fvec4) Function None 13 - 14(smpl): 7(ptr) FunctionParameter - 15(tex): 10(ptr) FunctionParameter - 16(f): 11(ptr) FunctionParameter + 14(tex.smpl): 7(ptr) FunctionParameter + 15(tex.tex): 10(ptr) FunctionParameter + 16(tex.f): 11(ptr) FunctionParameter 18: Label - 22: 9 Load 15(tex) - 23: 6 Load 14(smpl) + 22: 9 Load 15(tex.tex) + 23: 6 Load 14(tex.smpl) 25: 24 SampledImage 22 23 - 26: 8(float) Load 16(f) - 27: 8(float) Load 16(f) + 26: 8(float) Load 16(tex.f) + 27: 8(float) Load 16(tex.f) 29: 28(fvec2) CompositeConstruct 26 27 31: 12(fvec4) ImageSampleExplicitLod 25 29 Lod 30 ReturnValue 31 FunctionEnd 20(@main(): 12(fvec4) Function None 19 21: Label - 34(f): 11(ptr) Variable Function + 34(tex.f): 11(ptr) Variable Function 38(param): 11(ptr) Variable Function - Store 34(f) 35 - 39: 8(float) Load 34(f) + Store 34(tex.f) 35 + 39: 8(float) Load 34(tex.f) Store 38(param) 39 40: 12(fvec4) FunctionCall 17(lookUp(struct-FxaaTex-p1-t21-f11;) 36(g_tInputTexture_sampler) 37(g_tInputTexture) 38(param) ReturnValue 40 diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index 1cb5b8c6..1f5164ce 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -101,13 +101,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -124,8 +124,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -233,13 +233,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -256,8 +256,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -291,8 +291,8 @@ gl_FragCoord origin is upper left Name 84 "g_tTexcdu4a" Name 95 "psout" Name 104 "flattenTemp" - Name 107 "Color" - Name 111 "@entryPointOutput_Depth" + Name 107 "@entryPointOutput.Color" + Name 111 "@entryPointOutput.Depth" Name 116 "g_tTex1df4a" Name 117 "g_tTex1df4" Name 120 "g_tTex1di4a" @@ -305,8 +305,8 @@ gl_FragCoord origin is upper left Decorate 64(g_tTexcdf4a) DescriptorSet 0 Decorate 74(g_tTexcdi4a) DescriptorSet 0 Decorate 84(g_tTexcdu4a) DescriptorSet 0 - Decorate 107(Color) Location 0 - Decorate 111(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 107(@entryPointOutput.Color) Location 0 + Decorate 111(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 116(g_tTex1df4a) DescriptorSet 0 Decorate 116(g_tTex1df4a) Binding 1 Decorate 117(g_tTex1df4) DescriptorSet 0 @@ -376,9 +376,9 @@ gl_FragCoord origin is upper left 98: 29(int) Constant 1 99: TypePointer Function 6(float) 106: TypePointer Output 7(fvec4) - 107(Color): 106(ptr) Variable Output +107(@entryPointOutput.Color): 106(ptr) Variable Output 110: TypePointer Output 6(float) -111(@entryPointOutput_Depth): 110(ptr) Variable Output +111(@entryPointOutput.Depth): 110(ptr) Variable Output 114: TypeImage 6(float) 1D array sampled format:Unknown 115: TypePointer UniformConstant 114 116(g_tTex1df4a): 115(ptr) Variable UniformConstant @@ -396,10 +396,10 @@ gl_FragCoord origin is upper left Store 104(flattenTemp) 105 108: 12(ptr) AccessChain 104(flattenTemp) 30 109: 7(fvec4) Load 108 - Store 107(Color) 109 + Store 107(@entryPointOutput.Color) 109 112: 99(ptr) AccessChain 104(flattenTemp) 98 113: 6(float) Load 112 - Store 111(@entryPointOutput_Depth) 113 + Store 111(@entryPointOutput.Depth) 113 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index e1afa0be..73bd6e12 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -95,13 +95,13 @@ gl_FragCoord origin is upper left 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:29 Color: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -122,8 +122,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -225,13 +225,13 @@ gl_FragCoord origin is upper left 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:29 Color: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -252,8 +252,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -286,8 +286,8 @@ gl_FragCoord origin is upper left Name 84 "g_tTexcdu4" Name 95 "psout" Name 105 "flattenTemp" - Name 108 "Color" - Name 112 "@entryPointOutput_Depth" + Name 108 "@entryPointOutput.Color" + Name 112 "@entryPointOutput.Depth" Name 115 "g_sSamp2d" Name 118 "g_tTex1df4a" Name 119 "g_tTex1df4" @@ -304,8 +304,8 @@ gl_FragCoord origin is upper left Decorate 63(g_tTexcdf4) DescriptorSet 0 Decorate 74(g_tTexcdi4) DescriptorSet 0 Decorate 84(g_tTexcdu4) DescriptorSet 0 - Decorate 108(Color) Location 0 - Decorate 112(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 108(@entryPointOutput.Color) Location 0 + Decorate 112(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 115(g_sSamp2d) DescriptorSet 0 Decorate 118(g_tTex1df4a) DescriptorSet 0 Decorate 118(g_tTex1df4a) Binding 1 @@ -380,9 +380,9 @@ gl_FragCoord origin is upper left 99: 28(int) Constant 1 100: TypePointer Function 6(float) 107: TypePointer Output 7(fvec4) - 108(Color): 107(ptr) Variable Output +108(@entryPointOutput.Color): 107(ptr) Variable Output 111: TypePointer Output 6(float) -112(@entryPointOutput_Depth): 111(ptr) Variable Output +112(@entryPointOutput.Depth): 111(ptr) Variable Output 115(g_sSamp2d): 19(ptr) Variable UniformConstant 116: TypeImage 6(float) 1D sampled format:Unknown 117: TypePointer UniformConstant 116 @@ -410,10 +410,10 @@ gl_FragCoord origin is upper left Store 105(flattenTemp) 106 109: 12(ptr) AccessChain 105(flattenTemp) 29 110: 7(fvec4) Load 109 - Store 108(Color) 110 + Store 108(@entryPointOutput.Color) 110 113: 100(ptr) AccessChain 105(flattenTemp) 99 114: 6(float) Load 113 - Store 112(@entryPointOutput_Depth) 114 + Store 112(@entryPointOutput.Depth) 114 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 34d5daf3..51154ca9 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -84,7 +84,7 @@ Shader version: 500 0:? Sequence 0:28 Sequence 0:28 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:28 Pos: direct index for structure ( temp 4-component vector of float) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:28 Constant: @@ -105,7 +105,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) Linked vertex stage: @@ -196,7 +196,7 @@ Shader version: 500 0:? Sequence 0:28 Sequence 0:28 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:28 Pos: direct index for structure ( temp 4-component vector of float) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:28 Constant: @@ -217,7 +217,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -247,7 +247,7 @@ Shader version: 500 Name 81 "txval42" Name 84 "g_tTexcdu4" Name 95 "vsout" - Name 103 "@entryPointOutput_Pos" + Name 103 "@entryPointOutput.Pos" Name 106 "g_sSamp2d" Name 109 "g_tTex1df4a" Name 110 "g_tTex1df4" @@ -264,7 +264,7 @@ Shader version: 500 Decorate 63(g_tTexcdf4) DescriptorSet 0 Decorate 74(g_tTexcdi4) DescriptorSet 0 Decorate 84(g_tTexcdu4) DescriptorSet 0 - Decorate 103(@entryPointOutput_Pos) BuiltIn Position + Decorate 103(@entryPointOutput.Pos) BuiltIn Position Decorate 106(g_sSamp2d) DescriptorSet 0 Decorate 109(g_tTex1df4a) DescriptorSet 0 Decorate 109(g_tTex1df4a) Binding 1 @@ -337,7 +337,7 @@ Shader version: 500 96: 6(float) Constant 0 97: 7(fvec4) ConstantComposite 96 96 96 96 102: TypePointer Output 7(fvec4) -103(@entryPointOutput_Pos): 102(ptr) Variable Output +103(@entryPointOutput.Pos): 102(ptr) Variable Output 106(g_sSamp2d): 19(ptr) Variable UniformConstant 107: TypeImage 6(float) 1D sampled format:Unknown 108: TypePointer UniformConstant 107 @@ -362,7 +362,7 @@ Shader version: 500 5: Label 104:8(VS_OUTPUT) FunctionCall 10(@main() 105: 7(fvec4) CompositeExtract 104 0 - Store 103(@entryPointOutput_Pos) 105 + Store 103(@entryPointOutput.Pos) 105 Return FunctionEnd 10(@main():8(VS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index fb813a7e..1e633e88 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -71,13 +71,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -97,8 +97,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -176,13 +176,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -202,8 +202,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -230,8 +230,8 @@ gl_FragCoord origin is upper left Name 55 "g_tTex2du4" Name 67 "psout" Name 76 "flattenTemp" - Name 79 "Color" - Name 83 "@entryPointOutput_Depth" + Name 79 "@entryPointOutput.Color" + Name 83 "@entryPointOutput.Depth" Name 88 "g_tTex1df4a" Name 89 "g_tTex1df4" Name 92 "g_tTex1di4" @@ -247,8 +247,8 @@ gl_FragCoord origin is upper left Decorate 20(g_sSamp) Binding 0 Decorate 39(g_tTex2di4) DescriptorSet 0 Decorate 55(g_tTex2du4) DescriptorSet 0 - Decorate 79(Color) Location 0 - Decorate 83(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 79(@entryPointOutput.Color) Location 0 + Decorate 83(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 88(g_tTex1df4a) DescriptorSet 0 Decorate 88(g_tTex1df4a) Binding 1 Decorate 89(g_tTex1df4) DescriptorSet 0 @@ -311,9 +311,9 @@ gl_FragCoord origin is upper left 69: 7(fvec4) ConstantComposite 68 68 68 68 71: TypePointer Function 6(float) 78: TypePointer Output 7(fvec4) - 79(Color): 78(ptr) Variable Output +79(@entryPointOutput.Color): 78(ptr) Variable Output 82: TypePointer Output 6(float) -83(@entryPointOutput_Depth): 82(ptr) Variable Output +83(@entryPointOutput.Depth): 82(ptr) Variable Output 86: TypeImage 6(float) 1D sampled format:Unknown 87: TypePointer UniformConstant 86 88(g_tTex1df4a): 87(ptr) Variable UniformConstant @@ -349,10 +349,10 @@ gl_FragCoord origin is upper left Store 76(flattenTemp) 77 80: 12(ptr) AccessChain 76(flattenTemp) 31 81: 7(fvec4) Load 80 - Store 79(Color) 81 + Store 79(@entryPointOutput.Color) 81 84: 71(ptr) AccessChain 76(flattenTemp) 30 85: 6(float) Load 84 - Store 83(@entryPointOutput_Depth) 85 + Store 83(@entryPointOutput.Depth) 85 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 6f4703f2..85ea585a 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -74,13 +74,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -94,8 +94,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -176,13 +176,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -196,8 +196,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -224,8 +224,8 @@ gl_FragCoord origin is upper left Name 55 "g_tTex2du4" Name 68 "psout" Name 77 "flattenTemp" - Name 80 "Color" - Name 84 "@entryPointOutput_Depth" + Name 80 "@entryPointOutput.Color" + Name 84 "@entryPointOutput.Depth" Name 89 "g_tTex1df4a" Name 90 "g_tTex1df4" Name 93 "g_tTex1di4" @@ -235,8 +235,8 @@ gl_FragCoord origin is upper left Decorate 20(g_sSamp) Binding 0 Decorate 40(g_tTex2di4) DescriptorSet 0 Decorate 55(g_tTex2du4) DescriptorSet 0 - Decorate 80(Color) Location 0 - Decorate 84(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 80(@entryPointOutput.Color) Location 0 + Decorate 84(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 89(g_tTex1df4a) DescriptorSet 0 Decorate 89(g_tTex1df4a) Binding 1 Decorate 90(g_tTex1df4) DescriptorSet 0 @@ -294,9 +294,9 @@ gl_FragCoord origin is upper left 70: 7(fvec4) ConstantComposite 69 69 69 69 72: TypePointer Function 6(float) 79: TypePointer Output 7(fvec4) - 80(Color): 79(ptr) Variable Output +80(@entryPointOutput.Color): 79(ptr) Variable Output 83: TypePointer Output 6(float) -84(@entryPointOutput_Depth): 83(ptr) Variable Output +84(@entryPointOutput.Depth): 83(ptr) Variable Output 87: TypeImage 6(float) 1D array sampled format:Unknown 88: TypePointer UniformConstant 87 89(g_tTex1df4a): 88(ptr) Variable UniformConstant @@ -314,10 +314,10 @@ gl_FragCoord origin is upper left Store 77(flattenTemp) 78 81: 12(ptr) AccessChain 77(flattenTemp) 32 82: 7(fvec4) Load 81 - Store 80(Color) 82 + Store 80(@entryPointOutput.Color) 82 85: 72(ptr) AccessChain 77(flattenTemp) 31 86: 6(float) Load 85 - Store 84(@entryPointOutput_Depth) 86 + Store 84(@entryPointOutput.Depth) 86 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index 0a7aac9f..d80e59d9 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -344,13 +344,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -368,8 +368,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -720,13 +720,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -744,8 +744,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -803,8 +803,8 @@ gl_FragCoord origin is upper left Name 218 "txval72" Name 226 "psout" Name 235 "flattenTemp" - Name 238 "Color" - Name 242 "@entryPointOutput_Depth" + Name 238 "@entryPointOutput.Color" + Name 242 "@entryPointOutput.Depth" Name 245 "g_sSamp2d" Name 248 "g_tTex1df4a" Name 251 "g_tTex1di4a" @@ -823,8 +823,8 @@ gl_FragCoord origin is upper left Decorate 131(g_tTexcdf4a) DescriptorSet 0 Decorate 143(g_tTexcdi4a) DescriptorSet 0 Decorate 154(g_tTexcdu4a) DescriptorSet 0 - Decorate 238(Color) Location 0 - Decorate 242(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 238(@entryPointOutput.Color) Location 0 + Decorate 242(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 245(g_sSamp2d) DescriptorSet 0 Decorate 248(g_tTex1df4a) DescriptorSet 0 Decorate 248(g_tTex1df4a) Binding 0 @@ -886,9 +886,9 @@ gl_FragCoord origin is upper left 228: 7(fvec4) ConstantComposite 227 227 227 227 230: TypePointer Function 6(float) 237: TypePointer Output 7(fvec4) - 238(Color): 237(ptr) Variable Output +238(@entryPointOutput.Color): 237(ptr) Variable Output 241: TypePointer Output 6(float) -242(@entryPointOutput_Depth): 241(ptr) Variable Output +242(@entryPointOutput.Depth): 241(ptr) Variable Output 245(g_sSamp2d): 19(ptr) Variable UniformConstant 246: TypeImage 6(float) 1D array sampled format:Unknown 247: TypePointer UniformConstant 246 @@ -906,10 +906,10 @@ gl_FragCoord origin is upper left Store 235(flattenTemp) 236 239: 12(ptr) AccessChain 235(flattenTemp) 34 240: 7(fvec4) Load 239 - Store 238(Color) 240 + Store 238(@entryPointOutput.Color) 240 243: 230(ptr) AccessChain 235(flattenTemp) 69 244: 6(float) Load 243 - Store 242(@entryPointOutput_Depth) 244 + Store 242(@entryPointOutput.Depth) 244 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index d2cb9c22..ab1d45ba 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -344,13 +344,13 @@ gl_FragCoord origin is upper left 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:34 Color: direct index for structure ( temp 4-component vector of float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: 0:34 0 (const int) 0:34 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:34 Depth: direct index for structure ( temp float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: @@ -372,8 +372,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -724,13 +724,13 @@ gl_FragCoord origin is upper left 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:34 Color: direct index for structure ( temp 4-component vector of float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: 0:34 0 (const int) 0:34 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:34 Depth: direct index for structure ( temp float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: @@ -752,8 +752,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -810,8 +810,8 @@ gl_FragCoord origin is upper left Name 218 "txval72" Name 226 "psout" Name 235 "flattenTemp" - Name 238 "Color" - Name 242 "@entryPointOutput_Depth" + Name 238 "@entryPointOutput.Color" + Name 242 "@entryPointOutput.Depth" Name 245 "g_sSamp2d" Name 248 "g_tTex1df4a" Name 249 "g_tTex1df4" @@ -834,8 +834,8 @@ gl_FragCoord origin is upper left Decorate 131(g_tTexcdf4) DescriptorSet 0 Decorate 143(g_tTexcdi4) DescriptorSet 0 Decorate 154(g_tTexcdu4) DescriptorSet 0 - Decorate 238(Color) Location 0 - Decorate 242(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 238(@entryPointOutput.Color) Location 0 + Decorate 242(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 245(g_sSamp2d) DescriptorSet 0 Decorate 248(g_tTex1df4a) DescriptorSet 0 Decorate 248(g_tTex1df4a) Binding 1 @@ -902,9 +902,9 @@ gl_FragCoord origin is upper left 228: 7(fvec4) ConstantComposite 227 227 227 227 230: TypePointer Function 6(float) 237: TypePointer Output 7(fvec4) - 238(Color): 237(ptr) Variable Output +238(@entryPointOutput.Color): 237(ptr) Variable Output 241: TypePointer Output 6(float) -242(@entryPointOutput_Depth): 241(ptr) Variable Output +242(@entryPointOutput.Depth): 241(ptr) Variable Output 245(g_sSamp2d): 19(ptr) Variable UniformConstant 246: TypeImage 6(float) 1D sampled format:Unknown 247: TypePointer UniformConstant 246 @@ -932,10 +932,10 @@ gl_FragCoord origin is upper left Store 235(flattenTemp) 236 239: 12(ptr) AccessChain 235(flattenTemp) 34 240: 7(fvec4) Load 239 - Store 238(Color) 240 + Store 238(@entryPointOutput.Color) 240 243: 230(ptr) AccessChain 235(flattenTemp) 30 244: 6(float) Load 243 - Store 242(@entryPointOutput_Depth) 244 + Store 242(@entryPointOutput.Depth) 244 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index d9febf9d..8b8a6106 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -596,13 +596,13 @@ gl_FragCoord origin is upper left 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:39 Color: direct index for structure ( temp 4-component vector of float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: 0:39 0 (const int) 0:39 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:39 Depth: direct index for structure ( temp float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: @@ -624,8 +624,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1228,13 +1228,13 @@ gl_FragCoord origin is upper left 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:39 Color: direct index for structure ( temp 4-component vector of float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: 0:39 0 (const int) 0:39 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:39 Depth: direct index for structure ( temp float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: @@ -1256,8 +1256,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1316,8 +1316,8 @@ gl_FragCoord origin is upper left Name 334 "txval324" Name 351 "psout" Name 360 "flattenTemp" - Name 363 "Color" - Name 367 "@entryPointOutput_Depth" + Name 363 "@entryPointOutput.Color" + Name 367 "@entryPointOutput.Depth" Name 370 "g_sSamp2d" Name 373 "g_tTex1df4a" Name 374 "g_tTex1df4" @@ -1344,8 +1344,8 @@ gl_FragCoord origin is upper left Decorate 32 DescriptorSet 0 Decorate 47(g_tTex2di4) DescriptorSet 0 Decorate 63(g_tTex2du4) DescriptorSet 0 - Decorate 363(Color) Location 0 - Decorate 367(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 363(@entryPointOutput.Color) Location 0 + Decorate 367(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 370(g_sSamp2d) DescriptorSet 0 Decorate 373(g_tTex1df4a) DescriptorSet 0 Decorate 373(g_tTex1df4a) Binding 1 @@ -1408,9 +1408,9 @@ gl_FragCoord origin is upper left 353: 7(fvec4) ConstantComposite 352 352 352 352 355: TypePointer Function 6(float) 362: TypePointer Output 7(fvec4) - 363(Color): 362(ptr) Variable Output +363(@entryPointOutput.Color): 362(ptr) Variable Output 366: TypePointer Output 6(float) -367(@entryPointOutput_Depth): 366(ptr) Variable Output +367(@entryPointOutput.Depth): 366(ptr) Variable Output 370(g_sSamp2d): 19(ptr) Variable UniformConstant 371: TypeImage 6(float) 1D sampled format:Unknown 372: TypePointer UniformConstant 371 @@ -1447,10 +1447,10 @@ gl_FragCoord origin is upper left Store 360(flattenTemp) 361 364: 12(ptr) AccessChain 360(flattenTemp) 41 365: 7(fvec4) Load 364 - Store 363(Color) 365 + Store 363(@entryPointOutput.Color) 365 368: 355(ptr) AccessChain 360(flattenTemp) 33 369: 6(float) Load 368 - Store 367(@entryPointOutput_Depth) 369 + Store 367(@entryPointOutput.Depth) 369 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 590b4fcb..f7bd5233 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -596,13 +596,13 @@ gl_FragCoord origin is upper left 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:33 Color: direct index for structure ( temp 4-component vector of float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: 0:33 0 (const int) 0:33 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:33 Depth: direct index for structure ( temp float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: @@ -620,8 +620,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1224,13 +1224,13 @@ gl_FragCoord origin is upper left 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:33 Color: direct index for structure ( temp 4-component vector of float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: 0:33 0 (const int) 0:33 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:33 Depth: direct index for structure ( temp float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: @@ -1248,8 +1248,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1309,8 +1309,8 @@ gl_FragCoord origin is upper left Name 334 "txval324" Name 351 "psout" Name 360 "flattenTemp" - Name 363 "Color" - Name 367 "@entryPointOutput_Depth" + Name 363 "@entryPointOutput.Color" + Name 367 "@entryPointOutput.Depth" Name 370 "g_sSamp2d" Name 373 "g_tTex1df4a" Name 376 "g_tTex1di4a" @@ -1333,8 +1333,8 @@ gl_FragCoord origin is upper left Decorate 32 DescriptorSet 0 Decorate 47(g_tTex2di4a) DescriptorSet 0 Decorate 63(g_tTex2du4a) DescriptorSet 0 - Decorate 363(Color) Location 0 - Decorate 367(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 363(@entryPointOutput.Color) Location 0 + Decorate 367(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 370(g_sSamp2d) DescriptorSet 0 Decorate 373(g_tTex1df4a) DescriptorSet 0 Decorate 373(g_tTex1df4a) Binding 0 @@ -1392,9 +1392,9 @@ gl_FragCoord origin is upper left 353: 7(fvec4) ConstantComposite 352 352 352 352 355: TypePointer Function 6(float) 362: TypePointer Output 7(fvec4) - 363(Color): 362(ptr) Variable Output +363(@entryPointOutput.Color): 362(ptr) Variable Output 366: TypePointer Output 6(float) -367(@entryPointOutput_Depth): 366(ptr) Variable Output +367(@entryPointOutput.Depth): 366(ptr) Variable Output 370(g_sSamp2d): 19(ptr) Variable UniformConstant 371: TypeImage 6(float) 1D array sampled format:Unknown 372: TypePointer UniformConstant 371 @@ -1421,10 +1421,10 @@ gl_FragCoord origin is upper left Store 360(flattenTemp) 361 364: 12(ptr) AccessChain 360(flattenTemp) 41 365: 7(fvec4) Load 364 - Store 363(Color) 365 + Store 363(@entryPointOutput.Color) 365 368: 355(ptr) AccessChain 360(flattenTemp) 131 369: 6(float) Load 368 - Store 367(@entryPointOutput_Depth) 369 + Store 367(@entryPointOutput.Depth) 369 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out index 3f504cde..996e0702 100644 --- a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out @@ -194,13 +194,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -221,8 +221,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -423,13 +423,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -450,8 +450,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -490,8 +490,8 @@ gl_FragCoord origin is upper left Name 112 "txval421" Name 120 "psout" Name 129 "flattenTemp" - Name 132 "Color" - Name 136 "@entryPointOutput_Depth" + Name 132 "@entryPointOutput.Color" + Name 136 "@entryPointOutput.Depth" Name 141 "g_tTex1df4a" Name 142 "g_tTex1df4" Name 145 "g_tTex1di4" @@ -513,8 +513,8 @@ gl_FragCoord origin is upper left Decorate 29 DescriptorSet 0 Decorate 45(g_tTex2di4) DescriptorSet 0 Decorate 62(g_tTex2du4) DescriptorSet 0 - Decorate 132(Color) Location 0 - Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 132(@entryPointOutput.Color) Location 0 + Decorate 136(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 141(g_tTex1df4a) DescriptorSet 0 Decorate 141(g_tTex1df4a) Binding 1 Decorate 142(g_tTex1df4) DescriptorSet 0 @@ -582,9 +582,9 @@ gl_FragCoord origin is upper left 122: 7(fvec4) ConstantComposite 121 121 121 121 124: TypePointer Function 6(float) 131: TypePointer Output 7(fvec4) - 132(Color): 131(ptr) Variable Output +132(@entryPointOutput.Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) -136(@entryPointOutput_Depth): 135(ptr) Variable Output +136(@entryPointOutput.Depth): 135(ptr) Variable Output 139: TypeImage 6(float) 1D sampled format:Unknown 140: TypePointer UniformConstant 139 141(g_tTex1df4a): 140(ptr) Variable UniformConstant @@ -620,10 +620,10 @@ gl_FragCoord origin is upper left Store 129(flattenTemp) 130 133: 12(ptr) AccessChain 129(flattenTemp) 37 134: 7(fvec4) Load 133 - Store 132(Color) 134 + Store 132(@entryPointOutput.Color) 134 137: 124(ptr) AccessChain 129(flattenTemp) 31 138: 6(float) Load 137 - Store 136(@entryPointOutput_Depth) 138 + Store 136(@entryPointOutput.Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index ccfb22a6..ea6c200d 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1112,13 +1112,13 @@ gl_FragCoord origin is upper left 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:46 Color: direct index for structure ( temp 4-component vector of float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: 0:46 0 (const int) 0:46 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:46 Depth: direct index for structure ( temp float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: @@ -1152,8 +1152,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -2272,13 +2272,13 @@ gl_FragCoord origin is upper left 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:46 Color: direct index for structure ( temp 4-component vector of float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: 0:46 0 (const int) 0:46 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:46 Depth: direct index for structure ( temp float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: @@ -2312,8 +2312,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -2417,8 +2417,8 @@ gl_FragCoord origin is upper left Name 514 "g_tTex2dmsu4a" Name 526 "psout" Name 537 "flattenTemp" - Name 540 "Color" - Name 544 "@entryPointOutput_Depth" + Name 540 "@entryPointOutput.Color" + Name 544 "@entryPointOutput.Depth" Name 549 "g_sSamp" Decorate 17(g_tTex1df4) DescriptorSet 0 Decorate 17(g_tTex1df4) Binding 0 @@ -2448,8 +2448,8 @@ gl_FragCoord origin is upper left Decorate 486(g_tTex2dmsf4a) DescriptorSet 0 Decorate 500(g_tTex2dmsi4a) DescriptorSet 0 Decorate 514(g_tTex2dmsu4a) DescriptorSet 0 - Decorate 540(Color) Location 0 - Decorate 544(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 540(@entryPointOutput.Color) Location 0 + Decorate 544(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 549(g_sSamp) DescriptorSet 0 Decorate 549(g_sSamp) Binding 0 2: TypeVoid @@ -2558,9 +2558,9 @@ gl_FragCoord origin is upper left 531: 19(int) Constant 1 532: TypePointer Function 6(float) 539: TypePointer Output 7(fvec4) - 540(Color): 539(ptr) Variable Output +540(@entryPointOutput.Color): 539(ptr) Variable Output 543: TypePointer Output 6(float) -544(@entryPointOutput_Depth): 543(ptr) Variable Output +544(@entryPointOutput.Depth): 543(ptr) Variable Output 547: TypeSampler 548: TypePointer UniformConstant 547 549(g_sSamp): 548(ptr) Variable UniformConstant @@ -2571,10 +2571,10 @@ gl_FragCoord origin is upper left Store 537(flattenTemp) 538 541: 529(ptr) AccessChain 537(flattenTemp) 20 542: 7(fvec4) Load 541 - Store 540(Color) 542 + Store 540(@entryPointOutput.Color) 542 545: 532(ptr) AccessChain 537(flattenTemp) 531 546: 6(float) Load 545 - Store 544(@entryPointOutput_Depth) 546 + Store 544(@entryPointOutput.Depth) 546 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index 7cce4c9d..275cece2 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -45,7 +45,7 @@ Shader version: 500 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:11 Pos: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:11 Constant: @@ -53,7 +53,7 @@ Shader version: 500 0:? Linker Objects 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex1df4' (layout( binding=0) uniform texture1D) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) Linked vertex stage: @@ -105,7 +105,7 @@ Shader version: 500 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:11 Pos: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:11 Constant: @@ -113,7 +113,7 @@ Shader version: 500 0:? Linker Objects 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex1df4' (layout( binding=0) uniform texture1D) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -136,11 +136,11 @@ Shader version: 500 Name 24 "sizeQueryTemp" Name 29 "NumberOfLevelsU" Name 33 "vsout" - Name 42 "@entryPointOutput_Pos" + Name 42 "@entryPointOutput.Pos" Name 47 "g_sSamp" Decorate 17(g_tTex1df4) DescriptorSet 0 Decorate 17(g_tTex1df4) Binding 0 - Decorate 42(@entryPointOutput_Pos) BuiltIn Position + Decorate 42(@entryPointOutput.Pos) BuiltIn Position Decorate 47(g_sSamp) DescriptorSet 0 Decorate 47(g_sSamp) Binding 0 2: TypeVoid @@ -162,7 +162,7 @@ Shader version: 500 35: 7(fvec4) ConstantComposite 34 34 34 34 36: TypePointer Function 7(fvec4) 41: TypePointer Output 7(fvec4) -42(@entryPointOutput_Pos): 41(ptr) Variable Output +42(@entryPointOutput.Pos): 41(ptr) Variable Output 45: TypeSampler 46: TypePointer UniformConstant 45 47(g_sSamp): 46(ptr) Variable UniformConstant @@ -170,7 +170,7 @@ Shader version: 500 5: Label 43:8(VS_OUTPUT) FunctionCall 10(@main() 44: 7(fvec4) CompositeExtract 43 0 - Store 42(@entryPointOutput_Pos) 44 + Store 42(@entryPointOutput.Pos) 44 Return FunctionEnd 10(@main():8(VS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out index c4d5ff9b..beb19092 100644 --- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out @@ -320,13 +320,13 @@ gl_FragCoord origin is upper left 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:44 Color: direct index for structure ( temp 4-component vector of float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: 0:44 0 (const int) 0:44 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:44 Depth: direct index for structure ( temp float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -680,13 +680,13 @@ gl_FragCoord origin is upper left 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:44 Color: direct index for structure ( temp 4-component vector of float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: 0:44 0 (const int) 0:44 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:44 Depth: direct index for structure ( temp float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: @@ -712,8 +712,8 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -775,8 +775,8 @@ gl_FragCoord origin is upper left Name 191 "g_tTex3du4" Name 201 "psout" Name 213 "flattenTemp" - Name 216 "Color" - Name 220 "@entryPointOutput_Depth" + Name 216 "@entryPointOutput.Color" + Name 220 "@entryPointOutput.Depth" Name 225 "g_sSamp" Name 229 "$Global" MemberName 229($Global) 0 "c1" @@ -807,8 +807,8 @@ gl_FragCoord origin is upper left Decorate 166(g_tTex3df4) DescriptorSet 0 Decorate 179(g_tTex3di4) DescriptorSet 0 Decorate 191(g_tTex3du4) DescriptorSet 0 - Decorate 216(Color) Location 0 - Decorate 220(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 216(@entryPointOutput.Color) Location 0 + Decorate 220(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 225(g_sSamp) DescriptorSet 0 Decorate 225(g_sSamp) Binding 0 MemberDecorate 229($Global) 0 Offset 0 @@ -899,9 +899,9 @@ gl_FragCoord origin is upper left 207: 23(int) Constant 1 208: TypePointer Function 6(float) 215: TypePointer Output 7(fvec4) - 216(Color): 215(ptr) Variable Output +216(@entryPointOutput.Color): 215(ptr) Variable Output 219: TypePointer Output 6(float) -220(@entryPointOutput_Depth): 219(ptr) Variable Output +220(@entryPointOutput.Depth): 219(ptr) Variable Output 223: TypeSampler 224: TypePointer UniformConstant 223 225(g_sSamp): 224(ptr) Variable UniformConstant @@ -918,10 +918,10 @@ gl_FragCoord origin is upper left Store 213(flattenTemp) 214 217: 205(ptr) AccessChain 213(flattenTemp) 202 218: 7(fvec4) Load 217 - Store 216(Color) 218 + Store 216(@entryPointOutput.Color) 218 221: 208(ptr) AccessChain 213(flattenTemp) 207 222: 6(float) Load 221 - Store 220(@entryPointOutput_Depth) 222 + Store 220(@entryPointOutput.Depth) 222 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index 5b63a1d8..d45d7316 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -267,13 +267,13 @@ gl_FragCoord origin is upper left 0:13 Function Call: @main(i1; ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:? 'sample' ( temp int) 0:13 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:13 Color: direct index for structure ( temp 4-component vector of float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:13 Depth: direct index for structure ( temp float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: @@ -282,8 +282,8 @@ gl_FragCoord origin is upper left 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex2dmsf4' ( uniform texture2DMS) 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:? 'sample' (layout( location=0) flat in int) @@ -558,13 +558,13 @@ gl_FragCoord origin is upper left 0:13 Function Call: @main(i1; ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:? 'sample' ( temp int) 0:13 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:13 Color: direct index for structure ( temp 4-component vector of float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:13 Depth: direct index for structure ( temp float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: @@ -573,8 +573,8 @@ gl_FragCoord origin is upper left 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex2dmsf4' ( uniform texture2DMS) 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:? 'sample' (layout( location=0) flat in int) // Module Version 10000 @@ -614,15 +614,15 @@ gl_FragCoord origin is upper left Name 204 "sample" Name 206 "flattenTemp" Name 207 "param" - Name 211 "Color" - Name 215 "@entryPointOutput_Depth" + Name 211 "@entryPointOutput.Color" + Name 215 "@entryPointOutput.Depth" Name 220 "g_sSamp" Decorate 23(g_tTex2dmsf4) DescriptorSet 0 Decorate 142(g_tTex2dmsf4a) DescriptorSet 0 Decorate 204(sample) Flat Decorate 204(sample) Location 0 - Decorate 211(Color) Location 0 - Decorate 215(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 211(@entryPointOutput.Color) Location 0 + Decorate 215(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 220(g_sSamp) DescriptorSet 0 Decorate 220(g_sSamp) Binding 0 2: TypeVoid @@ -721,9 +721,9 @@ gl_FragCoord origin is upper left 203: TypePointer Input 6(int) 204(sample): 203(ptr) Variable Input 210: TypePointer Output 9(fvec4) - 211(Color): 210(ptr) Variable Output +211(@entryPointOutput.Color): 210(ptr) Variable Output 214: TypePointer Output 8(float) -215(@entryPointOutput_Depth): 214(ptr) Variable Output +215(@entryPointOutput.Depth): 214(ptr) Variable Output 218: TypeSampler 219: TypePointer UniformConstant 218 220(g_sSamp): 219(ptr) Variable UniformConstant @@ -740,10 +740,10 @@ gl_FragCoord origin is upper left Store 206(flattenTemp) 209 212: 194(ptr) AccessChain 206(flattenTemp) 191 213: 9(fvec4) Load 212 - Store 211(Color) 213 + Store 211(@entryPointOutput.Color) 213 216: 197(ptr) AccessChain 206(flattenTemp) 196 217: 8(float) Load 216 - Store 215(@entryPointOutput_Depth) 217 + Store 215(@entryPointOutput.Depth) 217 Return FunctionEnd 13(@main(i1;):10(PS_OUTPUT) Function None 11 diff --git a/Test/baseResults/hlsl.hull.1.tesc.out b/Test/baseResults/hlsl.hull.1.tesc.out index 6965ae64..151a0b39 100644 --- a/Test/baseResults/hlsl.hull.1.tesc.out +++ b/Test/baseResults/hlsl.hull.1.tesc.out @@ -54,7 +54,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -66,7 +66,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -107,7 +107,7 @@ vertex spacing = equal_spacing 0:? 'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint}) 0:? 'm_cpid' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) Linked tessellation control stage: @@ -168,7 +168,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -180,7 +180,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -221,7 +221,7 @@ vertex spacing = equal_spacing 0:? 'ip' (layout( location=0) in 4-element array of structure{ temp 3-component vector of float cpoint}) 0:? 'm_cpid' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) // Module Version 10000 // Generated by (magic number): 80001 @@ -258,14 +258,14 @@ vertex spacing = equal_spacing Name 65 "@patchConstantResult" Name 66 "pid" Name 67 "param" - Name 72 "@patchConstantOutput_edges" + Name 72 "@patchConstantOutput.edges" Name 82 "output" Decorate 40(ip) Location 0 Decorate 44(m_cpid) BuiltIn InvocationId Decorate 48(@entryPointOutput) Location 0 Decorate 66(pid) BuiltIn PrimitiveId - Decorate 72(@patchConstantOutput_edges) Patch - Decorate 72(@patchConstantOutput_edges) BuiltIn TessLevelOuter + Decorate 72(@patchConstantOutput.edges) Patch + Decorate 72(@patchConstantOutput.edges) BuiltIn TessLevelOuter 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -301,7 +301,7 @@ vertex spacing = equal_spacing 66(pid): 43(ptr) Variable Input 70: TypeArray 6(float) 10 71: TypePointer Output 70 -72(@patchConstantOutput_edges): 71(ptr) Variable Output +72(@patchConstantOutput.edges): 71(ptr) Variable Output 73: TypePointer Function 6(float) 76: TypePointer Output 6(float) 78: 29(int) Constant 1 @@ -339,11 +339,11 @@ vertex spacing = equal_spacing Store 65(@patchConstantResult) 69 74: 73(ptr) AccessChain 65(@patchConstantResult) 30 30 75: 6(float) Load 74 - 77: 76(ptr) AccessChain 72(@patchConstantOutput_edges) 30 + 77: 76(ptr) AccessChain 72(@patchConstantOutput.edges) 30 Store 77 75 79: 73(ptr) AccessChain 65(@patchConstantResult) 30 78 80: 6(float) Load 79 - 81: 76(ptr) AccessChain 72(@patchConstantOutput_edges) 78 + 81: 76(ptr) AccessChain 72(@patchConstantOutput.edges) 78 Store 81 80 Branch 63 63: Label diff --git a/Test/baseResults/hlsl.hull.2.tesc.out b/Test/baseResults/hlsl.hull.2.tesc.out index 899d93ae..11342eac 100644 --- a/Test/baseResults/hlsl.hull.2.tesc.out +++ b/Test/baseResults/hlsl.hull.2.tesc.out @@ -50,7 +50,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -62,7 +62,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -105,7 +105,7 @@ vertex spacing = equal_spacing 0:? 'InvocationId' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) 0:? 'pos' ( in 4-component vector of float Position) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) Linked tessellation control stage: @@ -162,7 +162,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -174,7 +174,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -217,7 +217,7 @@ vertex spacing = equal_spacing 0:? 'InvocationId' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) 0:? 'pos' ( in 4-component vector of float Position) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) // Module Version 10000 // Generated by (magic number): 80001 @@ -254,15 +254,15 @@ vertex spacing = equal_spacing Name 66 "pos" Name 67 "param" Name 69 "param" - Name 74 "@patchConstantOutput_edges" + Name 74 "@patchConstantOutput.edges" Name 84 "output" Decorate 42(ip) Location 0 Decorate 46(@entryPointOutput) Location 0 Decorate 48(InvocationId) BuiltIn InvocationId Decorate 64(pid) BuiltIn PrimitiveId Decorate 66(pos) BuiltIn Position - Decorate 74(@patchConstantOutput_edges) Patch - Decorate 74(@patchConstantOutput_edges) BuiltIn TessLevelOuter + Decorate 74(@patchConstantOutput.edges) Patch + Decorate 74(@patchConstantOutput.edges) BuiltIn TessLevelOuter 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -302,7 +302,7 @@ vertex spacing = equal_spacing 66(pos): 65(ptr) Variable Input 72: TypeArray 6(float) 10 73: TypePointer Output 72 -74(@patchConstantOutput_edges): 73(ptr) Variable Output +74(@patchConstantOutput.edges): 73(ptr) Variable Output 75: TypePointer Function 6(float) 78: TypePointer Output 6(float) 80: 31(int) Constant 1 @@ -337,11 +337,11 @@ vertex spacing = equal_spacing Store 63(@patchConstantResult) 71 76: 75(ptr) AccessChain 63(@patchConstantResult) 32 32 77: 6(float) Load 76 - 79: 78(ptr) AccessChain 74(@patchConstantOutput_edges) 32 + 79: 78(ptr) AccessChain 74(@patchConstantOutput.edges) 32 Store 79 77 81: 75(ptr) AccessChain 63(@patchConstantResult) 32 80 82: 6(float) Load 81 - 83: 78(ptr) AccessChain 74(@patchConstantOutput_edges) 80 + 83: 78(ptr) AccessChain 74(@patchConstantOutput.edges) 80 Store 83 82 Branch 61 61: Label diff --git a/Test/baseResults/hlsl.hull.3.tesc.out b/Test/baseResults/hlsl.hull.3.tesc.out index c0f12d4f..39d92368 100755 --- a/Test/baseResults/hlsl.hull.3.tesc.out +++ b/Test/baseResults/hlsl.hull.3.tesc.out @@ -50,7 +50,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -62,7 +62,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -105,7 +105,7 @@ vertex spacing = equal_spacing 0:? 'InvocationId' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) 0:? 'pos' ( in 4-component vector of float Position) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) Linked tessellation control stage: @@ -162,7 +162,7 @@ vertex spacing = equal_spacing 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -174,7 +174,7 @@ vertex spacing = equal_spacing 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -217,7 +217,7 @@ vertex spacing = equal_spacing 0:? 'InvocationId' ( in uint InvocationID) 0:? 'pid' ( in uint PrimitiveID) 0:? 'pos' ( in 4-component vector of float Position) -0:? '@patchConstantOutput_edges' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter) // Module Version 10000 // Generated by (magic number): 80001 @@ -255,15 +255,15 @@ vertex spacing = equal_spacing Name 66 "pos" Name 67 "param" Name 69 "param" - Name 74 "@patchConstantOutput_edges" + Name 74 "@patchConstantOutput.edges" Name 84 "output" Decorate 42(ip) Location 0 Decorate 46(@entryPointOutput) Location 0 Decorate 48(InvocationId) BuiltIn InvocationId Decorate 64(pid) BuiltIn PrimitiveId Decorate 66(pos) BuiltIn Position - Decorate 74(@patchConstantOutput_edges) Patch - Decorate 74(@patchConstantOutput_edges) BuiltIn TessLevelOuter + Decorate 74(@patchConstantOutput.edges) Patch + Decorate 74(@patchConstantOutput.edges) BuiltIn TessLevelOuter 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -303,7 +303,7 @@ vertex spacing = equal_spacing 66(pos): 65(ptr) Variable Input 72: TypeArray 6(float) 10 73: TypePointer Output 72 -74(@patchConstantOutput_edges): 73(ptr) Variable Output +74(@patchConstantOutput.edges): 73(ptr) Variable Output 75: TypePointer Function 6(float) 78: TypePointer Output 6(float) 80: 31(int) Constant 1 @@ -338,11 +338,11 @@ vertex spacing = equal_spacing Store 63(@patchConstantResult) 71 76: 75(ptr) AccessChain 63(@patchConstantResult) 32 32 77: 6(float) Load 76 - 79: 78(ptr) AccessChain 74(@patchConstantOutput_edges) 32 + 79: 78(ptr) AccessChain 74(@patchConstantOutput.edges) 32 Store 79 77 81: 75(ptr) AccessChain 63(@patchConstantResult) 32 80 82: 6(float) Load 81 - 83: 78(ptr) AccessChain 74(@patchConstantOutput_edges) 80 + 83: 78(ptr) AccessChain 74(@patchConstantOutput.edges) 80 Store 83 82 Branch 61 61: Label diff --git a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out index 08329bcc..7fbe0cb5 100644 --- a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out +++ b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out @@ -78,7 +78,7 @@ triangle order = cw 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -90,7 +90,7 @@ triangle order = cw 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -102,7 +102,7 @@ triangle order = cw 0:? 1 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 2 (const int) 0:? direct index ( temp float) @@ -114,7 +114,7 @@ triangle order = cw 0:? 2 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelInner) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) 0:? Constant: 0:? 0 (const int) 0:? flInFactor: direct index for structure ( temp float) @@ -192,8 +192,8 @@ triangle order = cw 0:? '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'cpid' ( in uint InvocationID) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) Linked tessellation control stage: @@ -278,7 +278,7 @@ triangle order = cw 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -290,7 +290,7 @@ triangle order = cw 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -302,7 +302,7 @@ triangle order = cw 0:? 1 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 2 (const int) 0:? direct index ( temp float) @@ -314,7 +314,7 @@ triangle order = cw 0:? 2 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelInner) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) 0:? Constant: 0:? 0 (const int) 0:? flInFactor: direct index for structure ( temp float) @@ -392,8 +392,8 @@ triangle order = cw 0:? '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'cpid' ( in uint InvocationID) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) // Module Version 10000 // Generated by (magic number): 80001 @@ -440,16 +440,16 @@ triangle order = cw Name 82 "param" Name 84 "param" Name 88 "@patchConstantResult" - Name 94 "@patchConstantOutput_tfactor" - Name 108 "@patchConstantOutput_flInFactor" + Name 94 "@patchConstantOutput.tfactor" + Name 108 "@patchConstantOutput.flInFactor" Name 112 "o" Decorate 41(i) Location 0 Decorate 45(cpid) BuiltIn InvocationId Decorate 48(@entryPointOutput) Location 0 - Decorate 94(@patchConstantOutput_tfactor) Patch - Decorate 94(@patchConstantOutput_tfactor) BuiltIn TessLevelOuter - Decorate 108(@patchConstantOutput_flInFactor) Patch - Decorate 108(@patchConstantOutput_flInFactor) BuiltIn TessLevelInner + Decorate 94(@patchConstantOutput.tfactor) Patch + Decorate 94(@patchConstantOutput.tfactor) BuiltIn TessLevelOuter + Decorate 108(@patchConstantOutput.flInFactor) Patch + Decorate 108(@patchConstantOutput.flInFactor) BuiltIn TessLevelInner 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -488,12 +488,12 @@ triangle order = cw 91: 9(int) Constant 4 92: TypeArray 6(float) 91 93: TypePointer Output 92 -94(@patchConstantOutput_tfactor): 93(ptr) Variable Output +94(@patchConstantOutput.tfactor): 93(ptr) Variable Output 95: TypePointer Function 6(float) 98: TypePointer Output 6(float) 106: TypeArray 6(float) 57 107: TypePointer Output 106 -108(@patchConstantOutput_flInFactor): 107(ptr) Variable Output +108(@patchConstantOutput.flInFactor): 107(ptr) Variable Output 119: 6(float) Constant 1082130432 4(main): 2 Function None 3 5: Label @@ -553,19 +553,19 @@ triangle order = cw Store 88(@patchConstantResult) 90 96: 95(ptr) AccessChain 88(@patchConstantResult) 30 30 97: 6(float) Load 96 - 99: 98(ptr) AccessChain 94(@patchConstantOutput_tfactor) 30 + 99: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 30 Store 99 97 100: 95(ptr) AccessChain 88(@patchConstantResult) 30 73 101: 6(float) Load 100 - 102: 98(ptr) AccessChain 94(@patchConstantOutput_tfactor) 73 + 102: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 73 Store 102 101 103: 95(ptr) AccessChain 88(@patchConstantResult) 30 80 104: 6(float) Load 103 - 105: 98(ptr) AccessChain 94(@patchConstantOutput_tfactor) 80 + 105: 98(ptr) AccessChain 94(@patchConstantOutput.tfactor) 80 Store 105 104 109: 95(ptr) AccessChain 88(@patchConstantResult) 73 110: 6(float) Load 109 - 111: 98(ptr) AccessChain 108(@patchConstantOutput_flInFactor) 30 + 111: 98(ptr) AccessChain 108(@patchConstantOutput.flInFactor) 30 Store 111 110 Branch 64 64: Label diff --git a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out index b95d65f3..32764f30 100644 --- a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out +++ b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out @@ -86,7 +86,7 @@ triangle order = cw 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -98,7 +98,7 @@ triangle order = cw 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -110,7 +110,7 @@ triangle order = cw 0:? 1 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 2 (const int) 0:? direct index ( temp float) @@ -122,7 +122,7 @@ triangle order = cw 0:? 2 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelInner) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) 0:? Constant: 0:? 0 (const int) 0:? flInFactor: direct index for structure ( temp float) @@ -201,8 +201,8 @@ triangle order = cw 0:? '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'cpid' ( in uint InvocationID) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) Linked tessellation control stage: @@ -295,7 +295,7 @@ triangle order = cw 0:? Sequence 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 0 (const int) 0:? direct index ( temp float) @@ -307,7 +307,7 @@ triangle order = cw 0:? 0 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 1 (const int) 0:? direct index ( temp float) @@ -319,7 +319,7 @@ triangle order = cw 0:? 1 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelOuter) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) 0:? Constant: 0:? 2 (const int) 0:? direct index ( temp float) @@ -331,7 +331,7 @@ triangle order = cw 0:? 2 (const int) 0:? move second child to first child ( temp float) 0:? direct index ( patch out float TessLevelInner) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) 0:? Constant: 0:? 0 (const int) 0:? flInFactor: direct index for structure ( temp float) @@ -410,8 +410,8 @@ triangle order = cw 0:? '@entryPointOutput' (layout( location=0) out 3-element array of structure{ temp 3-component vector of float val}) 0:? 'i' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float val}) 0:? 'cpid' ( in uint InvocationID) -0:? '@patchConstantOutput_tfactor' ( patch out 4-element array of float TessLevelOuter) -0:? '@patchConstantOutput_flInFactor' ( patch out 2-element array of float TessLevelInner) +0:? '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter) +0:? '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner) // Module Version 10000 // Generated by (magic number): 80001 @@ -459,16 +459,16 @@ triangle order = cw Name 83 "param" Name 85 "param" Name 89 "@patchConstantResult" - Name 96 "@patchConstantOutput_tfactor" - Name 110 "@patchConstantOutput_flInFactor" + Name 96 "@patchConstantOutput.tfactor" + Name 110 "@patchConstantOutput.flInFactor" Name 114 "o" Decorate 42(i) Location 0 Decorate 46(cpid) BuiltIn InvocationId Decorate 49(@entryPointOutput) Location 0 - Decorate 96(@patchConstantOutput_tfactor) Patch - Decorate 96(@patchConstantOutput_tfactor) BuiltIn TessLevelOuter - Decorate 110(@patchConstantOutput_flInFactor) Patch - Decorate 110(@patchConstantOutput_flInFactor) BuiltIn TessLevelInner + Decorate 96(@patchConstantOutput.tfactor) Patch + Decorate 96(@patchConstantOutput.tfactor) BuiltIn TessLevelOuter + Decorate 110(@patchConstantOutput.flInFactor) Patch + Decorate 110(@patchConstantOutput.flInFactor) BuiltIn TessLevelInner 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -507,12 +507,12 @@ triangle order = cw 93: 9(int) Constant 4 94: TypeArray 6(float) 93 95: TypePointer Output 94 -96(@patchConstantOutput_tfactor): 95(ptr) Variable Output +96(@patchConstantOutput.tfactor): 95(ptr) Variable Output 97: TypePointer Function 6(float) 100: TypePointer Output 6(float) 108: TypeArray 6(float) 58 109: TypePointer Output 108 -110(@patchConstantOutput_flInFactor): 109(ptr) Variable Output +110(@patchConstantOutput.flInFactor): 109(ptr) Variable Output 121: 6(float) Constant 1082130432 4(main): 2 Function None 3 5: Label @@ -573,19 +573,19 @@ triangle order = cw Store 89(@patchConstantResult) 92 98: 97(ptr) AccessChain 89(@patchConstantResult) 29 29 99: 6(float) Load 98 - 101: 100(ptr) AccessChain 96(@patchConstantOutput_tfactor) 29 + 101: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 29 Store 101 99 102: 97(ptr) AccessChain 89(@patchConstantResult) 29 74 103: 6(float) Load 102 - 104: 100(ptr) AccessChain 96(@patchConstantOutput_tfactor) 74 + 104: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 74 Store 104 103 105: 97(ptr) AccessChain 89(@patchConstantResult) 29 81 106: 6(float) Load 105 - 107: 100(ptr) AccessChain 96(@patchConstantOutput_tfactor) 81 + 107: 100(ptr) AccessChain 96(@patchConstantOutput.tfactor) 81 Store 107 106 111: 97(ptr) AccessChain 89(@patchConstantResult) 74 112: 6(float) Load 111 - 113: 100(ptr) AccessChain 110(@patchConstantOutput_flInFactor) 29 + 113: 100(ptr) AccessChain 110(@patchConstantOutput.flInFactor) 29 Store 113 112 Branch 65 65: Label diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index 45eca98c..0b885004 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -168,13 +168,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:45 color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:45 Constant: 0:45 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -349,13 +349,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:45 color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:45 Constant: 0:45 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -392,8 +392,8 @@ gl_FragCoord origin is upper left MemberName 87(two) 1 "b" Name 89 "twoNonConst" Name 99 "ps_output" - Name 109 "color" - Decorate 109(color) Location 0 + Name 109 "@entryPointOutput.color" + Decorate 109(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 8: TypeFloat 32 @@ -445,12 +445,12 @@ gl_FragCoord origin is upper left 102: 9(fvec4) ConstantComposite 18 18 18 18 103: TypePointer Function 9(fvec4) 108: TypePointer Output 9(fvec4) - 109(color): 108(ptr) Variable Output +109(@entryPointOutput.color): 108(ptr) Variable Output 4(main): 2 Function None 3 5: Label 110:10(PS_OUTPUT) FunctionCall 12(@main() 111: 9(fvec4) CompositeExtract 110 0 - Store 109(color) 111 + Store 109(@entryPointOutput.color) 111 Return FunctionEnd 6(Test1(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index 613ca2be..1bc49447 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -80,13 +80,13 @@ gl_FragCoord origin is upper left 0:? 'inpos' ( temp 4-component vector of float) 0:? 'sampleMask' ( temp int) 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:16 Color: direct index for structure ( temp 4-component vector of float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:16 Depth: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: @@ -95,8 +95,8 @@ gl_FragCoord origin is upper left 0:? 'sampleMask' ( out int SampleMaskIn) 0:? 'sampleMask' ( temp int) 0:? Linker Objects -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:? 'inpos' ( noperspective in 4-component vector of float FragCoord) 0:? 'sampleMask' ( out int SampleMaskIn) @@ -185,13 +185,13 @@ gl_FragCoord origin is upper left 0:? 'inpos' ( temp 4-component vector of float) 0:? 'sampleMask' ( temp int) 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:16 Color: direct index for structure ( temp 4-component vector of float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:16 Depth: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: @@ -200,8 +200,8 @@ gl_FragCoord origin is upper left 0:? 'sampleMask' ( out int SampleMaskIn) 0:? 'sampleMask' ( temp int) 0:? Linker Objects -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:? 'inpos' ( noperspective in 4-component vector of float FragCoord) 0:? 'sampleMask' ( out int SampleMaskIn) @@ -242,13 +242,13 @@ gl_FragCoord origin is upper left Name 71 "sampleMask" Name 72 "param" Name 74 "param" - Name 78 "Color" - Name 82 "@entryPointOutput_Depth" + Name 78 "@entryPointOutput.Color" + Name 82 "@entryPointOutput.Depth" Name 86 "sampleMask" Decorate 68(inpos) NoPerspective Decorate 68(inpos) BuiltIn FragCoord - Decorate 78(Color) Location 0 - Decorate 82(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 78(@entryPointOutput.Color) Location 0 + Decorate 82(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 86(sampleMask) BuiltIn SampleMask 2: TypeVoid 3: TypeFunction 2 @@ -273,9 +273,9 @@ gl_FragCoord origin is upper left 67: TypePointer Input 15(fvec4) 68(inpos): 67(ptr) Variable Input 77: TypePointer Output 15(fvec4) - 78(Color): 77(ptr) Variable Output +78(@entryPointOutput.Color): 77(ptr) Variable Output 81: TypePointer Output 6(float) -82(@entryPointOutput_Depth): 81(ptr) Variable Output +82(@entryPointOutput.Depth): 81(ptr) Variable Output 85: TypePointer Output 17(int) 86(sampleMask): 85(ptr) Variable Output 4(main): 2 Function None 3 @@ -295,10 +295,10 @@ gl_FragCoord origin is upper left Store 70(flattenTemp) 75 79: 16(ptr) AccessChain 70(flattenTemp) 53 80: 15(fvec4) Load 79 - Store 78(Color) 80 + Store 78(@entryPointOutput.Color) 80 83: 7(ptr) AccessChain 70(flattenTemp) 59 84: 6(float) Load 83 - Store 82(@entryPointOutput_Depth) 84 + Store 82(@entryPointOutput.Depth) 84 87: 17(int) Load 71(sampleMask) Store 86(sampleMask) 87 Return diff --git a/Test/baseResults/hlsl.intrinsic.frexp.frag.out b/Test/baseResults/hlsl.intrinsic.frexp.frag.out index e62399a0..2aa1229d 100644 --- a/Test/baseResults/hlsl.intrinsic.frexp.frag.out +++ b/Test/baseResults/hlsl.intrinsic.frexp.frag.out @@ -84,13 +84,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:33 Sequence 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:33 color: direct index for structure ( temp 4-component vector of float) 0:33 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:33 Constant: 0:33 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -181,13 +181,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:33 Sequence 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:33 color: direct index for structure ( temp 4-component vector of float) 0:33 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:33 Constant: 0:33 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -224,8 +224,8 @@ gl_FragCoord origin is upper left Name 74 "r000" Name 77 "ResType" Name 87 "ps_output" - Name 95 "color" - Decorate 95(color) Location 0 + Name 95 "@entryPointOutput.color" + Decorate 95(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -262,12 +262,12 @@ gl_FragCoord origin is upper left 88: 40(int) Constant 0 89: 27(fvec4) ConstantComposite 57 57 57 57 94: TypePointer Output 27(fvec4) - 95(color): 94(ptr) Variable Output +95(@entryPointOutput.color): 94(ptr) Variable Output 4(main): 2 Function None 3 5: Label 96:34(PS_OUTPUT) FunctionCall 36(@main() 97: 27(fvec4) CompositeExtract 96 0 - Store 95(color) 97 + Store 95(@entryPointOutput.color) 97 Return FunctionEnd 11(PixelShaderFunctionS(f1;f1;): 6(float) Function None 8 diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 82da747d..ad705451 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -2752,7 +2752,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:484 Sequence 0:484 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:484 color: direct index for structure ( temp 4-component vector of float) 0:484 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:484 Constant: @@ -2770,7 +2770,7 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' ( shared 4-component vector of uint) 0:? 'gs_ub4' ( shared 4-component vector of uint) 0:? 'gs_uc4' ( shared 4-component vector of uint) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -5529,7 +5529,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:484 Sequence 0:484 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:484 color: direct index for structure ( temp 4-component vector of float) 0:484 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:484 Constant: @@ -5547,7 +5547,7 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' ( shared 4-component vector of uint) 0:? 'gs_ub4' ( shared 4-component vector of uint) 0:? 'gs_uc4' ( shared 4-component vector of uint) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -6059,7 +6059,7 @@ gl_FragCoord origin is upper left Name 1769 "r15" Name 1773 "r16" Name 1778 "ps_output" - Name 1786 "color" + Name 1786 "@entryPointOutput.color" Name 1790 "gs_ua" Name 1791 "gs_ub" Name 1792 "gs_uc" @@ -6072,7 +6072,7 @@ gl_FragCoord origin is upper left Name 1802 "gs_ua4" Name 1803 "gs_ub4" Name 1804 "gs_uc4" - Decorate 1786(color) Location 0 + Decorate 1786(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -6185,7 +6185,7 @@ gl_FragCoord origin is upper left 1779: 155(int) Constant 0 1780: 48(fvec4) ConstantComposite 283 283 283 283 1785: TypePointer Output 48(fvec4) - 1786(color): 1785(ptr) Variable Output +1786(@entryPointOutput.color): 1785(ptr) Variable Output 1789: TypePointer Workgroup 8(int) 1790(gs_ua): 1789(ptr) Variable Workgroup 1791(gs_ub): 1789(ptr) Variable Workgroup @@ -6206,7 +6206,7 @@ gl_FragCoord origin is upper left 5: Label 1787:131(PS_OUTPUT) FunctionCall 133(@main() 1788: 48(fvec4) CompositeExtract 1787 0 - Store 1786(color) 1788 + Store 1786(@entryPointOutput.color) 1788 Return FunctionEnd 16(PixelShaderFunctionS(f1;f1;f1;u1;u1;): 6(float) Function None 10 diff --git a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out index d67b2e8b..d6bd3df2 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out @@ -40,14 +40,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:15 Sequence 0:15 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:15 color: direct index for structure ( temp 4-component vector of float) 0:15 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:15 Constant: 0:15 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2}) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -94,14 +94,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:15 Sequence 0:15 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:15 color: direct index for structure ( temp 4-component vector of float) 0:15 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:15 Constant: 0:15 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2}) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -130,7 +130,7 @@ gl_FragCoord origin is upper left Name 21 "" Name 29 "r01" Name 37 "ps_output" - Name 47 "color" + Name 47 "@entryPointOutput.color" MemberDecorate 19($Global) 0 Offset 0 MemberDecorate 19($Global) 1 Offset 4 MemberDecorate 19($Global) 2 Offset 8 @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left MemberDecorate 19($Global) 7 Offset 40 Decorate 19($Global) Block Decorate 21 DescriptorSet 0 - Decorate 47(color) Location 0 + Decorate 47(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -168,12 +168,12 @@ gl_FragCoord origin is upper left 40: 7(fvec4) ConstantComposite 39 39 39 39 41: TypePointer Function 7(fvec4) 46: TypePointer Output 7(fvec4) - 47(color): 46(ptr) Variable Output +47(@entryPointOutput.color): 46(ptr) Variable Output 4(main): 2 Function None 3 5: Label 48:8(PS_OUTPUT) FunctionCall 10(@main() 49: 7(fvec4) CompositeExtract 48 0 - Store 47(color) 49 + Store 47(@entryPointOutput.color) 49 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.intrinsics.promote.frag.out b/Test/baseResults/hlsl.intrinsics.promote.frag.out index b62d30d9..107de389 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.frag.out @@ -430,7 +430,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:20 color: direct index for structure ( temp 4-component vector of float) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:20 Constant: @@ -439,7 +439,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2, uniform uint upos, uniform float fpos}) 0:? 'g_tTexbfs' (layout( r32f) uniform textureBuffer) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -876,7 +876,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:20 color: direct index for structure ( temp 4-component vector of float) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:20 Constant: @@ -885,7 +885,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2, uniform uint upos, uniform float fpos}) 0:? 'g_tTexbfs' (layout( r32f) uniform textureBuffer) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -951,7 +951,7 @@ gl_FragCoord origin is upper left Name 297 "NumberOfLevelsI" Name 301 "sizeQueryTemp" Name 310 "ps_output" - Name 319 "color" + Name 319 "@entryPointOutput.color" MemberDecorate 19($Global) 0 Offset 0 MemberDecorate 19($Global) 1 Offset 4 MemberDecorate 19($Global) 2 Offset 8 @@ -966,7 +966,7 @@ gl_FragCoord origin is upper left Decorate 21 DescriptorSet 0 Decorate 258(g_tTexbfs) DescriptorSet 0 Decorate 277(g_tTex1df4) DescriptorSet 0 - Decorate 319(color) Location 0 + Decorate 319(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -1025,12 +1025,12 @@ gl_FragCoord origin is upper left 309: TypePointer Function 8(PS_OUTPUT) 313: TypePointer Function 7(fvec4) 318: TypePointer Output 7(fvec4) - 319(color): 318(ptr) Variable Output +319(@entryPointOutput.color): 318(ptr) Variable Output 4(main): 2 Function None 3 5: Label 320:8(PS_OUTPUT) FunctionCall 10(@main() 321: 7(fvec4) CompositeExtract 320 0 - Store 319(color) 321 + Store 319(@entryPointOutput.color) 321 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out index 87b425fb..649f7ca4 100644 --- a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out +++ b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out @@ -88,7 +88,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:20 color: direct index for structure ( temp 4-component vector of float) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:20 Constant: @@ -97,7 +97,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2, uniform uint upos, uniform float fpos}) 0:? 'g_tTexbfs' (layout( r32f) uniform textureBuffer) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -192,7 +192,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:20 Sequence 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:20 color: direct index for structure ( temp 4-component vector of float) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:20 Constant: @@ -201,7 +201,7 @@ gl_FragCoord origin is upper left 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int i, uniform uint u, uniform float f, uniform bool b, uniform 2-component vector of int i2, uniform 2-component vector of uint u2, uniform 2-component vector of float f2, uniform 2-component vector of bool b2, uniform uint upos, uniform float fpos}) 0:? 'g_tTexbfs' (layout( r32f) uniform textureBuffer) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -242,7 +242,7 @@ gl_FragCoord origin is upper left Name 53 "NumberOfLevelsI" Name 57 "sizeQueryTemp" Name 66 "ps_output" - Name 74 "color" + Name 74 "@entryPointOutput.color" Name 79 "g_tTexbfs" MemberDecorate 17($Global) 0 Offset 0 MemberDecorate 17($Global) 1 Offset 4 @@ -257,7 +257,7 @@ gl_FragCoord origin is upper left Decorate 17($Global) Block Decorate 19 DescriptorSet 0 Decorate 31(g_tTex1df4) DescriptorSet 0 - Decorate 74(color) Location 0 + Decorate 74(@entryPointOutput.color) Location 0 Decorate 79(g_tTexbfs) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 @@ -288,7 +288,7 @@ gl_FragCoord origin is upper left 67: 7(fvec4) ConstantComposite 24 24 24 24 68: TypePointer Function 7(fvec4) 73: TypePointer Output 7(fvec4) - 74(color): 73(ptr) Variable Output +74(@entryPointOutput.color): 73(ptr) Variable Output 77: TypeImage 6(float) Buffer sampled format:R32f 78: TypePointer UniformConstant 77 79(g_tTexbfs): 78(ptr) Variable UniformConstant @@ -296,7 +296,7 @@ gl_FragCoord origin is upper left 5: Label 75:8(PS_OUTPUT) FunctionCall 10(@main() 76: 7(fvec4) CompositeExtract 75 0 - Store 74(color) 76 + Store 74(@entryPointOutput.color) 76 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 921348f5..462bb81e 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -152,13 +152,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -332,13 +332,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -390,8 +390,8 @@ gl_FragCoord origin is upper left Name 82 "g_tTex2dmsu4a" Name 106 "psout" Name 117 "flattenTemp" - Name 120 "Color" - Name 124 "@entryPointOutput_Depth" + Name 120 "@entryPointOutput.Color" + Name 124 "@entryPointOutput.Depth" Name 129 "g_sSamp" Decorate 14(g_tTex2dmsf4) DescriptorSet 0 MemberDecorate 20($Global) 0 Offset 0 @@ -409,8 +409,8 @@ gl_FragCoord origin is upper left Decorate 66(g_tTex2dmsf4a) DescriptorSet 0 Decorate 75(g_tTex2dmsi4a) DescriptorSet 0 Decorate 82(g_tTex2dmsu4a) DescriptorSet 0 - Decorate 120(Color) Location 0 - Decorate 124(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 120(@entryPointOutput.Color) Location 0 + Decorate 124(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 129(g_sSamp) DescriptorSet 0 Decorate 129(g_sSamp) Binding 0 2: TypeVoid @@ -459,9 +459,9 @@ gl_FragCoord origin is upper left 110: TypePointer Function 7(fvec4) 112: TypePointer Function 6(float) 119: TypePointer Output 7(fvec4) - 120(Color): 119(ptr) Variable Output +120(@entryPointOutput.Color): 119(ptr) Variable Output 123: TypePointer Output 6(float) -124(@entryPointOutput_Depth): 123(ptr) Variable Output +124(@entryPointOutput.Depth): 123(ptr) Variable Output 127: TypeSampler 128: TypePointer UniformConstant 127 129(g_sSamp): 128(ptr) Variable UniformConstant @@ -472,10 +472,10 @@ gl_FragCoord origin is upper left Store 117(flattenTemp) 118 121: 110(ptr) AccessChain 117(flattenTemp) 107 122: 7(fvec4) Load 121 - Store 120(Color) 122 + Store 120(@entryPointOutput.Color) 122 125: 112(ptr) AccessChain 117(flattenTemp) 23 126: 6(float) Load 125 - Store 124(@entryPointOutput_Depth) 126 + Store 124(@entryPointOutput.Depth) 126 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 281681ff..9bfc6787 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -152,13 +152,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -187,8 +187,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -347,13 +347,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -382,8 +382,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -420,8 +420,8 @@ gl_FragCoord origin is upper left Name 80 "g_tTex2du4a" Name 89 "psout" Name 101 "flattenTemp" - Name 104 "Color" - Name 108 "@entryPointOutput_Depth" + Name 104 "@entryPointOutput.Color" + Name 108 "@entryPointOutput.Depth" Name 113 "g_sSamp" Name 116 "g_tTex1df4" Name 119 "g_tTex1di4" @@ -454,8 +454,8 @@ gl_FragCoord origin is upper left Decorate 57(g_tTex2df4a) DescriptorSet 0 Decorate 70(g_tTex2di4a) DescriptorSet 0 Decorate 80(g_tTex2du4a) DescriptorSet 0 - Decorate 104(Color) Location 0 - Decorate 108(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 104(@entryPointOutput.Color) Location 0 + Decorate 108(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 113(g_sSamp) DescriptorSet 0 Decorate 113(g_sSamp) Binding 0 Decorate 116(g_tTex1df4) DescriptorSet 0 @@ -522,9 +522,9 @@ gl_FragCoord origin is upper left 95: 16(int) Constant 1 96: TypePointer Function 6(float) 103: TypePointer Output 7(fvec4) - 104(Color): 103(ptr) Variable Output +104(@entryPointOutput.Color): 103(ptr) Variable Output 107: TypePointer Output 6(float) -108(@entryPointOutput_Depth): 107(ptr) Variable Output +108(@entryPointOutput.Depth): 107(ptr) Variable Output 111: TypeSampler 112: TypePointer UniformConstant 111 113(g_sSamp): 112(ptr) Variable UniformConstant @@ -580,10 +580,10 @@ gl_FragCoord origin is upper left Store 101(flattenTemp) 102 105: 93(ptr) AccessChain 101(flattenTemp) 90 106: 7(fvec4) Load 105 - Store 104(Color) 106 + Store 104(@entryPointOutput.Color) 106 109: 96(ptr) AccessChain 101(flattenTemp) 95 110: 6(float) Load 109 - Store 108(@entryPointOutput_Depth) 110 + Store 108(@entryPointOutput.Depth) 110 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index b849a473..20110a50 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -203,13 +203,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -238,8 +238,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -449,13 +449,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -484,8 +484,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -525,8 +525,8 @@ gl_FragCoord origin is upper left Name 110 "g_tTex3du4" Name 119 "psout" Name 130 "flattenTemp" - Name 133 "Color" - Name 137 "@entryPointOutput_Depth" + Name 133 "@entryPointOutput.Color" + Name 137 "@entryPointOutput.Depth" Name 142 "g_sSamp" Name 145 "g_tTexcdf4" Name 148 "g_tTexcdi4" @@ -560,8 +560,8 @@ gl_FragCoord origin is upper left Decorate 87(g_tTex3df4) DescriptorSet 0 Decorate 100(g_tTex3di4) DescriptorSet 0 Decorate 110(g_tTex3du4) DescriptorSet 0 - Decorate 133(Color) Location 0 - Decorate 137(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 133(@entryPointOutput.Color) Location 0 + Decorate 137(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 142(g_sSamp) DescriptorSet 0 Decorate 142(g_sSamp) Binding 0 Decorate 145(g_tTexcdf4) DescriptorSet 0 @@ -635,9 +635,9 @@ gl_FragCoord origin is upper left 123: TypePointer Function 7(fvec4) 125: TypePointer Function 6(float) 132: TypePointer Output 7(fvec4) - 133(Color): 132(ptr) Variable Output +133(@entryPointOutput.Color): 132(ptr) Variable Output 136: TypePointer Output 6(float) -137(@entryPointOutput_Depth): 136(ptr) Variable Output +137(@entryPointOutput.Depth): 136(ptr) Variable Output 140: TypeSampler 141: TypePointer UniformConstant 140 142(g_sSamp): 141(ptr) Variable UniformConstant @@ -684,10 +684,10 @@ gl_FragCoord origin is upper left Store 130(flattenTemp) 131 134: 123(ptr) AccessChain 130(flattenTemp) 120 135: 7(fvec4) Load 134 - Store 133(Color) 135 + Store 133(@entryPointOutput.Color) 135 138: 125(ptr) AccessChain 130(flattenTemp) 23 139: 6(float) Load 138 - Store 137(@entryPointOutput_Depth) 139 + Store 137(@entryPointOutput.Depth) 139 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index 7f5529cc..619bfda0 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -192,7 +192,7 @@ Shader version: 500 0:? Sequence 0:47 Sequence 0:47 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:47 Pos: direct index for structure ( temp 4-component vector of float) 0:47 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:47 Constant: @@ -221,7 +221,7 @@ Shader version: 500 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) Linked vertex stage: @@ -420,7 +420,7 @@ Shader version: 500 0:? Sequence 0:47 Sequence 0:47 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:47 Pos: direct index for structure ( temp 4-component vector of float) 0:47 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:47 Constant: @@ -449,7 +449,7 @@ Shader version: 500 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -486,7 +486,7 @@ Shader version: 500 Name 100 "g_tTex3di4" Name 110 "g_tTex3du4" Name 119 "vsout" - Name 129 "@entryPointOutput_Pos" + Name 129 "@entryPointOutput.Pos" Name 134 "g_sSamp" Name 137 "g_tTexcdf4" Name 140 "g_tTexcdi4" @@ -520,7 +520,7 @@ Shader version: 500 Decorate 87(g_tTex3df4) DescriptorSet 0 Decorate 100(g_tTex3di4) DescriptorSet 0 Decorate 110(g_tTex3du4) DescriptorSet 0 - Decorate 129(@entryPointOutput_Pos) BuiltIn Position + Decorate 129(@entryPointOutput.Pos) BuiltIn Position Decorate 134(g_sSamp) DescriptorSet 0 Decorate 134(g_sSamp) Binding 0 Decorate 137(g_tTexcdf4) DescriptorSet 0 @@ -593,7 +593,7 @@ Shader version: 500 122: 7(fvec4) ConstantComposite 121 121 121 121 123: TypePointer Function 7(fvec4) 128: TypePointer Output 7(fvec4) -129(@entryPointOutput_Pos): 128(ptr) Variable Output +129(@entryPointOutput.Pos): 128(ptr) Variable Output 132: TypeSampler 133: TypePointer UniformConstant 132 134(g_sSamp): 133(ptr) Variable UniformConstant @@ -637,7 +637,7 @@ Shader version: 500 5: Label 130:8(VS_OUTPUT) FunctionCall 10(@main() 131: 7(fvec4) CompositeExtract 130 0 - Store 129(@entryPointOutput_Pos) 131 + Store 129(@entryPointOutput.Pos) 131 Return FunctionEnd 10(@main():8(VS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index a1805641..0e876abd 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -59,13 +59,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -76,8 +76,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer) 0:? 'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -143,13 +143,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer) 0:? 'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -197,8 +197,8 @@ gl_FragCoord origin is upper left Name 45 "g_tTexbu4" Name 51 "psout" Name 61 "flattenTemp" - Name 64 "Color" - Name 68 "@entryPointOutput_Depth" + Name 64 "@entryPointOutput.Color" + Name 68 "@entryPointOutput.Depth" Name 71 "g_tTexbf4_test" Decorate 16(g_tTexbf4) DescriptorSet 0 MemberDecorate 22($Global) 0 Offset 0 @@ -213,8 +213,8 @@ gl_FragCoord origin is upper left Decorate 24 DescriptorSet 0 Decorate 34(g_tTexbi4) DescriptorSet 0 Decorate 45(g_tTexbu4) DescriptorSet 0 - Decorate 64(Color) Location 0 - Decorate 68(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 64(@entryPointOutput.Color) Location 0 + Decorate 68(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 71(g_tTexbf4_test) DescriptorSet 0 Decorate 71(g_tTexbf4_test) Binding 0 2: TypeVoid @@ -252,9 +252,9 @@ gl_FragCoord origin is upper left 55: 18(int) Constant 1 56: TypePointer Function 6(float) 63: TypePointer Output 7(fvec4) - 64(Color): 63(ptr) Variable Output +64(@entryPointOutput.Color): 63(ptr) Variable Output 67: TypePointer Output 6(float) -68(@entryPointOutput_Depth): 67(ptr) Variable Output +68(@entryPointOutput.Depth): 67(ptr) Variable Output 71(g_tTexbf4_test): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -263,10 +263,10 @@ gl_FragCoord origin is upper left Store 61(flattenTemp) 62 65: 12(ptr) AccessChain 61(flattenTemp) 25 66: 7(fvec4) Load 65 - Store 64(Color) 66 + Store 64(@entryPointOutput.Color) 66 69: 56(ptr) AccessChain 61(flattenTemp) 55 70: 6(float) Load 69 - Store 68(@entryPointOutput_Depth) 70 + Store 68(@entryPointOutput.Depth) 70 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out index 4502b587..2b7440fa 100644 --- a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out @@ -62,13 +62,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -79,8 +79,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbis' (layout( r32i) uniform itextureBuffer) 0:? 'g_tTexbus' (layout( r32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -166,8 +166,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbis' (layout( r32i) uniform itextureBuffer) 0:? 'g_tTexbus' (layout( r32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -203,8 +203,8 @@ gl_FragCoord origin is upper left Name 46 "g_tTexbus" Name 54 "psout" Name 64 "flattenTemp" - Name 67 "Color" - Name 71 "@entryPointOutput_Depth" + Name 67 "@entryPointOutput.Color" + Name 71 "@entryPointOutput.Depth" Name 74 "g_tTexbfs_test" Decorate 16(g_tTexbfs) DescriptorSet 0 MemberDecorate 22($Global) 0 Offset 0 @@ -219,8 +219,8 @@ gl_FragCoord origin is upper left Decorate 24 DescriptorSet 0 Decorate 35(g_tTexbis) DescriptorSet 0 Decorate 46(g_tTexbus) DescriptorSet 0 - Decorate 67(Color) Location 0 - Decorate 71(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 67(@entryPointOutput.Color) Location 0 + Decorate 71(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 74(g_tTexbfs_test) DescriptorSet 0 Decorate 74(g_tTexbfs_test) Binding 0 2: TypeVoid @@ -258,9 +258,9 @@ gl_FragCoord origin is upper left 57: TypePointer Function 7(fvec4) 59: 18(int) Constant 1 66: TypePointer Output 7(fvec4) - 67(Color): 66(ptr) Variable Output +67(@entryPointOutput.Color): 66(ptr) Variable Output 70: TypePointer Output 6(float) -71(@entryPointOutput_Depth): 70(ptr) Variable Output +71(@entryPointOutput.Depth): 70(ptr) Variable Output 74(g_tTexbfs_test): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -269,10 +269,10 @@ gl_FragCoord origin is upper left Store 64(flattenTemp) 65 68: 57(ptr) AccessChain 64(flattenTemp) 25 69: 7(fvec4) Load 68 - Store 67(Color) 69 + Store 67(@entryPointOutput.Color) 69 72: 12(ptr) AccessChain 64(flattenTemp) 59 73: 6(float) Load 72 - Store 71(@entryPointOutput_Depth) 73 + Store 71(@entryPointOutput.Depth) 73 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index c26c3331..9f77ec08 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -239,13 +239,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -274,8 +274,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -521,13 +521,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -556,8 +556,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -598,8 +598,8 @@ gl_FragCoord origin is upper left Name 130 "g_tTex3du4" Name 141 "psout" Name 152 "flattenTemp" - Name 155 "Color" - Name 159 "@entryPointOutput_Depth" + Name 155 "@entryPointOutput.Color" + Name 159 "@entryPointOutput.Depth" Name 164 "g_sSamp" Name 167 "g_tTexcdf4" Name 170 "g_tTexcdi4" @@ -633,8 +633,8 @@ gl_FragCoord origin is upper left Decorate 102(g_tTex3df4) DescriptorSet 0 Decorate 118(g_tTex3di4) DescriptorSet 0 Decorate 130(g_tTex3du4) DescriptorSet 0 - Decorate 155(Color) Location 0 - Decorate 159(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 155(@entryPointOutput.Color) Location 0 + Decorate 159(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 164(g_sSamp) DescriptorSet 0 Decorate 164(g_sSamp) Binding 0 Decorate 167(g_tTexcdf4) DescriptorSet 0 @@ -712,9 +712,9 @@ gl_FragCoord origin is upper left 145: TypePointer Function 7(fvec4) 147: TypePointer Function 6(float) 154: TypePointer Output 7(fvec4) - 155(Color): 154(ptr) Variable Output +155(@entryPointOutput.Color): 154(ptr) Variable Output 158: TypePointer Output 6(float) -159(@entryPointOutput_Depth): 158(ptr) Variable Output +159(@entryPointOutput.Depth): 158(ptr) Variable Output 162: TypeSampler 163: TypePointer UniformConstant 162 164(g_sSamp): 163(ptr) Variable UniformConstant @@ -761,10 +761,10 @@ gl_FragCoord origin is upper left Store 152(flattenTemp) 153 156: 145(ptr) AccessChain 152(flattenTemp) 142 157: 7(fvec4) Load 156 - Store 155(Color) 157 + Store 155(@entryPointOutput.Color) 157 160: 147(ptr) AccessChain 152(flattenTemp) 23 161: 6(float) Load 160 - Store 159(@entryPointOutput_Depth) 161 + Store 159(@entryPointOutput.Depth) 161 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 2a9b586f..2e4eca93 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -176,13 +176,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -211,8 +211,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -395,13 +395,13 @@ gl_FragCoord origin is upper left 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:48 Color: direct index for structure ( temp 4-component vector of float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -430,8 +430,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -469,8 +469,8 @@ gl_FragCoord origin is upper left Name 93 "g_tTex2du4a" Name 104 "psout" Name 116 "flattenTemp" - Name 119 "Color" - Name 123 "@entryPointOutput_Depth" + Name 119 "@entryPointOutput.Color" + Name 123 "@entryPointOutput.Depth" Name 128 "g_sSamp" Name 131 "g_tTex1df4" Name 134 "g_tTex1di4" @@ -503,8 +503,8 @@ gl_FragCoord origin is upper left Decorate 64(g_tTex2df4a) DescriptorSet 0 Decorate 81(g_tTex2di4a) DescriptorSet 0 Decorate 93(g_tTex2du4a) DescriptorSet 0 - Decorate 119(Color) Location 0 - Decorate 123(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 119(@entryPointOutput.Color) Location 0 + Decorate 123(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 128(g_sSamp) DescriptorSet 0 Decorate 128(g_sSamp) Binding 0 Decorate 131(g_tTex1df4) DescriptorSet 0 @@ -574,9 +574,9 @@ gl_FragCoord origin is upper left 110: 16(int) Constant 1 111: TypePointer Function 6(float) 118: TypePointer Output 7(fvec4) - 119(Color): 118(ptr) Variable Output +119(@entryPointOutput.Color): 118(ptr) Variable Output 122: TypePointer Output 6(float) -123(@entryPointOutput_Depth): 122(ptr) Variable Output +123(@entryPointOutput.Depth): 122(ptr) Variable Output 126: TypeSampler 127: TypePointer UniformConstant 126 128(g_sSamp): 127(ptr) Variable UniformConstant @@ -632,10 +632,10 @@ gl_FragCoord origin is upper left Store 116(flattenTemp) 117 120: 108(ptr) AccessChain 116(flattenTemp) 105 121: 7(fvec4) Load 120 - Store 119(Color) 121 + Store 119(@entryPointOutput.Color) 121 124: 111(ptr) AccessChain 116(flattenTemp) 110 125: 6(float) Load 124 - Store 123(@entryPointOutput_Depth) 125 + Store 123(@entryPointOutput.Depth) 125 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out index 3e748cc2..fa66acca 100644 --- a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out @@ -40,7 +40,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:22 Sequence 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:22 Color: direct index for structure ( temp 4-component vector of float) 0:22 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:22 Constant: @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -97,7 +97,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:22 Sequence 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:22 Color: direct index for structure ( temp 4-component vector of float) 0:22 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:22 Constant: @@ -107,7 +107,7 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -138,7 +138,7 @@ gl_FragCoord origin is upper left Name 31 "g_tBuffU" Name 39 "g_tBuffI" Name 45 "psout" - Name 54 "Color" + Name 54 "@entryPointOutput.Color" Decorate 14(g_tBuffF) DescriptorSet 0 MemberDecorate 20($Global) 0 Offset 0 MemberDecorate 20($Global) 1 Offset 8 @@ -152,7 +152,7 @@ gl_FragCoord origin is upper left Decorate 22 DescriptorSet 0 Decorate 31(g_tBuffU) DescriptorSet 0 Decorate 39(g_tBuffI) DescriptorSet 0 - Decorate 54(Color) Location 0 + Decorate 54(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -184,12 +184,12 @@ gl_FragCoord origin is upper left 47: 7(fvec4) ConstantComposite 46 46 46 46 48: TypePointer Function 7(fvec4) 53: TypePointer Output 7(fvec4) - 54(Color): 53(ptr) Variable Output +54(@entryPointOutput.Color): 53(ptr) Variable Output 4(main): 2 Function None 3 5: Label 55:8(PS_OUTPUT) FunctionCall 10(@main() 56: 7(fvec4) CompositeExtract 55 0 - Store 54(Color) 56 + Store 54(@entryPointOutput.Color) 56 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out index c6964c39..99070b70 100644 --- a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out @@ -68,13 +68,13 @@ gl_FragCoord origin is upper left 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:40 Color: direct index for structure ( temp 4-component vector of float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -97,8 +97,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -173,13 +173,13 @@ gl_FragCoord origin is upper left 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:40 Color: direct index for structure ( temp 4-component vector of float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -202,8 +202,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -239,8 +239,8 @@ gl_FragCoord origin is upper left Name 62 "g_tTex2du4a" Name 68 "psout" Name 79 "flattenTemp" - Name 82 "Color" - Name 86 "@entryPointOutput_Depth" + Name 82 "@entryPointOutput.Color" + Name 86 "@entryPointOutput.Depth" Name 91 "g_sSamp" Name 94 "g_tTex1df4" Name 97 "g_tTex1di4" @@ -267,8 +267,8 @@ gl_FragCoord origin is upper left Decorate 46(g_tTex2df4a) DescriptorSet 0 Decorate 55(g_tTex2di4a) DescriptorSet 0 Decorate 62(g_tTex2du4a) DescriptorSet 0 - Decorate 82(Color) Location 0 - Decorate 86(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 82(@entryPointOutput.Color) Location 0 + Decorate 86(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 91(g_sSamp) DescriptorSet 0 Decorate 91(g_sSamp) Binding 0 Decorate 94(g_tTex1df4) DescriptorSet 0 @@ -325,9 +325,9 @@ gl_FragCoord origin is upper left 72: TypePointer Function 7(fvec4) 74: TypePointer Function 6(float) 81: TypePointer Output 7(fvec4) - 82(Color): 81(ptr) Variable Output +82(@entryPointOutput.Color): 81(ptr) Variable Output 85: TypePointer Output 6(float) -86(@entryPointOutput_Depth): 85(ptr) Variable Output +86(@entryPointOutput.Depth): 85(ptr) Variable Output 89: TypeSampler 90: TypePointer UniformConstant 89 91(g_sSamp): 90(ptr) Variable UniformConstant @@ -365,10 +365,10 @@ gl_FragCoord origin is upper left Store 79(flattenTemp) 80 83: 72(ptr) AccessChain 79(flattenTemp) 69 84: 7(fvec4) Load 83 - Store 82(Color) 84 + Store 82(@entryPointOutput.Color) 84 87: 74(ptr) AccessChain 79(flattenTemp) 23 88: 6(float) Load 87 - Store 86(@entryPointOutput_Depth) 88 + Store 86(@entryPointOutput.Depth) 88 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out index 9623c418..6c9e2c01 100644 --- a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out @@ -86,13 +86,13 @@ gl_FragCoord origin is upper left 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:40 Color: direct index for structure ( temp 4-component vector of float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -115,8 +115,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -209,13 +209,13 @@ gl_FragCoord origin is upper left 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:40 Color: direct index for structure ( temp 4-component vector of float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -238,8 +238,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -278,8 +278,8 @@ gl_FragCoord origin is upper left Name 85 "g_tTex3du4" Name 91 "psout" Name 101 "flattenTemp" - Name 104 "Color" - Name 108 "@entryPointOutput_Depth" + Name 104 "@entryPointOutput.Color" + Name 108 "@entryPointOutput.Depth" Name 113 "g_sSamp" Name 116 "g_tTex1df4a" Name 119 "g_tTex1di4a" @@ -307,8 +307,8 @@ gl_FragCoord origin is upper left Decorate 69(g_tTex3df4) DescriptorSet 0 Decorate 78(g_tTex3di4) DescriptorSet 0 Decorate 85(g_tTex3du4) DescriptorSet 0 - Decorate 104(Color) Location 0 - Decorate 108(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 104(@entryPointOutput.Color) Location 0 + Decorate 108(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 113(g_sSamp) DescriptorSet 0 Decorate 113(g_sSamp) Binding 0 Decorate 116(g_tTex1df4a) DescriptorSet 0 @@ -371,9 +371,9 @@ gl_FragCoord origin is upper left 94: TypePointer Function 7(fvec4) 96: TypePointer Function 6(float) 103: TypePointer Output 7(fvec4) - 104(Color): 103(ptr) Variable Output +104(@entryPointOutput.Color): 103(ptr) Variable Output 107: TypePointer Output 6(float) -108(@entryPointOutput_Depth): 107(ptr) Variable Output +108(@entryPointOutput.Depth): 107(ptr) Variable Output 111: TypeSampler 112: TypePointer UniformConstant 111 113(g_sSamp): 112(ptr) Variable UniformConstant @@ -402,10 +402,10 @@ gl_FragCoord origin is upper left Store 101(flattenTemp) 102 105: 94(ptr) AccessChain 101(flattenTemp) 23 106: 7(fvec4) Load 105 - Store 104(Color) 106 + Store 104(@entryPointOutput.Color) 106 109: 96(ptr) AccessChain 101(flattenTemp) 48 110: 6(float) Load 109 - Store 108(@entryPointOutput_Depth) 110 + Store 108(@entryPointOutput.Depth) 110 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.logical.binary.frag.out b/Test/baseResults/hlsl.logical.binary.frag.out index 730205bd..1df6ae45 100644 --- a/Test/baseResults/hlsl.logical.binary.frag.out +++ b/Test/baseResults/hlsl.logical.binary.frag.out @@ -52,14 +52,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Sequence 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:12 Color: direct index for structure ( temp 4-component vector of float) 0:12 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:12 Constant: 0:12 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -118,14 +118,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Sequence 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:12 Color: direct index for structure ( temp 4-component vector of float) 0:12 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:12 Constant: 0:12 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -148,14 +148,14 @@ gl_FragCoord origin is upper left MemberName 14($Global) 3 "fval4" Name 16 "" Name 45 "psout" - Name 54 "Color" + Name 54 "@entryPointOutput.Color" MemberDecorate 14($Global) 0 Offset 0 MemberDecorate 14($Global) 1 Offset 16 MemberDecorate 14($Global) 2 Offset 32 MemberDecorate 14($Global) 3 Offset 48 Decorate 14($Global) Block Decorate 16 DescriptorSet 0 - Decorate 54(Color) Location 0 + Decorate 54(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -179,12 +179,12 @@ gl_FragCoord origin is upper left 47: 7(fvec4) ConstantComposite 46 46 46 46 48: TypePointer Function 7(fvec4) 53: TypePointer Output 7(fvec4) - 54(Color): 53(ptr) Variable Output +54(@entryPointOutput.Color): 53(ptr) Variable Output 4(main): 2 Function None 3 5: Label 55:8(PS_OUTPUT) FunctionCall 10(@main() 56: 7(fvec4) CompositeExtract 55 0 - Store 54(Color) 56 + Store 54(@entryPointOutput.Color) 56 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.logical.binary.vec.frag.out b/Test/baseResults/hlsl.logical.binary.vec.frag.out index 8243814b..53fa2c17 100644 --- a/Test/baseResults/hlsl.logical.binary.vec.frag.out +++ b/Test/baseResults/hlsl.logical.binary.vec.frag.out @@ -115,14 +115,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of bool b4a, uniform 4-component vector of bool b4b, uniform bool b1a, uniform bool b1b}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -244,14 +244,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of bool b4a, uniform 4-component vector of bool b4b, uniform bool b1a, uniform bool b1b}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -281,14 +281,14 @@ gl_FragCoord origin is upper left Name 67 "r20" Name 77 "r21" Name 87 "psout" - Name 112 "Color" + Name 112 "@entryPointOutput.Color" MemberDecorate 18($Global) 0 Offset 0 MemberDecorate 18($Global) 1 Offset 16 MemberDecorate 18($Global) 2 Offset 32 MemberDecorate 18($Global) 3 Offset 36 Decorate 18($Global) Block Decorate 20 DescriptorSet 0 - Decorate 112(Color) Location 0 + Decorate 112(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -319,12 +319,12 @@ gl_FragCoord origin is upper left 104: 7(fvec4) ConstantComposite 102 102 102 102 106: TypePointer Function 7(fvec4) 111: TypePointer Output 7(fvec4) - 112(Color): 111(ptr) Variable Output +112(@entryPointOutput.Color): 111(ptr) Variable Output 4(main): 2 Function None 3 5: Label 113:8(PS_OUTPUT) FunctionCall 10(@main() 114: 7(fvec4) CompositeExtract 113 0 - Store 112(Color) 114 + Store 112(@entryPointOutput.Color) 114 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.logical.unary.frag.out b/Test/baseResults/hlsl.logical.unary.frag.out index 7121d925..a27b0bdb 100644 --- a/Test/baseResults/hlsl.logical.unary.frag.out +++ b/Test/baseResults/hlsl.logical.unary.frag.out @@ -80,14 +80,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Sequence 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:12 Color: direct index for structure ( temp 4-component vector of float) 0:12 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:12 Constant: 0:12 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -174,14 +174,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:12 Sequence 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:12 Color: direct index for structure ( temp 4-component vector of float) 0:12 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:12 Constant: 0:12 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -204,14 +204,14 @@ gl_FragCoord origin is upper left MemberName 14($Global) 3 "fval4" Name 16 "" Name 72 "psout" - Name 81 "Color" + Name 81 "@entryPointOutput.Color" MemberDecorate 14($Global) 0 Offset 0 MemberDecorate 14($Global) 1 Offset 16 MemberDecorate 14($Global) 2 Offset 32 MemberDecorate 14($Global) 3 Offset 48 Decorate 14($Global) Block Decorate 16 DescriptorSet 0 - Decorate 81(Color) Location 0 + Decorate 81(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -244,12 +244,12 @@ gl_FragCoord origin is upper left 74: 7(fvec4) ConstantComposite 73 73 73 73 75: TypePointer Function 7(fvec4) 80: TypePointer Output 7(fvec4) - 81(Color): 80(ptr) Variable Output +81(@entryPointOutput.Color): 80(ptr) Variable Output 4(main): 2 Function None 3 5: Label 82:8(PS_OUTPUT) FunctionCall 10(@main() 83: 7(fvec4) CompositeExtract 82 0 - Store 81(Color) 83 + Store 81(@entryPointOutput.Color) 83 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.matNx1.frag.out b/Test/baseResults/hlsl.matNx1.frag.out index 0360db49..f3b5dd23 100644 --- a/Test/baseResults/hlsl.matNx1.frag.out +++ b/Test/baseResults/hlsl.matNx1.frag.out @@ -65,13 +65,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:27 color: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:27 Constant: 0:27 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -143,13 +143,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:27 color: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:27 Constant: 0:27 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -182,8 +182,8 @@ gl_FragCoord origin is upper left Name 58 "r13" Name 59 "f1x4" Name 63 "ps_output" - Name 74 "color" - Decorate 74(color) Location 0 + Name 74 "@entryPointOutput.color" + Decorate 74(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 8: TypeFloat 32 @@ -214,12 +214,12 @@ gl_FragCoord origin is upper left 67: 9(fvec4) ConstantComposite 66 66 66 66 68: TypePointer Function 9(fvec4) 73: TypePointer Output 9(fvec4) - 74(color): 73(ptr) Variable Output +74(@entryPointOutput.color): 73(ptr) Variable Output 4(main): 2 Function None 3 5: Label 75:10(PS_OUTPUT) FunctionCall 12(@main() 76: 9(fvec4) CompositeExtract 75 0 - Store 74(color) 76 + Store 74(@entryPointOutput.color) 76 Return FunctionEnd 6(TestMatNx1(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.matType.bool.frag.out b/Test/baseResults/hlsl.matType.bool.frag.out index 3f261a33..894f203c 100644 --- a/Test/baseResults/hlsl.matType.bool.frag.out +++ b/Test/baseResults/hlsl.matType.bool.frag.out @@ -105,13 +105,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:49 Sequence 0:49 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:49 color: direct index for structure ( temp 4-component vector of float) 0:49 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:49 Constant: 0:49 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -223,13 +223,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:49 Sequence 0:49 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:49 color: direct index for structure ( temp 4-component vector of float) 0:49 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:49 Constant: 0:49 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -279,8 +279,8 @@ gl_FragCoord origin is upper left Name 111 "r33" Name 112 "b4x4" Name 116 "ps_output" - Name 127 "color" - Decorate 127(color) Location 0 + Name 127 "@entryPointOutput.color" + Decorate 127(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 8: TypeFloat 32 @@ -331,12 +331,12 @@ gl_FragCoord origin is upper left 120: 9(fvec4) ConstantComposite 119 119 119 119 121: TypePointer Function 9(fvec4) 126: TypePointer Output 9(fvec4) - 127(color): 126(ptr) Variable Output +127(@entryPointOutput.color): 126(ptr) Variable Output 4(main): 2 Function None 3 5: Label 128:10(PS_OUTPUT) FunctionCall 12(@main() 129: 9(fvec4) CompositeExtract 128 0 - Store 127(color) 129 + Store 127(@entryPointOutput.color) 129 Return FunctionEnd 6(TestBoolMatTypes(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.matType.int.frag.out b/Test/baseResults/hlsl.matType.int.frag.out index 602f068f..7aa3a5de 100644 --- a/Test/baseResults/hlsl.matType.int.frag.out +++ b/Test/baseResults/hlsl.matType.int.frag.out @@ -188,13 +188,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:93 Sequence 0:93 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:93 color: direct index for structure ( temp 4-component vector of float) 0:93 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:93 Constant: 0:93 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -389,13 +389,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:93 Sequence 0:93 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:93 color: direct index for structure ( temp 4-component vector of float) 0:93 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:93 Constant: 0:93 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -478,8 +478,8 @@ gl_FragCoord origin is upper left Name 214 "r33" Name 215 "u4x4" Name 219 "ps_output" - Name 229 "color" - Decorate 229(color) Location 0 + Name 229 "@entryPointOutput.color" + Decorate 229(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 10: TypeFloat 32 @@ -566,12 +566,12 @@ gl_FragCoord origin is upper left 222: 11(fvec4) ConstantComposite 221 221 221 221 223: TypePointer Function 11(fvec4) 228: TypePointer Output 11(fvec4) - 229(color): 228(ptr) Variable Output +229(@entryPointOutput.color): 228(ptr) Variable Output 4(main): 2 Function None 3 5: Label 230:12(PS_OUTPUT) FunctionCall 14(@main() 231: 11(fvec4) CompositeExtract 230 0 - Store 229(color) 231 + Store 229(@entryPointOutput.color) 231 Return FunctionEnd 6(TestIntMatTypes(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out index 9741c5d1..c5c96a38 100644 --- a/Test/baseResults/hlsl.matrixindex.frag.out +++ b/Test/baseResults/hlsl.matrixindex.frag.out @@ -124,14 +124,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int idx, uniform 3X2 matrix of float um}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -262,14 +262,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:10 Sequence 0:10 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:10 Color: direct index for structure ( temp 4-component vector of float) 0:10 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:10 Constant: 0:10 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int idx, uniform 3X2 matrix of float um}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -308,14 +308,14 @@ gl_FragCoord origin is upper left Name 60 "indexable" Name 63 "r0c" Name 71 "psout" - Name 80 "Color" + Name 80 "@entryPointOutput.Color" MemberDecorate 52($Global) 0 Offset 0 MemberDecorate 52($Global) 1 RowMajor MemberDecorate 52($Global) 1 Offset 16 MemberDecorate 52($Global) 1 MatrixStride 16 Decorate 52($Global) Block Decorate 54 DescriptorSet 0 - Decorate 80(Color) Location 0 + Decorate 80(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -357,12 +357,12 @@ gl_FragCoord origin is upper left 70: TypePointer Function 8(PS_OUTPUT) 74: TypePointer Function 7(fvec4) 79: TypePointer Output 7(fvec4) - 80(Color): 79(ptr) Variable Output +80(@entryPointOutput.Color): 79(ptr) Variable Output 4(main): 2 Function None 3 5: Label 81:8(PS_OUTPUT) FunctionCall 10(@main() 82: 7(fvec4) CompositeExtract 81 0 - Store 80(Color) 82 + Store 80(@entryPointOutput.Color) 82 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.mintypes.frag.out b/Test/baseResults/hlsl.mintypes.frag.out index 1cbd477a..74bb6559 100644 --- a/Test/baseResults/hlsl.mintypes.frag.out +++ b/Test/baseResults/hlsl.mintypes.frag.out @@ -37,14 +37,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:9 Sequence 0:9 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:9 Color: direct index for structure ( temp 4-component vector of float) 0:9 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:9 Constant: 0:9 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform mediump float b1a, uniform mediump float b1b}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -88,14 +88,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:9 Sequence 0:9 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:9 Color: direct index for structure ( temp 4-component vector of float) 0:9 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:9 Constant: 0:9 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform mediump float b1a, uniform mediump float b1b}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -122,7 +122,7 @@ gl_FragCoord origin is upper left Name 46 "mu16_2" Name 49 "mu16" Name 54 "psout" - Name 64 "Color" + Name 64 "@entryPointOutput.Color" Name 67 "$Global" MemberName 67($Global) 0 "b1a" MemberName 67($Global) 1 "b1b" @@ -157,7 +157,7 @@ gl_FragCoord origin is upper left Decorate 50 RelaxedPrecision Decorate 51 RelaxedPrecision Decorate 52 RelaxedPrecision - Decorate 64(Color) Location 0 + Decorate 64(@entryPointOutput.Color) Location 0 MemberDecorate 67($Global) 0 RelaxedPrecision MemberDecorate 67($Global) 0 Offset 0 MemberDecorate 67($Global) 1 RelaxedPrecision @@ -187,7 +187,7 @@ gl_FragCoord origin is upper left 57: 7(fvec4) ConstantComposite 56 56 56 56 58: TypePointer Function 7(fvec4) 63: TypePointer Output 7(fvec4) - 64(Color): 63(ptr) Variable Output +64(@entryPointOutput.Color): 63(ptr) Variable Output 67($Global): TypeStruct 6(float) 6(float) 68: TypePointer Uniform 67($Global) 69: 68(ptr) Variable Uniform @@ -195,7 +195,7 @@ gl_FragCoord origin is upper left 5: Label 65:8(PS_OUTPUT) FunctionCall 10(@main() 66: 7(fvec4) CompositeExtract 65 0 - Store 64(Color) 66 + Store 64(@entryPointOutput.Color) 66 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.multiDescriptorSet.frag.out b/Test/baseResults/hlsl.multiDescriptorSet.frag.out index c6fb83f9..17e88237 100644 --- a/Test/baseResults/hlsl.multiDescriptorSet.frag.out +++ b/Test/baseResults/hlsl.multiDescriptorSet.frag.out @@ -29,7 +29,7 @@ hlsl.multiDescriptorSet.frag Name 59 "txDiffuseA" Name 63 "samLinearA" Name 76 "input" - Name 78 "input_Pos" + Name 78 "input.Pos" Name 81 "PS_INPUT" MemberName 81(PS_INPUT) 0 "Tex" Name 83 "input" @@ -60,7 +60,7 @@ hlsl.multiDescriptorSet.frag Decorate 59(txDiffuseA) Binding 0 Decorate 63(samLinearA) DescriptorSet 0 Decorate 63(samLinearA) Binding 1 - Decorate 78(input_Pos) BuiltIn FragCoord + Decorate 78(input.Pos) BuiltIn FragCoord Decorate 83(input) Location 0 Decorate 89(@entryPointOutput) Location 0 Decorate 93(txDiffuseB) DescriptorSet 1 @@ -104,7 +104,7 @@ hlsl.multiDescriptorSet.frag 65: TypeSampledImage 57 70: TypePointer Uniform 7(fvec4) 77: TypePointer Input 7(fvec4) - 78(input_Pos): 77(ptr) Variable Input + 78(input.Pos): 77(ptr) Variable Input 81(PS_INPUT): TypeStruct 8(fvec2) 82: TypePointer Input 81(PS_INPUT) 83(input): 82(ptr) Variable Input @@ -117,7 +117,7 @@ hlsl.multiDescriptorSet.frag 5: Label 76(input): 10(ptr) Variable Function 90(param): 10(ptr) Variable Function - 79: 7(fvec4) Load 78(input_Pos) + 79: 7(fvec4) Load 78(input.Pos) 80: 29(ptr) AccessChain 76(input) 21 Store 80 79 85: 84(ptr) AccessChain 83(input) 21 diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index ee25cb36..6b7b88cb 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -85,13 +85,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:5 Sequence 0:5 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:5 color: direct index for structure ( temp 4-component vector of float) 0:5 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:5 Constant: 0:5 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -183,13 +183,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:5 Sequence 0:5 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:5 color: direct index for structure ( temp 4-component vector of float) 0:5 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:5 Constant: 0:5 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -219,8 +219,8 @@ gl_FragCoord origin is upper left Name 36 "r11" Name 38 "r12" Name 40 "ps_output" - Name 51 "color" - Decorate 51(color) Location 0 + Name 51 "@entryPointOutput.color" + Decorate 51(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -245,12 +245,12 @@ gl_FragCoord origin is upper left 41: 24(int) Constant 0 45: TypePointer Function 7(fvec4) 50: TypePointer Output 7(fvec4) - 51(color): 50(ptr) Variable Output +51(@entryPointOutput.color): 50(ptr) Variable Output 4(main): 2 Function None 3 5: Label 52:8(PS_OUTPUT) FunctionCall 10(@main() 53: 7(fvec4) CompositeExtract 52 0 - Store 51(color) 53 + Store 51(@entryPointOutput.color) 53 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.partialInit.frag.out b/Test/baseResults/hlsl.partialInit.frag.out index b3267997..db70518e 100755 --- a/Test/baseResults/hlsl.partialInit.frag.out +++ b/Test/baseResults/hlsl.partialInit.frag.out @@ -157,25 +157,25 @@ gl_FragCoord origin is upper left 0:18 Function Call: @PixelShaderFunction(vf4; ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:? 'input' ( temp 4-component vector of float) 0:18 move second child to first child ( temp int) -0:? 'a' (layout( location=0) out int) +0:? '@entryPointOutput.a' (layout( location=0) out int) 0:18 a: direct index for structure ( temp int) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 0 (const int) 0:18 move second child to first child ( temp float) -0:? 'b' (layout( location=1) out float) +0:? '@entryPointOutput.b' (layout( location=1) out float) 0:18 b: direct index for structure ( temp float) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 1 (const int) 0:18 move second child to first child ( temp bool) -0:? 'c' (layout( location=2) out bool) +0:? '@entryPointOutput.c' (layout( location=2) out bool) 0:18 c: direct index for structure ( temp bool) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 2 (const int) 0:18 move second child to first child ( temp 4-component vector of float) -0:? 'v' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.v' (layout( location=3) out 4-component vector of float) 0:18 v: direct index for structure ( temp 4-component vector of float) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: @@ -183,10 +183,10 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'gv' ( global 4-component vector of float) 0:? 'gfa' ( global 3-element array of float) -0:? 'a' (layout( location=0) out int) -0:? 'b' (layout( location=1) out float) -0:? 'c' (layout( location=2) out bool) -0:? 'v' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.a' (layout( location=0) out int) +0:? '@entryPointOutput.b' (layout( location=1) out float) +0:? '@entryPointOutput.c' (layout( location=2) out bool) +0:? '@entryPointOutput.v' (layout( location=3) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) 0:? 'cgf2a' ( const 3-element array of 2-component vector of float) 0:? 0.000000 @@ -357,25 +357,25 @@ gl_FragCoord origin is upper left 0:18 Function Call: @PixelShaderFunction(vf4; ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:? 'input' ( temp 4-component vector of float) 0:18 move second child to first child ( temp int) -0:? 'a' (layout( location=0) out int) +0:? '@entryPointOutput.a' (layout( location=0) out int) 0:18 a: direct index for structure ( temp int) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 0 (const int) 0:18 move second child to first child ( temp float) -0:? 'b' (layout( location=1) out float) +0:? '@entryPointOutput.b' (layout( location=1) out float) 0:18 b: direct index for structure ( temp float) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 1 (const int) 0:18 move second child to first child ( temp bool) -0:? 'c' (layout( location=2) out bool) +0:? '@entryPointOutput.c' (layout( location=2) out bool) 0:18 c: direct index for structure ( temp bool) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: 0:18 2 (const int) 0:18 move second child to first child ( temp 4-component vector of float) -0:? 'v' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.v' (layout( location=3) out 4-component vector of float) 0:18 v: direct index for structure ( temp 4-component vector of float) 0:18 'flattenTemp' ( temp structure{ temp int a, temp float b, temp bool c, temp 4-component vector of float v}) 0:18 Constant: @@ -383,10 +383,10 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'gv' ( global 4-component vector of float) 0:? 'gfa' ( global 3-element array of float) -0:? 'a' (layout( location=0) out int) -0:? 'b' (layout( location=1) out float) -0:? 'c' (layout( location=2) out bool) -0:? 'v' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.a' (layout( location=0) out int) +0:? '@entryPointOutput.b' (layout( location=1) out float) +0:? '@entryPointOutput.c' (layout( location=2) out bool) +0:? '@entryPointOutput.v' (layout( location=3) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) 0:? 'cgf2a' ( const 3-element array of 2-component vector of float) 0:? 0.000000 @@ -433,15 +433,15 @@ gl_FragCoord origin is upper left Name 80 "input" Name 82 "flattenTemp" Name 83 "param" - Name 87 "a" - Name 91 "b" - Name 95 "c" - Name 99 "v" + Name 87 "@entryPointOutput.a" + Name 91 "@entryPointOutput.b" + Name 95 "@entryPointOutput.c" + Name 99 "@entryPointOutput.v" Decorate 80(input) Location 0 - Decorate 87(a) Location 0 - Decorate 91(b) Location 1 - Decorate 95(c) Location 2 - Decorate 99(v) Location 3 + Decorate 87(@entryPointOutput.a) Location 0 + Decorate 91(@entryPointOutput.b) Location 1 + Decorate 95(@entryPointOutput.c) Location 2 + Decorate 99(@entryPointOutput.v) Location 3 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -492,13 +492,13 @@ gl_FragCoord origin is upper left 79: TypePointer Input 7(fvec4) 80(input): 79(ptr) Variable Input 86: TypePointer Output 9(int) - 87(a): 86(ptr) Variable Output +87(@entryPointOutput.a): 86(ptr) Variable Output 90: TypePointer Output 6(float) - 91(b): 90(ptr) Variable Output +91(@entryPointOutput.b): 90(ptr) Variable Output 94: TypePointer Output 10(bool) - 95(c): 94(ptr) Variable Output +95(@entryPointOutput.c): 94(ptr) Variable Output 98: TypePointer Output 7(fvec4) - 99(v): 98(ptr) Variable Output +99(@entryPointOutput.v): 98(ptr) Variable Output 102: TypeArray 57(fvec2) 22 103: 102 ConstantComposite 62 62 62 4(PixelShaderFunction): 2 Function None 3 @@ -516,16 +516,16 @@ gl_FragCoord origin is upper left Store 82(flattenTemp) 85 88: 64(ptr) AccessChain 82(flattenTemp) 42 89: 9(int) Load 88 - Store 87(a) 89 + Store 87(@entryPointOutput.a) 89 92: 68(ptr) AccessChain 82(flattenTemp) 66 93: 6(float) Load 92 - Store 91(b) 93 + Store 91(@entryPointOutput.b) 93 96: 45(ptr) AccessChain 82(flattenTemp) 35 97: 10(bool) Load 96 - Store 95(c) 97 + Store 95(@entryPointOutput.c) 97 100: 8(ptr) AccessChain 82(flattenTemp) 29 101: 7(fvec4) Load 100 - Store 99(v) 101 + Store 99(@entryPointOutput.v) 101 Return FunctionEnd 14(@PixelShaderFunction(vf4;): 11(outs) Function None 12 diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 7b9f2e65..638e7b06 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -41,20 +41,20 @@ gl_FragCoord origin is upper left 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:4 Color: direct index for structure ( temp 4-component vector of float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 0 (const int) 0:4 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:4 Depth: direct index for structure ( temp float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -102,20 +102,20 @@ gl_FragCoord origin is upper left 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:4 Color: direct index for structure ( temp 4-component vector of float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 0 (const int) 0:4 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:4 Depth: direct index for structure ( temp float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -135,10 +135,10 @@ gl_FragCoord origin is upper left Name 14 "thisLineIs" Name 17 "psout" Name 32 "flattenTemp" - Name 35 "Color" - Name 39 "@entryPointOutput_Depth" - Decorate 35(Color) Location 0 - Decorate 39(@entryPointOutput_Depth) BuiltIn FragDepth + Name 35 "@entryPointOutput.Color" + Name 39 "@entryPointOutput.Depth" + Decorate 35(@entryPointOutput.Color) Location 0 + Decorate 39(@entryPointOutput.Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -156,9 +156,9 @@ gl_FragCoord origin is upper left 26: 12(int) Constant 1 27: TypePointer Function 6(float) 34: TypePointer Output 7(fvec4) - 35(Color): 34(ptr) Variable Output +35(@entryPointOutput.Color): 34(ptr) Variable Output 38: TypePointer Output 6(float) -39(@entryPointOutput_Depth): 38(ptr) Variable Output +39(@entryPointOutput.Depth): 38(ptr) Variable Output 4(main): 2 Function None 3 5: Label 32(flattenTemp): 16(ptr) Variable Function @@ -166,10 +166,10 @@ gl_FragCoord origin is upper left Store 32(flattenTemp) 33 36: 24(ptr) AccessChain 32(flattenTemp) 18 37: 7(fvec4) Load 36 - Store 35(Color) 37 + Store 35(@entryPointOutput.Color) 37 40: 27(ptr) AccessChain 32(flattenTemp) 26 41: 6(float) Load 40 - Store 39(@entryPointOutput_Depth) 41 + Store 39(@entryPointOutput.Depth) 41 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index 442f6c28..72f9cece 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -26,14 +26,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:9 Sequence 0:9 move second child to first child ( noContraction temp 4-component vector of float) -0:? 'color' (layout( location=0) noContraction out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) noContraction out 4-component vector of float) 0:9 color: direct index for structure ( noContraction temp 4-component vector of float) 0:9 Function Call: @main( ( temp structure{ noContraction temp 4-component vector of float color}) 0:9 Constant: 0:9 0 (const int) 0:? Linker Objects 0:? 'precisefloat' ( noContraction global float) -0:? 'color' (layout( location=0) noContraction out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) noContraction out 4-component vector of float) Linked fragment stage: @@ -66,14 +66,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:9 Sequence 0:9 move second child to first child ( noContraction temp 4-component vector of float) -0:? 'color' (layout( location=0) noContraction out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) noContraction out 4-component vector of float) 0:9 color: direct index for structure ( noContraction temp 4-component vector of float) 0:9 Function Call: @main( ( temp structure{ noContraction temp 4-component vector of float color}) 0:9 Constant: 0:9 0 (const int) 0:? Linker Objects 0:? 'precisefloat' ( noContraction global float) -0:? 'color' (layout( location=0) noContraction out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) noContraction out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -93,9 +93,9 @@ gl_FragCoord origin is upper left MemberName 16(PS_OUTPUT) 0 "color" Name 18 "@main(" Name 21 "ps_output" - Name 32 "color" + Name 32 "@entryPointOutput.color" Name 36 "precisefloat" - Decorate 32(color) Location 0 + Decorate 32(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -113,14 +113,14 @@ gl_FragCoord origin is upper left 25: 15(fvec4) ConstantComposite 24 24 24 24 26: TypePointer Function 15(fvec4) 31: TypePointer Output 15(fvec4) - 32(color): 31(ptr) Variable Output +32(@entryPointOutput.color): 31(ptr) Variable Output 35: TypePointer Private 6(float) 36(precisefloat): 35(ptr) Variable Private 4(main): 2 Function None 3 5: Label 33:16(PS_OUTPUT) FunctionCall 18(@main() 34: 15(fvec4) CompositeExtract 33 0 - Store 32(color) 34 + Store 32(@entryPointOutput.color) 34 Return FunctionEnd 13(MyFunction(f1;vf3;): 2 Function None 10 diff --git a/Test/baseResults/hlsl.promote.binary.frag.out b/Test/baseResults/hlsl.promote.binary.frag.out index 09c1f93a..50ba6441 100644 --- a/Test/baseResults/hlsl.promote.binary.frag.out +++ b/Test/baseResults/hlsl.promote.binary.frag.out @@ -74,14 +74,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:14 Sequence 0:14 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:14 Color: direct index for structure ( temp 4-component vector of float) 0:14 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:14 Constant: 0:14 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform bool bval, uniform 4-component vector of bool bval4, uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -162,14 +162,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:14 Sequence 0:14 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:14 Color: direct index for structure ( temp 4-component vector of float) 0:14 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:14 Constant: 0:14 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform bool bval, uniform 4-component vector of bool bval4, uniform int ival, uniform 4-component vector of int ival4, uniform float fval, uniform 4-component vector of float fval4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -195,7 +195,7 @@ gl_FragCoord origin is upper left Name 18 "" Name 66 "l_int" Name 73 "psout" - Name 80 "Color" + Name 80 "@entryPointOutput.Color" MemberDecorate 16($Global) 0 Offset 0 MemberDecorate 16($Global) 1 Offset 16 MemberDecorate 16($Global) 2 Offset 32 @@ -204,7 +204,7 @@ gl_FragCoord origin is upper left MemberDecorate 16($Global) 5 Offset 80 Decorate 16($Global) Block Decorate 18 DescriptorSet 0 - Decorate 80(Color) Location 0 + Decorate 80(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -242,12 +242,12 @@ gl_FragCoord origin is upper left 72: TypePointer Function 8(PS_OUTPUT) 74: TypePointer Function 7(fvec4) 79: TypePointer Output 7(fvec4) - 80(Color): 79(ptr) Variable Output +80(@entryPointOutput.Color): 79(ptr) Variable Output 4(main): 2 Function None 3 5: Label 81:8(PS_OUTPUT) FunctionCall 10(@main() 82: 7(fvec4) CompositeExtract 81 0 - Store 80(Color) 82 + Store 80(@entryPointOutput.Color) 82 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index e1953e0a..6270715f 100644 --- a/Test/baseResults/hlsl.promotions.frag.out +++ b/Test/baseResults/hlsl.promotions.frag.out @@ -779,14 +779,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:52 Sequence 0:52 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:52 Color: direct index for structure ( temp 4-component vector of float) 0:52 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:52 Constant: 0:52 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 3-component vector of int i3, uniform 3-component vector of bool b3, uniform 3-component vector of float f3, uniform 3-component vector of uint u3, uniform 3-component vector of double d3, uniform int is, uniform bool bs, uniform float fs, uniform uint us, uniform double ds}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1572,14 +1572,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:52 Sequence 0:52 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:52 Color: direct index for structure ( temp 4-component vector of float) 0:52 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:52 Constant: 0:52 0 (const int) 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 3-component vector of int i3, uniform 3-component vector of bool b3, uniform 3-component vector of float f3, uniform 3-component vector of uint u3, uniform 3-component vector of double d3, uniform int is, uniform bool bs, uniform float fs, uniform uint us, uniform double ds}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1682,7 +1682,7 @@ gl_FragCoord origin is upper left Name 576 "c2" Name 578 "outval" Name 586 "psout" - Name 593 "Color" + Name 593 "@entryPointOutput.Color" MemberDecorate 111($Global) 0 Offset 0 MemberDecorate 111($Global) 1 Offset 16 MemberDecorate 111($Global) 2 Offset 32 @@ -1695,7 +1695,7 @@ gl_FragCoord origin is upper left MemberDecorate 111($Global) 9 Offset 104 Decorate 111($Global) Block Decorate 113 DescriptorSet 0 - Decorate 593(Color) Location 0 + Decorate 593(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -1766,12 +1766,12 @@ gl_FragCoord origin is upper left 579: 6(float) Constant 1080452710 585: TypePointer Function 107(PS_OUTPUT) 592: TypePointer Output 106(fvec4) - 593(Color): 592(ptr) Variable Output +593(@entryPointOutput.Color): 592(ptr) Variable Output 4(main): 2 Function None 3 5: Label 594:107(PS_OUTPUT) FunctionCall 109(@main() 595: 106(fvec4) CompositeExtract 594 0 - Store 593(Color) 595 + Store 593(@entryPointOutput.Color) 595 Return FunctionEnd 11(Fn_F3(vf3;): 2 Function None 9 diff --git a/Test/baseResults/hlsl.rw.atomics.frag.out b/Test/baseResults/hlsl.rw.atomics.frag.out index 08369c0e..5e7fdb1d 100644 --- a/Test/baseResults/hlsl.rw.atomics.frag.out +++ b/Test/baseResults/hlsl.rw.atomics.frag.out @@ -1942,7 +1942,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:45 Color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:45 Constant: @@ -1968,7 +1968,7 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( r32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( r32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform uint u1, uniform 2-component vector of uint u2, uniform 3-component vector of uint u3, uniform uint u1b, uniform uint u1c, uniform int i1, uniform 2-component vector of int i2, uniform 3-component vector of int i3, uniform int i1b, uniform int i1c}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -3917,7 +3917,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:45 Color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:45 Constant: @@ -3943,7 +3943,7 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( r32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( r32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform uint u1, uniform 2-component vector of uint u2, uniform 3-component vector of uint u3, uniform uint u1b, uniform uint u1c, uniform int i1, uniform 2-component vector of int i2, uniform 3-component vector of int i3, uniform int i1b, uniform int i1c}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -3986,7 +3986,7 @@ gl_FragCoord origin is upper left Name 931 "g_tBuffI" Name 1020 "g_tBuffU" Name 1108 "psout" - Name 1117 "Color" + Name 1117 "@entryPointOutput.Color" Name 1122 "g_sSamp" Name 1125 "g_tTex1df1" Name 1128 "g_tTex2df1" @@ -4018,7 +4018,7 @@ gl_FragCoord origin is upper left Decorate 670(g_tTex1du1a) DescriptorSet 0 Decorate 931(g_tBuffI) DescriptorSet 0 Decorate 1020(g_tBuffU) DescriptorSet 0 - Decorate 1117(Color) Location 0 + Decorate 1117(@entryPointOutput.Color) Location 0 Decorate 1122(g_sSamp) DescriptorSet 0 Decorate 1125(g_tTex1df1) DescriptorSet 0 Decorate 1128(g_tTex2df1) DescriptorSet 0 @@ -4100,7 +4100,7 @@ gl_FragCoord origin is upper left 1110: 7(fvec4) ConstantComposite 1109 1109 1109 1109 1111: TypePointer Function 7(fvec4) 1116: TypePointer Output 7(fvec4) - 1117(Color): 1116(ptr) Variable Output +1117(@entryPointOutput.Color): 1116(ptr) Variable Output 1120: TypeSampler 1121: TypePointer UniformConstant 1120 1122(g_sSamp): 1121(ptr) Variable UniformConstant @@ -4132,7 +4132,7 @@ gl_FragCoord origin is upper left 5: Label 1118:8(PS_OUTPUT) FunctionCall 10(@main() 1119: 7(fvec4) CompositeExtract 1118 0 - Store 1117(Color) 1119 + Store 1117(@entryPointOutput.Color) 1119 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.rw.bracket.frag.out b/Test/baseResults/hlsl.rw.bracket.frag.out index 55264de9..91172653 100644 --- a/Test/baseResults/hlsl.rw.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.bracket.frag.out @@ -844,7 +844,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -867,7 +867,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 4-component vector of float uf4, uniform 4-component vector of int ui4, uniform 4-component vector of uint uu4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1718,7 +1718,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -1741,7 +1741,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 4-component vector of float uf4, uniform 4-component vector of int ui4, uniform 4-component vector of uint uu4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1872,7 +1872,7 @@ gl_FragCoord origin is upper left Name 561 "storeTempPost" Name 569 "storeTemp" Name 576 "psout" - Name 583 "Color" + Name 583 "@entryPointOutput.Color" Name 588 "g_sSamp" Name 591 "g_tTex1df4a" Name 594 "g_tTex1di4a" @@ -1903,7 +1903,7 @@ gl_FragCoord origin is upper left Decorate 131(g_tTex3df4) DescriptorSet 0 Decorate 141(g_tTex3di4) DescriptorSet 0 Decorate 149(g_tTex3du4) DescriptorSet 0 - Decorate 583(Color) Location 0 + Decorate 583(@entryPointOutput.Color) Location 0 Decorate 588(g_sSamp) DescriptorSet 0 Decorate 588(g_sSamp) Binding 0 Decorate 591(g_tTex1df4a) DescriptorSet 0 @@ -2005,7 +2005,7 @@ gl_FragCoord origin is upper left 575: TypePointer Function 42(PS_OUTPUT) 577: 21(fvec4) ConstantComposite 408 408 408 408 582: TypePointer Output 21(fvec4) - 583(Color): 582(ptr) Variable Output +583(@entryPointOutput.Color): 582(ptr) Variable Output 586: TypeSampler 587: TypePointer UniformConstant 586 588(g_sSamp): 587(ptr) Variable UniformConstant @@ -2031,7 +2031,7 @@ gl_FragCoord origin is upper left 5: Label 584:42(PS_OUTPUT) FunctionCall 44(@main() 585: 21(fvec4) CompositeExtract 584 0 - Store 583(Color) 585 + Store 583(@entryPointOutput.Color) 585 Return FunctionEnd 11(Fn1(vi4;): 7(ivec4) Function None 9 diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out index 525c6aaa..237303c4 100644 --- a/Test/baseResults/hlsl.rw.register.frag.out +++ b/Test/baseResults/hlsl.rw.register.frag.out @@ -36,7 +36,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:11 Color: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:11 Constant: @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'g_tTex1df1' (layout( binding=2 r32f) uniform image1D) 0:? 'g_tBuf1du1' (layout( binding=3 r32ui) uniform uimageBuffer) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -87,7 +87,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:11 Sequence 0:11 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:11 Color: direct index for structure ( temp 4-component vector of float) 0:11 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:11 Constant: @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'g_tTex1df1' (layout( binding=2 r32f) uniform image1D) 0:? 'g_tBuf1du1' (layout( binding=3 r32ui) uniform uimageBuffer) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -118,12 +118,12 @@ gl_FragCoord origin is upper left Name 23 "r01" Name 26 "g_tBuf1du1" Name 30 "psout" - Name 39 "Color" + Name 39 "@entryPointOutput.Color" Decorate 16(g_tTex1df1) DescriptorSet 0 Decorate 16(g_tTex1df1) Binding 2 Decorate 26(g_tBuf1du1) DescriptorSet 0 Decorate 26(g_tBuf1du1) Binding 3 - Decorate 39(Color) Location 0 + Decorate 39(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -146,12 +146,12 @@ gl_FragCoord origin is upper left 32: 7(fvec4) ConstantComposite 31 31 31 31 33: TypePointer Function 7(fvec4) 38: TypePointer Output 7(fvec4) - 39(Color): 38(ptr) Variable Output +39(@entryPointOutput.Color): 38(ptr) Variable Output 4(main): 2 Function None 3 5: Label 40:8(PS_OUTPUT) FunctionCall 10(@main() 41: 7(fvec4) CompositeExtract 40 0 - Store 39(Color) 41 + Store 39(@entryPointOutput.Color) 41 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out index e0e88d18..da7a5a11 100644 --- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out @@ -817,7 +817,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -840,7 +840,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di1a' (layout( r32i) uniform iimage2DArray) 0:? 'g_tTex2du1a' (layout( r32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform float uf1, uniform int ui1, uniform uint uu1}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1664,7 +1664,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -1687,7 +1687,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di1a' (layout( r32i) uniform iimage2DArray) 0:? 'g_tTex2du1a' (layout( r32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform float uf1, uniform int ui1, uniform uint uu1}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1818,7 +1818,7 @@ gl_FragCoord origin is upper left Name 524 "storeTempPost" Name 531 "storeTemp" Name 539 "psout" - Name 547 "Color" + Name 547 "@entryPointOutput.Color" Name 552 "g_sSamp" Name 555 "g_tTex1df1a" Name 558 "g_tTex1di1a" @@ -1848,7 +1848,7 @@ gl_FragCoord origin is upper left Decorate 125(g_tTex3df1) DescriptorSet 0 Decorate 135(g_tTex3di1) DescriptorSet 0 Decorate 143(g_tTex3du1) DescriptorSet 0 - Decorate 547(Color) Location 0 + Decorate 547(@entryPointOutput.Color) Location 0 Decorate 552(g_sSamp) DescriptorSet 0 Decorate 552(g_sSamp) Binding 0 Decorate 555(g_tTex1df1a) DescriptorSet 0 @@ -1934,7 +1934,7 @@ gl_FragCoord origin is upper left 540: 39(fvec4) ConstantComposite 382 382 382 382 541: TypePointer Function 39(fvec4) 546: TypePointer Output 39(fvec4) - 547(Color): 546(ptr) Variable Output +547(@entryPointOutput.Color): 546(ptr) Variable Output 550: TypeSampler 551: TypePointer UniformConstant 550 552(g_sSamp): 551(ptr) Variable UniformConstant @@ -1960,7 +1960,7 @@ gl_FragCoord origin is upper left 5: Label 548:40(PS_OUTPUT) FunctionCall 42(@main() 549: 39(fvec4) CompositeExtract 548 0 - Store 547(Color) 549 + Store 547(@entryPointOutput.Color) 549 Return FunctionEnd 10(Fn1(i1;): 6(int) Function None 8 diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out index afcc52a5..d920bf3e 100644 --- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out +++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out @@ -826,7 +826,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -849,7 +849,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di2a' (layout( rg32i) uniform iimage2DArray) 0:? 'g_tTex2du2a' (layout( rg32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 2-component vector of float uf2, uniform 2-component vector of int ui2, uniform 2-component vector of uint uu2}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -1682,7 +1682,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:53 Sequence 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:53 Constant: @@ -1705,7 +1705,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di2a' (layout( rg32i) uniform iimage2DArray) 0:? 'g_tTex2du2a' (layout( rg32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4, uniform 2-component vector of float uf2, uniform 2-component vector of int ui2, uniform 2-component vector of uint uu2}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -1837,7 +1837,7 @@ gl_FragCoord origin is upper left Name 557 "storeTempPost" Name 565 "storeTemp" Name 573 "psout" - Name 581 "Color" + Name 581 "@entryPointOutput.Color" Name 586 "g_sSamp" Name 589 "g_tTex1df2a" Name 592 "g_tTex1di2a" @@ -1867,7 +1867,7 @@ gl_FragCoord origin is upper left Decorate 130(g_tTex3df2) DescriptorSet 0 Decorate 140(g_tTex3di2) DescriptorSet 0 Decorate 148(g_tTex3du2) DescriptorSet 0 - Decorate 581(Color) Location 0 + Decorate 581(@entryPointOutput.Color) Location 0 Decorate 586(g_sSamp) DescriptorSet 0 Decorate 586(g_sSamp) Binding 0 Decorate 589(g_tTex1df2a) DescriptorSet 0 @@ -1967,7 +1967,7 @@ gl_FragCoord origin is upper left 574: 42(fvec4) ConstantComposite 404 404 404 404 575: TypePointer Function 42(fvec4) 580: TypePointer Output 42(fvec4) - 581(Color): 580(ptr) Variable Output +581(@entryPointOutput.Color): 580(ptr) Variable Output 584: TypeSampler 585: TypePointer UniformConstant 584 586(g_sSamp): 585(ptr) Variable UniformConstant @@ -1993,7 +1993,7 @@ gl_FragCoord origin is upper left 5: Label 582:43(PS_OUTPUT) FunctionCall 45(@main() 583: 42(fvec4) CompositeExtract 582 0 - Store 581(Color) 583 + Store 581(@entryPointOutput.Color) 583 Return FunctionEnd 11(Fn1(vi2;): 7(ivec2) Function None 9 diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 55edf367..c470134a 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -131,13 +131,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -154,8 +154,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -293,13 +293,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -316,8 +316,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -357,8 +357,8 @@ gl_FragCoord origin is upper left Name 114 "g_tTexcdu4" Name 125 "psout" Name 135 "flattenTemp" - Name 138 "Color" - Name 142 "@entryPointOutput_Depth" + Name 138 "@entryPointOutput.Color" + Name 142 "@entryPointOutput.Depth" Name 145 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -372,8 +372,8 @@ gl_FragCoord origin is upper left Decorate 94(g_tTexcdf4) DescriptorSet 0 Decorate 104(g_tTexcdi4) DescriptorSet 0 Decorate 114(g_tTexcdu4) DescriptorSet 0 - Decorate 138(Color) Location 0 - Decorate 142(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 138(@entryPointOutput.Color) Location 0 + Decorate 142(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 145(g_tTex1df4a) DescriptorSet 0 Decorate 145(g_tTex1df4a) Binding 1 2: TypeVoid @@ -455,9 +455,9 @@ gl_FragCoord origin is upper left 129: 29(int) Constant 1 130: TypePointer Function 6(float) 137: TypePointer Output 7(fvec4) - 138(Color): 137(ptr) Variable Output +138(@entryPointOutput.Color): 137(ptr) Variable Output 141: TypePointer Output 6(float) -142(@entryPointOutput_Depth): 141(ptr) Variable Output +142(@entryPointOutput.Depth): 141(ptr) Variable Output 145(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -466,10 +466,10 @@ gl_FragCoord origin is upper left Store 135(flattenTemp) 136 139: 12(ptr) AccessChain 135(flattenTemp) 126 140: 7(fvec4) Load 139 - Store 138(Color) 140 + Store 138(@entryPointOutput.Color) 140 143: 130(ptr) AccessChain 135(flattenTemp) 129 144: 6(float) Load 143 - Store 142(@entryPointOutput_Depth) 144 + Store 142(@entryPointOutput.Depth) 144 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index edebe77e..11ce9992 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -241,13 +241,13 @@ gl_FragCoord origin is upper left 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: 0:53 0 (const int) 0:53 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:53 Depth: direct index for structure ( temp float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: @@ -269,8 +269,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -516,13 +516,13 @@ gl_FragCoord origin is upper left 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:53 Color: direct index for structure ( temp 4-component vector of float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: 0:53 0 (const int) 0:53 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:53 Depth: direct index for structure ( temp float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: @@ -544,8 +544,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -604,8 +604,8 @@ gl_FragCoord origin is upper left Name 169 "g_tTexcdu4" Name 176 "psout" Name 185 "flattenTemp" - Name 188 "Color" - Name 192 "@entryPointOutput_Depth" + Name 188 "@entryPointOutput.Color" + Name 192 "@entryPointOutput.Depth" Name 195 "g_sSamp2d" Name 196 "g_sSamp2D_b" Name 197 "g_tTex1df4a" @@ -624,8 +624,8 @@ gl_FragCoord origin is upper left Decorate 151(g_tTexcdf4) DescriptorSet 0 Decorate 160(g_tTexcdi4) DescriptorSet 0 Decorate 169(g_tTexcdu4) DescriptorSet 0 - Decorate 188(Color) Location 0 - Decorate 192(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 188(@entryPointOutput.Color) Location 0 + Decorate 192(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 195(g_sSamp2d) DescriptorSet 0 Decorate 196(g_sSamp2D_b) DescriptorSet 0 Decorate 197(g_tTex1df4a) DescriptorSet 0 @@ -731,9 +731,9 @@ gl_FragCoord origin is upper left 178: 7(fvec4) ConstantComposite 177 177 177 177 180: TypePointer Function 6(float) 187: TypePointer Output 7(fvec4) - 188(Color): 187(ptr) Variable Output +188(@entryPointOutput.Color): 187(ptr) Variable Output 191: TypePointer Output 6(float) -192(@entryPointOutput_Depth): 191(ptr) Variable Output +192(@entryPointOutput.Depth): 191(ptr) Variable Output 195(g_sSamp2d): 48(ptr) Variable UniformConstant 196(g_sSamp2D_b): 48(ptr) Variable UniformConstant 197(g_tTex1df4a): 44(ptr) Variable UniformConstant @@ -744,10 +744,10 @@ gl_FragCoord origin is upper left Store 185(flattenTemp) 186 189: 41(ptr) AccessChain 185(flattenTemp) 29 190: 7(fvec4) Load 189 - Store 188(Color) 190 + Store 188(@entryPointOutput.Color) 190 193: 180(ptr) AccessChain 185(flattenTemp) 16 194: 6(float) Load 193 - Store 192(@entryPointOutput_Depth) 194 + Store 192(@entryPointOutput.Depth) 194 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index 71fd1c09..abc7362d 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -175,8 +175,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -332,13 +332,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -358,8 +358,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -398,8 +398,8 @@ gl_FragCoord origin is upper left Name 120 "g_tTex3du4" Name 132 "psout" Name 141 "flattenTemp" - Name 144 "Color" - Name 148 "@entryPointOutput_Depth" + Name 144 "@entryPointOutput.Color" + Name 148 "@entryPointOutput.Depth" Name 151 "g_tTex1df4a" Name 154 "g_tTexcdf4" Name 157 "g_tTexcdi4" @@ -416,8 +416,8 @@ gl_FragCoord origin is upper left Decorate 96(g_tTex3df4) DescriptorSet 0 Decorate 109(g_tTex3di4) DescriptorSet 0 Decorate 120(g_tTex3du4) DescriptorSet 0 - Decorate 144(Color) Location 0 - Decorate 148(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 144(@entryPointOutput.Color) Location 0 + Decorate 148(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 151(g_tTex1df4a) DescriptorSet 0 Decorate 151(g_tTex1df4a) Binding 1 Decorate 154(g_tTexcdf4) DescriptorSet 0 @@ -508,9 +508,9 @@ gl_FragCoord origin is upper left 134: 7(fvec4) ConstantComposite 133 133 133 133 136: TypePointer Function 6(float) 143: TypePointer Output 7(fvec4) - 144(Color): 143(ptr) Variable Output +144(@entryPointOutput.Color): 143(ptr) Variable Output 147: TypePointer Output 6(float) -148(@entryPointOutput_Depth): 147(ptr) Variable Output +148(@entryPointOutput.Depth): 147(ptr) Variable Output 151(g_tTex1df4a): 15(ptr) Variable UniformConstant 152: TypeImage 6(float) Cube sampled format:Unknown 153: TypePointer UniformConstant 152 @@ -528,10 +528,10 @@ gl_FragCoord origin is upper left Store 141(flattenTemp) 142 145: 12(ptr) AccessChain 141(flattenTemp) 64 146: 7(fvec4) Load 145 - Store 144(Color) 146 + Store 144(@entryPointOutput.Color) 146 149: 136(ptr) AccessChain 141(flattenTemp) 26 150: 6(float) Load 149 - Store 148(@entryPointOutput_Depth) 150 + Store 148(@entryPointOutput.Depth) 150 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index 0df1b9b6..6d1d67d8 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -110,13 +110,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -130,8 +130,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -248,13 +248,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -268,8 +268,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -302,8 +302,8 @@ gl_FragCoord origin is upper left Name 87 "g_tTex2du4" Name 98 "psout" Name 107 "flattenTemp" - Name 110 "Color" - Name 114 "@entryPointOutput_Depth" + Name 110 "@entryPointOutput.Color" + Name 114 "@entryPointOutput.Depth" Name 117 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -314,8 +314,8 @@ gl_FragCoord origin is upper left Decorate 63(g_tTex2df4) DescriptorSet 0 Decorate 76(g_tTex2di4) DescriptorSet 0 Decorate 87(g_tTex2du4) DescriptorSet 0 - Decorate 110(Color) Location 0 - Decorate 114(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 110(@entryPointOutput.Color) Location 0 + Decorate 114(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 117(g_tTex1df4a) DescriptorSet 0 Decorate 117(g_tTex1df4a) Binding 1 2: TypeVoid @@ -384,9 +384,9 @@ gl_FragCoord origin is upper left 100: 7(fvec4) ConstantComposite 99 99 99 99 102: TypePointer Function 6(float) 109: TypePointer Output 7(fvec4) - 110(Color): 109(ptr) Variable Output +110(@entryPointOutput.Color): 109(ptr) Variable Output 113: TypePointer Output 6(float) -114(@entryPointOutput_Depth): 113(ptr) Variable Output +114(@entryPointOutput.Depth): 113(ptr) Variable Output 117(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -395,10 +395,10 @@ gl_FragCoord origin is upper left Store 107(flattenTemp) 108 111: 12(ptr) AccessChain 107(flattenTemp) 29 112: 7(fvec4) Load 111 - Store 110(Color) 112 + Store 110(@entryPointOutput.Color) 112 115: 102(ptr) AccessChain 107(flattenTemp) 43 116: 6(float) Load 115 - Store 114(@entryPointOutput_Depth) 116 + Store 114(@entryPointOutput.Depth) 116 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out index 2829c027..ffb6a497 100644 --- a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out @@ -61,7 +61,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:14 Sequence 0:14 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:14 Color: direct index for structure ( temp 4-component vector of float) 0:14 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:14 Constant: @@ -72,7 +72,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex1df2' ( uniform texture1D) 0:? 'g_tTex1df3' ( uniform texture1D) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -140,7 +140,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:14 Sequence 0:14 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:14 Color: direct index for structure ( temp 4-component vector of float) 0:14 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:14 Constant: @@ -151,7 +151,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex1df2' ( uniform texture1D) 0:? 'g_tTex1df3' ( uniform texture1D) 0:? 'g_tTex1df4' ( uniform texture1D) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -178,14 +178,14 @@ gl_FragCoord origin is upper left Name 52 "txval13" Name 53 "g_tTex1df4" Name 59 "psout" - Name 69 "Color" + Name 69 "@entryPointOutput.Color" Decorate 16(g_tTex1df1) DescriptorSet 0 Decorate 20(g_sSamp) DescriptorSet 0 Decorate 20(g_sSamp) Binding 0 Decorate 30(g_tTex1df2) DescriptorSet 0 Decorate 42(g_tTex1df3) DescriptorSet 0 Decorate 53(g_tTex1df4) DescriptorSet 0 - Decorate 69(Color) Location 0 + Decorate 69(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -216,12 +216,12 @@ gl_FragCoord origin is upper left 62: 6(float) Constant 1065353216 63: 7(fvec4) ConstantComposite 62 62 62 62 68: TypePointer Output 7(fvec4) - 69(Color): 68(ptr) Variable Output +69(@entryPointOutput.Color): 68(ptr) Variable Output 4(main): 2 Function None 3 5: Label 70:8(PS_OUTPUT) FunctionCall 10(@main() 71: 7(fvec4) CompositeExtract 70 0 - Store 69(Color) 71 + Store 69(@entryPointOutput.Color) 71 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index 74cab441..dd996978 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -329,13 +329,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -393,8 +393,8 @@ gl_FragCoord origin is upper left Name 114 "g_tTexcdu4" Name 125 "psout" Name 135 "flattenTemp" - Name 138 "Color" - Name 142 "@entryPointOutput_Depth" + Name 138 "@entryPointOutput.Color" + Name 142 "@entryPointOutput.Depth" Name 145 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -408,8 +408,8 @@ gl_FragCoord origin is upper left Decorate 94(g_tTexcdf4) DescriptorSet 0 Decorate 104(g_tTexcdi4) DescriptorSet 0 Decorate 114(g_tTexcdu4) DescriptorSet 0 - Decorate 138(Color) Location 0 - Decorate 142(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 138(@entryPointOutput.Color) Location 0 + Decorate 142(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 145(g_tTex1df4a) DescriptorSet 0 Decorate 145(g_tTex1df4a) Binding 1 2: TypeVoid @@ -491,9 +491,9 @@ gl_FragCoord origin is upper left 129: 30(int) Constant 1 130: TypePointer Function 6(float) 137: TypePointer Output 7(fvec4) - 138(Color): 137(ptr) Variable Output +138(@entryPointOutput.Color): 137(ptr) Variable Output 141: TypePointer Output 6(float) -142(@entryPointOutput_Depth): 141(ptr) Variable Output +142(@entryPointOutput.Depth): 141(ptr) Variable Output 145(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -502,10 +502,10 @@ gl_FragCoord origin is upper left Store 135(flattenTemp) 136 139: 12(ptr) AccessChain 135(flattenTemp) 126 140: 7(fvec4) Load 139 - Store 138(Color) 140 + Store 138(@entryPointOutput.Color) 140 143: 130(ptr) AccessChain 135(flattenTemp) 129 144: 6(float) Load 143 - Store 142(@entryPointOutput_Depth) 144 + Store 142(@entryPointOutput.Depth) 144 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index 1a1caf8e..18441e6e 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -179,13 +179,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -205,8 +205,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -392,13 +392,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -418,8 +418,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -464,8 +464,8 @@ gl_FragCoord origin is upper left Name 141 "g_tTexcdu4" Name 148 "psout" Name 159 "flattenTemp" - Name 162 "Color" - Name 166 "@entryPointOutput_Depth" + Name 162 "@entryPointOutput.Color" + Name 166 "@entryPointOutput.Depth" Name 169 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -482,8 +482,8 @@ gl_FragCoord origin is upper left Decorate 123(g_tTexcdf4) DescriptorSet 0 Decorate 132(g_tTexcdi4) DescriptorSet 0 Decorate 141(g_tTexcdu4) DescriptorSet 0 - Decorate 162(Color) Location 0 - Decorate 166(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 162(@entryPointOutput.Color) Location 0 + Decorate 166(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 169(g_tTex1df4a) DescriptorSet 0 Decorate 169(g_tTex1df4a) Binding 1 2: TypeVoid @@ -574,9 +574,9 @@ gl_FragCoord origin is upper left 153: 27(int) Constant 1 154: TypePointer Function 6(float) 161: TypePointer Output 7(fvec4) - 162(Color): 161(ptr) Variable Output +162(@entryPointOutput.Color): 161(ptr) Variable Output 165: TypePointer Output 6(float) -166(@entryPointOutput_Depth): 165(ptr) Variable Output +166(@entryPointOutput.Depth): 165(ptr) Variable Output 169(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -585,10 +585,10 @@ gl_FragCoord origin is upper left Store 159(flattenTemp) 160 163: 12(ptr) AccessChain 159(flattenTemp) 149 164: 7(fvec4) Load 163 - Store 162(Color) 164 + Store 162(@entryPointOutput.Color) 164 167: 154(ptr) AccessChain 159(flattenTemp) 153 168: 6(float) Load 167 - Store 166(@entryPointOutput_Depth) 168 + Store 166(@entryPointOutput.Depth) 168 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index 73efb361..59ecdb75 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -167,13 +167,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -368,13 +368,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -394,8 +394,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -434,8 +434,8 @@ gl_FragCoord origin is upper left Name 120 "g_tTex3du4" Name 132 "psout" Name 141 "flattenTemp" - Name 144 "Color" - Name 148 "@entryPointOutput_Depth" + Name 144 "@entryPointOutput.Color" + Name 148 "@entryPointOutput.Depth" Name 151 "g_tTex1df4a" Name 154 "g_tTexcdf4" Name 157 "g_tTexcdi4" @@ -452,8 +452,8 @@ gl_FragCoord origin is upper left Decorate 96(g_tTex3df4) DescriptorSet 0 Decorate 109(g_tTex3di4) DescriptorSet 0 Decorate 120(g_tTex3du4) DescriptorSet 0 - Decorate 144(Color) Location 0 - Decorate 148(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 144(@entryPointOutput.Color) Location 0 + Decorate 148(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 151(g_tTex1df4a) DescriptorSet 0 Decorate 151(g_tTex1df4a) Binding 1 Decorate 154(g_tTexcdf4) DescriptorSet 0 @@ -544,9 +544,9 @@ gl_FragCoord origin is upper left 134: 7(fvec4) ConstantComposite 133 133 133 133 136: TypePointer Function 6(float) 143: TypePointer Output 7(fvec4) - 144(Color): 143(ptr) Variable Output +144(@entryPointOutput.Color): 143(ptr) Variable Output 147: TypePointer Output 6(float) -148(@entryPointOutput_Depth): 147(ptr) Variable Output +148(@entryPointOutput.Depth): 147(ptr) Variable Output 151(g_tTex1df4a): 15(ptr) Variable UniformConstant 152: TypeImage 6(float) Cube sampled format:Unknown 153: TypePointer UniformConstant 152 @@ -564,10 +564,10 @@ gl_FragCoord origin is upper left Store 141(flattenTemp) 142 145: 12(ptr) AccessChain 141(flattenTemp) 65 146: 7(fvec4) Load 145 - Store 144(Color) 146 + Store 144(@entryPointOutput.Color) 146 149: 136(ptr) AccessChain 141(flattenTemp) 27 150: 6(float) Load 149 - Store 148(@entryPointOutput_Depth) 150 + Store 148(@entryPointOutput.Depth) 150 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 889c68eb..a18c80ee 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -122,13 +122,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -272,13 +272,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -292,8 +292,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -326,8 +326,8 @@ gl_FragCoord origin is upper left Name 87 "g_tTex2du4" Name 98 "psout" Name 107 "flattenTemp" - Name 110 "Color" - Name 114 "@entryPointOutput_Depth" + Name 110 "@entryPointOutput.Color" + Name 114 "@entryPointOutput.Depth" Name 117 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -338,8 +338,8 @@ gl_FragCoord origin is upper left Decorate 64(g_tTex2df4) DescriptorSet 0 Decorate 77(g_tTex2di4) DescriptorSet 0 Decorate 87(g_tTex2du4) DescriptorSet 0 - Decorate 110(Color) Location 0 - Decorate 114(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 110(@entryPointOutput.Color) Location 0 + Decorate 114(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 117(g_tTex1df4a) DescriptorSet 0 Decorate 117(g_tTex1df4a) Binding 1 2: TypeVoid @@ -408,9 +408,9 @@ gl_FragCoord origin is upper left 100: 7(fvec4) ConstantComposite 99 99 99 99 102: TypePointer Function 6(float) 109: TypePointer Output 7(fvec4) - 110(Color): 109(ptr) Variable Output +110(@entryPointOutput.Color): 109(ptr) Variable Output 113: TypePointer Output 6(float) -114(@entryPointOutput_Depth): 113(ptr) Variable Output +114(@entryPointOutput.Depth): 113(ptr) Variable Output 117(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -419,10 +419,10 @@ gl_FragCoord origin is upper left Store 107(flattenTemp) 108 111: 12(ptr) AccessChain 107(flattenTemp) 30 112: 7(fvec4) Load 111 - Store 110(Color) 112 + Store 110(@entryPointOutput.Color) 112 115: 102(ptr) AccessChain 107(flattenTemp) 44 116: 6(float) Load 115 - Store 114(@entryPointOutput_Depth) 116 + Store 114(@entryPointOutput.Depth) 116 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index 18517b4f..299cade7 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -158,13 +158,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -192,8 +192,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -358,13 +358,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -392,8 +392,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -433,8 +433,8 @@ gl_FragCoord origin is upper left Name 148 "g_tTexcdu4a" Name 161 "psout" Name 172 "flattenTemp" - Name 175 "Color" - Name 179 "@entryPointOutput_Depth" + Name 175 "@entryPointOutput.Color" + Name 179 "@entryPointOutput.Depth" Name 184 "g_tTex1df4" Name 187 "g_tTex1di4" Name 190 "g_tTex1du4" @@ -458,8 +458,8 @@ gl_FragCoord origin is upper left Decorate 116(g_tTexcdf4a) DescriptorSet 0 Decorate 133(g_tTexcdi4a) DescriptorSet 0 Decorate 148(g_tTexcdu4a) DescriptorSet 0 - Decorate 175(Color) Location 0 - Decorate 179(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 175(@entryPointOutput.Color) Location 0 + Decorate 179(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 184(g_tTex1df4) DescriptorSet 0 Decorate 184(g_tTex1df4) Binding 0 Decorate 187(g_tTex1di4) DescriptorSet 0 @@ -547,9 +547,9 @@ gl_FragCoord origin is upper left 165: TypePointer Function 7(fvec4) 167: 37(int) Constant 1 174: TypePointer Output 7(fvec4) - 175(Color): 174(ptr) Variable Output +175(@entryPointOutput.Color): 174(ptr) Variable Output 178: TypePointer Output 6(float) -179(@entryPointOutput_Depth): 178(ptr) Variable Output +179(@entryPointOutput.Depth): 178(ptr) Variable Output 182: TypeImage 6(float) 1D sampled format:Unknown 183: TypePointer UniformConstant 182 184(g_tTex1df4): 183(ptr) Variable UniformConstant @@ -593,10 +593,10 @@ gl_FragCoord origin is upper left Store 172(flattenTemp) 173 176: 165(ptr) AccessChain 172(flattenTemp) 162 177: 7(fvec4) Load 176 - Store 175(Color) 177 + Store 175(@entryPointOutput.Color) 177 180: 12(ptr) AccessChain 172(flattenTemp) 167 181: 6(float) Load 180 - Store 179(@entryPointOutput_Depth) 181 + Store 179(@entryPointOutput.Depth) 181 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index eb4bd14e..d6579ba0 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -183,8 +183,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -340,13 +340,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -374,8 +374,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -415,8 +415,8 @@ gl_FragCoord origin is upper left Name 137 "g_tTexcdu4" Name 150 "psout" Name 161 "flattenTemp" - Name 164 "Color" - Name 168 "@entryPointOutput_Depth" + Name 164 "@entryPointOutput.Color" + Name 168 "@entryPointOutput.Depth" Name 173 "g_tTex3df4" Name 176 "g_tTex3di4" Name 179 "g_tTex3du4" @@ -441,8 +441,8 @@ gl_FragCoord origin is upper left Decorate 105(g_tTexcdf4) DescriptorSet 0 Decorate 122(g_tTexcdi4) DescriptorSet 0 Decorate 137(g_tTexcdu4) DescriptorSet 0 - Decorate 164(Color) Location 0 - Decorate 168(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 164(@entryPointOutput.Color) Location 0 + Decorate 168(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 173(g_tTex3df4) DescriptorSet 0 Decorate 176(g_tTex3di4) DescriptorSet 0 Decorate 179(g_tTex3du4) DescriptorSet 0 @@ -527,9 +527,9 @@ gl_FragCoord origin is upper left 154: TypePointer Function 7(fvec4) 156: 32(int) Constant 1 163: TypePointer Output 7(fvec4) - 164(Color): 163(ptr) Variable Output +164(@entryPointOutput.Color): 163(ptr) Variable Output 167: TypePointer Output 6(float) -168(@entryPointOutput_Depth): 167(ptr) Variable Output +168(@entryPointOutput.Depth): 167(ptr) Variable Output 171: TypeImage 6(float) 3D sampled format:Unknown 172: TypePointer UniformConstant 171 173(g_tTex3df4): 172(ptr) Variable UniformConstant @@ -573,10 +573,10 @@ gl_FragCoord origin is upper left Store 161(flattenTemp) 162 165: 154(ptr) AccessChain 161(flattenTemp) 151 166: 7(fvec4) Load 165 - Store 164(Color) 166 + Store 164(@entryPointOutput.Color) 166 169: 12(ptr) AccessChain 161(flattenTemp) 156 170: 6(float) Load 169 - Store 168(@entryPointOutput_Depth) 170 + Store 168(@entryPointOutput.Depth) 170 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index eb54c746..d9e1b77f 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -122,13 +122,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -156,8 +156,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -286,13 +286,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -320,8 +320,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -355,8 +355,8 @@ gl_FragCoord origin is upper left Name 95 "g_tTex2du4" Name 107 "psout" Name 118 "flattenTemp" - Name 121 "Color" - Name 125 "@entryPointOutput_Depth" + Name 121 "@entryPointOutput.Color" + Name 125 "@entryPointOutput.Depth" Name 130 "g_tTex3df4" Name 133 "g_tTex3di4" Name 136 "g_tTex3du4" @@ -381,8 +381,8 @@ gl_FragCoord origin is upper left Decorate 61(g_tTex2df4) DescriptorSet 0 Decorate 81(g_tTex2di4) DescriptorSet 0 Decorate 95(g_tTex2du4) DescriptorSet 0 - Decorate 121(Color) Location 0 - Decorate 125(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 121(@entryPointOutput.Color) Location 0 + Decorate 125(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 130(g_tTex3df4) DescriptorSet 0 Decorate 133(g_tTex3di4) DescriptorSet 0 Decorate 136(g_tTex3du4) DescriptorSet 0 @@ -457,9 +457,9 @@ gl_FragCoord origin is upper left 111: TypePointer Function 7(fvec4) 113: 29(int) Constant 1 120: TypePointer Output 7(fvec4) - 121(Color): 120(ptr) Variable Output +121(@entryPointOutput.Color): 120(ptr) Variable Output 124: TypePointer Output 6(float) -125(@entryPointOutput_Depth): 124(ptr) Variable Output +125(@entryPointOutput.Depth): 124(ptr) Variable Output 128: TypeImage 6(float) 3D sampled format:Unknown 129: TypePointer UniformConstant 128 130(g_tTex3df4): 129(ptr) Variable UniformConstant @@ -512,10 +512,10 @@ gl_FragCoord origin is upper left Store 118(flattenTemp) 119 122: 111(ptr) AccessChain 118(flattenTemp) 108 123: 7(fvec4) Load 122 - Store 121(Color) 123 + Store 121(@entryPointOutput.Color) 123 126: 12(ptr) AccessChain 118(flattenTemp) 113 127: 6(float) Load 126 - Store 125(@entryPointOutput_Depth) 127 + Store 125(@entryPointOutput.Depth) 127 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index ad452c42..067c8a63 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -128,13 +128,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -162,8 +162,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -298,13 +298,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -332,8 +332,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -367,8 +367,8 @@ gl_FragCoord origin is upper left Name 105 "g_tTex2du4a" Name 118 "psout" Name 129 "flattenTemp" - Name 132 "Color" - Name 136 "@entryPointOutput_Depth" + Name 132 "@entryPointOutput.Color" + Name 136 "@entryPointOutput.Depth" Name 141 "g_tTex1df4" Name 144 "g_tTex1di4" Name 147 "g_tTex1du4" @@ -392,8 +392,8 @@ gl_FragCoord origin is upper left Decorate 70(g_tTex2df4a) DescriptorSet 0 Decorate 90(g_tTex2di4a) DescriptorSet 0 Decorate 105(g_tTex2du4a) DescriptorSet 0 - Decorate 132(Color) Location 0 - Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 132(@entryPointOutput.Color) Location 0 + Decorate 136(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 141(g_tTex1df4) DescriptorSet 0 Decorate 141(g_tTex1df4) Binding 0 Decorate 144(g_tTex1di4) DescriptorSet 0 @@ -471,9 +471,9 @@ gl_FragCoord origin is upper left 122: TypePointer Function 7(fvec4) 124: 34(int) Constant 1 131: TypePointer Output 7(fvec4) - 132(Color): 131(ptr) Variable Output +132(@entryPointOutput.Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) -136(@entryPointOutput_Depth): 135(ptr) Variable Output +136(@entryPointOutput.Depth): 135(ptr) Variable Output 139: TypeImage 6(float) 1D sampled format:Unknown 140: TypePointer UniformConstant 139 141(g_tTex1df4): 140(ptr) Variable UniformConstant @@ -526,10 +526,10 @@ gl_FragCoord origin is upper left Store 129(flattenTemp) 130 133: 122(ptr) AccessChain 129(flattenTemp) 119 134: 7(fvec4) Load 133 - Store 132(Color) 134 + Store 132(@entryPointOutput.Color) 134 137: 12(ptr) AccessChain 129(flattenTemp) 124 138: 6(float) Load 137 - Store 136(@entryPointOutput_Depth) 138 + Store 136(@entryPointOutput.Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index 8d560100..40a8202a 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -176,13 +176,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -210,8 +210,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -394,13 +394,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -428,8 +428,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -469,8 +469,8 @@ gl_FragCoord origin is upper left Name 149 "g_tTexcdu4a" Name 162 "psout" Name 173 "flattenTemp" - Name 176 "Color" - Name 180 "@entryPointOutput_Depth" + Name 176 "@entryPointOutput.Color" + Name 180 "@entryPointOutput.Depth" Name 185 "g_tTex1df4" Name 188 "g_tTex1di4" Name 191 "g_tTex1du4" @@ -494,8 +494,8 @@ gl_FragCoord origin is upper left Decorate 117(g_tTexcdf4a) DescriptorSet 0 Decorate 134(g_tTexcdi4a) DescriptorSet 0 Decorate 149(g_tTexcdu4a) DescriptorSet 0 - Decorate 176(Color) Location 0 - Decorate 180(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 176(@entryPointOutput.Color) Location 0 + Decorate 180(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 185(g_tTex1df4) DescriptorSet 0 Decorate 185(g_tTex1df4) Binding 0 Decorate 188(g_tTex1di4) DescriptorSet 0 @@ -584,9 +584,9 @@ gl_FragCoord origin is upper left 166: TypePointer Function 7(fvec4) 168: 38(int) Constant 1 175: TypePointer Output 7(fvec4) - 176(Color): 175(ptr) Variable Output +176(@entryPointOutput.Color): 175(ptr) Variable Output 179: TypePointer Output 6(float) -180(@entryPointOutput_Depth): 179(ptr) Variable Output +180(@entryPointOutput.Depth): 179(ptr) Variable Output 183: TypeImage 6(float) 1D sampled format:Unknown 184: TypePointer UniformConstant 183 185(g_tTex1df4): 184(ptr) Variable UniformConstant @@ -630,10 +630,10 @@ gl_FragCoord origin is upper left Store 173(flattenTemp) 174 177: 166(ptr) AccessChain 173(flattenTemp) 163 178: 7(fvec4) Load 177 - Store 176(Color) 178 + Store 176(@entryPointOutput.Color) 178 181: 12(ptr) AccessChain 173(flattenTemp) 168 182: 6(float) Load 181 - Store 180(@entryPointOutput_Depth) 182 + Store 180(@entryPointOutput.Depth) 182 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 7847b806..87dee888 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -167,13 +167,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -201,8 +201,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -376,13 +376,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -410,8 +410,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -451,8 +451,8 @@ gl_FragCoord origin is upper left Name 138 "g_tTexcdu4" Name 151 "psout" Name 162 "flattenTemp" - Name 165 "Color" - Name 169 "@entryPointOutput_Depth" + Name 165 "@entryPointOutput.Color" + Name 169 "@entryPointOutput.Depth" Name 174 "g_tTex3df4" Name 177 "g_tTex3di4" Name 180 "g_tTex3du4" @@ -477,8 +477,8 @@ gl_FragCoord origin is upper left Decorate 106(g_tTexcdf4) DescriptorSet 0 Decorate 123(g_tTexcdi4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0 - Decorate 165(Color) Location 0 - Decorate 169(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 165(@entryPointOutput.Color) Location 0 + Decorate 169(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 174(g_tTex3df4) DescriptorSet 0 Decorate 177(g_tTex3di4) DescriptorSet 0 Decorate 180(g_tTex3du4) DescriptorSet 0 @@ -564,9 +564,9 @@ gl_FragCoord origin is upper left 155: TypePointer Function 7(fvec4) 157: 33(int) Constant 1 164: TypePointer Output 7(fvec4) - 165(Color): 164(ptr) Variable Output +165(@entryPointOutput.Color): 164(ptr) Variable Output 168: TypePointer Output 6(float) -169(@entryPointOutput_Depth): 168(ptr) Variable Output +169(@entryPointOutput.Depth): 168(ptr) Variable Output 172: TypeImage 6(float) 3D sampled format:Unknown 173: TypePointer UniformConstant 172 174(g_tTex3df4): 173(ptr) Variable UniformConstant @@ -610,10 +610,10 @@ gl_FragCoord origin is upper left Store 162(flattenTemp) 163 166: 155(ptr) AccessChain 162(flattenTemp) 152 167: 7(fvec4) Load 166 - Store 165(Color) 167 + Store 165(@entryPointOutput.Color) 167 170: 12(ptr) AccessChain 162(flattenTemp) 157 171: 6(float) Load 170 - Store 169(@entryPointOutput_Depth) 171 + Store 169(@entryPointOutput.Depth) 171 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index d9ce3f68..ad5225c6 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -134,13 +134,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -168,8 +168,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -310,13 +310,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -344,8 +344,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -379,8 +379,8 @@ gl_FragCoord origin is upper left Name 96 "g_tTex2du4" Name 108 "psout" Name 119 "flattenTemp" - Name 122 "Color" - Name 126 "@entryPointOutput_Depth" + Name 122 "@entryPointOutput.Color" + Name 126 "@entryPointOutput.Depth" Name 131 "g_tTex3df4" Name 134 "g_tTex3di4" Name 137 "g_tTex3du4" @@ -405,8 +405,8 @@ gl_FragCoord origin is upper left Decorate 62(g_tTex2df4) DescriptorSet 0 Decorate 82(g_tTex2di4) DescriptorSet 0 Decorate 96(g_tTex2du4) DescriptorSet 0 - Decorate 122(Color) Location 0 - Decorate 126(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 122(@entryPointOutput.Color) Location 0 + Decorate 126(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 131(g_tTex3df4) DescriptorSet 0 Decorate 134(g_tTex3di4) DescriptorSet 0 Decorate 137(g_tTex3du4) DescriptorSet 0 @@ -482,9 +482,9 @@ gl_FragCoord origin is upper left 112: TypePointer Function 7(fvec4) 114: 30(int) Constant 1 121: TypePointer Output 7(fvec4) - 122(Color): 121(ptr) Variable Output +122(@entryPointOutput.Color): 121(ptr) Variable Output 125: TypePointer Output 6(float) -126(@entryPointOutput_Depth): 125(ptr) Variable Output +126(@entryPointOutput.Depth): 125(ptr) Variable Output 129: TypeImage 6(float) 3D sampled format:Unknown 130: TypePointer UniformConstant 129 131(g_tTex3df4): 130(ptr) Variable UniformConstant @@ -537,10 +537,10 @@ gl_FragCoord origin is upper left Store 119(flattenTemp) 120 123: 112(ptr) AccessChain 119(flattenTemp) 109 124: 7(fvec4) Load 123 - Store 122(Color) 124 + Store 122(@entryPointOutput.Color) 124 127: 12(ptr) AccessChain 119(flattenTemp) 114 128: 6(float) Load 127 - Store 126(@entryPointOutput_Depth) 128 + Store 126(@entryPointOutput.Depth) 128 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 1b457c93..7246fe72 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -140,13 +140,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -174,8 +174,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -322,13 +322,13 @@ gl_FragCoord origin is upper left 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:38 Color: direct index for structure ( temp 4-component vector of float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -356,8 +356,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -391,8 +391,8 @@ gl_FragCoord origin is upper left Name 106 "g_tTex2du4a" Name 119 "psout" Name 130 "flattenTemp" - Name 133 "Color" - Name 137 "@entryPointOutput_Depth" + Name 133 "@entryPointOutput.Color" + Name 137 "@entryPointOutput.Depth" Name 142 "g_tTex1df4" Name 145 "g_tTex1di4" Name 148 "g_tTex1du4" @@ -416,8 +416,8 @@ gl_FragCoord origin is upper left Decorate 71(g_tTex2df4a) DescriptorSet 0 Decorate 91(g_tTex2di4a) DescriptorSet 0 Decorate 106(g_tTex2du4a) DescriptorSet 0 - Decorate 133(Color) Location 0 - Decorate 137(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 133(@entryPointOutput.Color) Location 0 + Decorate 137(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 142(g_tTex1df4) DescriptorSet 0 Decorate 142(g_tTex1df4) Binding 0 Decorate 145(g_tTex1di4) DescriptorSet 0 @@ -496,9 +496,9 @@ gl_FragCoord origin is upper left 123: TypePointer Function 7(fvec4) 125: 35(int) Constant 1 132: TypePointer Output 7(fvec4) - 133(Color): 132(ptr) Variable Output +133(@entryPointOutput.Color): 132(ptr) Variable Output 136: TypePointer Output 6(float) -137(@entryPointOutput_Depth): 136(ptr) Variable Output +137(@entryPointOutput.Depth): 136(ptr) Variable Output 140: TypeImage 6(float) 1D sampled format:Unknown 141: TypePointer UniformConstant 140 142(g_tTex1df4): 141(ptr) Variable UniformConstant @@ -551,10 +551,10 @@ gl_FragCoord origin is upper left Store 130(flattenTemp) 131 134: 123(ptr) AccessChain 130(flattenTemp) 120 135: 7(fvec4) Load 134 - Store 133(Color) 135 + Store 133(@entryPointOutput.Color) 135 138: 12(ptr) AccessChain 130(flattenTemp) 125 139: 6(float) Load 138 - Store 137(@entryPointOutput_Depth) 139 + Store 137(@entryPointOutput.Depth) 139 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 0486f02a..244a70ba 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -185,13 +185,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -208,8 +208,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -401,13 +401,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -424,8 +424,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -465,8 +465,8 @@ gl_FragCoord origin is upper left Name 111 "g_tTexcdu4" Name 118 "psout" Name 129 "flattenTemp" - Name 132 "Color" - Name 136 "@entryPointOutput_Depth" + Name 132 "@entryPointOutput.Color" + Name 136 "@entryPointOutput.Depth" Name 139 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -480,8 +480,8 @@ gl_FragCoord origin is upper left Decorate 89(g_tTexcdf4) DescriptorSet 0 Decorate 102(g_tTexcdi4) DescriptorSet 0 Decorate 111(g_tTexcdu4) DescriptorSet 0 - Decorate 132(Color) Location 0 - Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 132(@entryPointOutput.Color) Location 0 + Decorate 136(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 139(g_tTex1df4a) DescriptorSet 0 Decorate 139(g_tTex1df4a) Binding 1 2: TypeVoid @@ -557,9 +557,9 @@ gl_FragCoord origin is upper left 123: 31(int) Constant 1 124: TypePointer Function 6(float) 131: TypePointer Output 7(fvec4) - 132(Color): 131(ptr) Variable Output +132(@entryPointOutput.Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) -136(@entryPointOutput_Depth): 135(ptr) Variable Output +136(@entryPointOutput.Depth): 135(ptr) Variable Output 139(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -568,10 +568,10 @@ gl_FragCoord origin is upper left Store 129(flattenTemp) 130 133: 12(ptr) AccessChain 129(flattenTemp) 119 134: 7(fvec4) Load 133 - Store 132(Color) 134 + Store 132(@entryPointOutput.Color) 134 137: 124(ptr) AccessChain 129(flattenTemp) 123 138: 6(float) Load 137 - Store 136(@entryPointOutput_Depth) 138 + Store 136(@entryPointOutput.Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 82fd7208..24c510ce 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -233,13 +233,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -259,8 +259,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -500,13 +500,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -526,8 +526,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -572,8 +572,8 @@ gl_FragCoord origin is upper left Name 146 "g_tTexcdu4" Name 153 "psout" Name 164 "flattenTemp" - Name 167 "Color" - Name 171 "@entryPointOutput_Depth" + Name 167 "@entryPointOutput.Color" + Name 171 "@entryPointOutput.Depth" Name 174 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -590,8 +590,8 @@ gl_FragCoord origin is upper left Decorate 128(g_tTexcdf4) DescriptorSet 0 Decorate 137(g_tTexcdi4) DescriptorSet 0 Decorate 146(g_tTexcdu4) DescriptorSet 0 - Decorate 167(Color) Location 0 - Decorate 171(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 167(@entryPointOutput.Color) Location 0 + Decorate 171(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 174(g_tTex1df4a) DescriptorSet 0 Decorate 174(g_tTex1df4a) Binding 1 2: TypeVoid @@ -687,9 +687,9 @@ gl_FragCoord origin is upper left 158: 28(int) Constant 1 159: TypePointer Function 6(float) 166: TypePointer Output 7(fvec4) - 167(Color): 166(ptr) Variable Output +167(@entryPointOutput.Color): 166(ptr) Variable Output 170: TypePointer Output 6(float) -171(@entryPointOutput_Depth): 170(ptr) Variable Output +171(@entryPointOutput.Depth): 170(ptr) Variable Output 174(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -698,10 +698,10 @@ gl_FragCoord origin is upper left Store 164(flattenTemp) 165 168: 12(ptr) AccessChain 164(flattenTemp) 154 169: 7(fvec4) Load 168 - Store 167(Color) 169 + Store 167(@entryPointOutput.Color) 169 172: 159(ptr) AccessChain 164(flattenTemp) 158 173: 6(float) Load 172 - Store 171(@entryPointOutput_Depth) 173 + Store 171(@entryPointOutput.Depth) 173 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index eaff3247..80819131 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -222,7 +222,7 @@ Shader version: 500 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:27 Pos: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Constant: @@ -242,7 +242,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) Linked vertex stage: @@ -471,7 +471,7 @@ Shader version: 500 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:27 Pos: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Constant: @@ -491,7 +491,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -533,7 +533,7 @@ Shader version: 500 Name 143 "txval42" Name 146 "g_tTexcdu4" Name 153 "vsout" - Name 162 "@entryPointOutput_Pos" + Name 162 "@entryPointOutput.Pos" Name 165 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -550,7 +550,7 @@ Shader version: 500 Decorate 128(g_tTexcdf4) DescriptorSet 0 Decorate 137(g_tTexcdi4) DescriptorSet 0 Decorate 146(g_tTexcdu4) DescriptorSet 0 - Decorate 162(@entryPointOutput_Pos) BuiltIn Position + Decorate 162(@entryPointOutput.Pos) BuiltIn Position Decorate 165(g_tTex1df4a) DescriptorSet 0 Decorate 165(g_tTex1df4a) Binding 1 2: TypeVoid @@ -644,13 +644,13 @@ Shader version: 500 155: 6(float) Constant 0 156: 7(fvec4) ConstantComposite 155 155 155 155 161: TypePointer Output 7(fvec4) -162(@entryPointOutput_Pos): 161(ptr) Variable Output +162(@entryPointOutput.Pos): 161(ptr) Variable Output 165(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 163:8(VS_OUTPUT) FunctionCall 10(@main() 164: 7(fvec4) CompositeExtract 163 0 - Store 162(@entryPointOutput_Pos) 164 + Store 162(@entryPointOutput.Pos) 164 Return FunctionEnd 10(@main():8(VS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 43fb5f27..3a678076 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -203,13 +203,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -229,8 +229,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -440,13 +440,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -466,8 +466,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -506,8 +506,8 @@ gl_FragCoord origin is upper left Name 125 "g_tTex3du4" Name 137 "psout" Name 146 "flattenTemp" - Name 149 "Color" - Name 153 "@entryPointOutput_Depth" + Name 149 "@entryPointOutput.Color" + Name 153 "@entryPointOutput.Depth" Name 156 "g_tTex1df4a" Name 159 "g_tTexcdf4" Name 162 "g_tTexcdi4" @@ -524,8 +524,8 @@ gl_FragCoord origin is upper left Decorate 99(g_tTex3df4) DescriptorSet 0 Decorate 114(g_tTex3di4) DescriptorSet 0 Decorate 125(g_tTex3du4) DescriptorSet 0 - Decorate 149(Color) Location 0 - Decorate 153(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 149(@entryPointOutput.Color) Location 0 + Decorate 153(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 156(g_tTex1df4a) DescriptorSet 0 Decorate 156(g_tTex1df4a) Binding 1 Decorate 159(g_tTexcdf4) DescriptorSet 0 @@ -621,9 +621,9 @@ gl_FragCoord origin is upper left 139: 7(fvec4) ConstantComposite 138 138 138 138 141: TypePointer Function 6(float) 148: TypePointer Output 7(fvec4) - 149(Color): 148(ptr) Variable Output +149(@entryPointOutput.Color): 148(ptr) Variable Output 152: TypePointer Output 6(float) -153(@entryPointOutput_Depth): 152(ptr) Variable Output +153(@entryPointOutput.Depth): 152(ptr) Variable Output 156(g_tTex1df4a): 15(ptr) Variable UniformConstant 157: TypeImage 6(float) Cube sampled format:Unknown 158: TypePointer UniformConstant 157 @@ -641,10 +641,10 @@ gl_FragCoord origin is upper left Store 146(flattenTemp) 147 150: 12(ptr) AccessChain 146(flattenTemp) 67 151: 7(fvec4) Load 150 - Store 149(Color) 151 + Store 149(@entryPointOutput.Color) 151 154: 141(ptr) AccessChain 146(flattenTemp) 28 155: 6(float) Load 154 - Store 153(@entryPointOutput_Depth) 155 + Store 153(@entryPointOutput.Depth) 155 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index fb41434c..56532b8d 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -140,13 +140,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -163,8 +163,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -311,13 +311,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -334,8 +334,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -369,8 +369,8 @@ gl_FragCoord origin is upper left Name 84 "g_tTex2du4" Name 91 "psout" Name 100 "flattenTemp" - Name 103 "Color" - Name 107 "@entryPointOutput_Depth" + Name 103 "@entryPointOutput.Color" + Name 107 "@entryPointOutput.Depth" Name 110 "g_tTex1df4a" Name 113 "g_tTexcdf4" Name 116 "g_tTexcdi4" @@ -384,8 +384,8 @@ gl_FragCoord origin is upper left Decorate 59(g_tTex2df4) DescriptorSet 0 Decorate 75(g_tTex2di4) DescriptorSet 0 Decorate 84(g_tTex2du4) DescriptorSet 0 - Decorate 103(Color) Location 0 - Decorate 107(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 103(@entryPointOutput.Color) Location 0 + Decorate 107(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 110(g_tTex1df4a) DescriptorSet 0 Decorate 110(g_tTex1df4a) Binding 1 Decorate 113(g_tTexcdf4) DescriptorSet 0 @@ -450,9 +450,9 @@ gl_FragCoord origin is upper left 93: 7(fvec4) ConstantComposite 92 92 92 92 95: TypePointer Function 6(float) 102: TypePointer Output 7(fvec4) - 103(Color): 102(ptr) Variable Output +103(@entryPointOutput.Color): 102(ptr) Variable Output 106: TypePointer Output 6(float) -107(@entryPointOutput_Depth): 106(ptr) Variable Output +107(@entryPointOutput.Depth): 106(ptr) Variable Output 110(g_tTex1df4a): 15(ptr) Variable UniformConstant 111: TypeImage 6(float) Cube array sampled format:Unknown 112: TypePointer UniformConstant 111 @@ -470,10 +470,10 @@ gl_FragCoord origin is upper left Store 100(flattenTemp) 101 104: 12(ptr) AccessChain 100(flattenTemp) 69 105: 7(fvec4) Load 104 - Store 103(Color) 105 + Store 103(@entryPointOutput.Color) 105 108: 95(ptr) AccessChain 100(flattenTemp) 31 109: 6(float) Load 108 - Store 107(@entryPointOutput_Depth) 109 + Store 107(@entryPointOutput.Depth) 109 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 1dc2756c..f02dfd2b 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -149,13 +149,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -329,13 +329,13 @@ gl_FragCoord origin is upper left 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:24 Color: direct index for structure ( temp 4-component vector of float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -393,8 +393,8 @@ gl_FragCoord origin is upper left Name 115 "g_tTexcdu4a" Name 126 "psout" Name 136 "flattenTemp" - Name 139 "Color" - Name 143 "@entryPointOutput_Depth" + Name 139 "@entryPointOutput.Color" + Name 143 "@entryPointOutput.Depth" Name 146 "g_tTex1df4" Decorate 16(g_tTex1df4a) DescriptorSet 0 Decorate 16(g_tTex1df4a) Binding 1 @@ -408,8 +408,8 @@ gl_FragCoord origin is upper left Decorate 95(g_tTexcdf4a) DescriptorSet 0 Decorate 105(g_tTexcdi4a) DescriptorSet 0 Decorate 115(g_tTexcdu4a) DescriptorSet 0 - Decorate 139(Color) Location 0 - Decorate 143(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 139(@entryPointOutput.Color) Location 0 + Decorate 143(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 146(g_tTex1df4) DescriptorSet 0 Decorate 146(g_tTex1df4) Binding 0 2: TypeVoid @@ -492,9 +492,9 @@ gl_FragCoord origin is upper left 130: 30(int) Constant 1 131: TypePointer Function 6(float) 138: TypePointer Output 7(fvec4) - 139(Color): 138(ptr) Variable Output +139(@entryPointOutput.Color): 138(ptr) Variable Output 142: TypePointer Output 6(float) -143(@entryPointOutput_Depth): 142(ptr) Variable Output +143(@entryPointOutput.Depth): 142(ptr) Variable Output 146(g_tTex1df4): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -503,10 +503,10 @@ gl_FragCoord origin is upper left Store 136(flattenTemp) 137 140: 12(ptr) AccessChain 136(flattenTemp) 127 141: 7(fvec4) Load 140 - Store 139(Color) 141 + Store 139(@entryPointOutput.Color) 141 144: 131(ptr) AccessChain 136(flattenTemp) 130 145: 6(float) Load 144 - Store 143(@entryPointOutput_Depth) 145 + Store 143(@entryPointOutput.Depth) 145 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 6cb50736..9a7cb9a6 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -179,13 +179,13 @@ gl_FragCoord origin is upper left 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:29 Color: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -206,8 +206,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -393,13 +393,13 @@ gl_FragCoord origin is upper left 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:29 Color: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -420,8 +420,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -466,8 +466,8 @@ gl_FragCoord origin is upper left Name 142 "g_tTexcdu4" Name 149 "psout" Name 160 "flattenTemp" - Name 163 "Color" - Name 167 "@entryPointOutput_Depth" + Name 163 "@entryPointOutput.Color" + Name 167 "@entryPointOutput.Depth" Name 170 "g_sSamp2d" Name 171 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 @@ -485,8 +485,8 @@ gl_FragCoord origin is upper left Decorate 124(g_tTexcdf4) DescriptorSet 0 Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 - Decorate 163(Color) Location 0 - Decorate 167(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 163(@entryPointOutput.Color) Location 0 + Decorate 167(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 170(g_sSamp2d) DescriptorSet 0 Decorate 171(g_tTex1df4a) DescriptorSet 0 Decorate 171(g_tTex1df4a) Binding 1 @@ -579,9 +579,9 @@ gl_FragCoord origin is upper left 154: 27(int) Constant 1 155: TypePointer Function 6(float) 162: TypePointer Output 7(fvec4) - 163(Color): 162(ptr) Variable Output +163(@entryPointOutput.Color): 162(ptr) Variable Output 166: TypePointer Output 6(float) -167(@entryPointOutput_Depth): 166(ptr) Variable Output +167(@entryPointOutput.Depth): 166(ptr) Variable Output 170(g_sSamp2d): 19(ptr) Variable UniformConstant 171(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 @@ -591,10 +591,10 @@ gl_FragCoord origin is upper left Store 160(flattenTemp) 161 164: 12(ptr) AccessChain 160(flattenTemp) 150 165: 7(fvec4) Load 164 - Store 163(Color) 165 + Store 163(@entryPointOutput.Color) 165 168: 155(ptr) AccessChain 160(flattenTemp) 154 169: 6(float) Load 168 - Store 167(@entryPointOutput_Depth) 169 + Store 167(@entryPointOutput.Depth) 169 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index 42449e9f..aaaf05ad 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -168,7 +168,7 @@ Shader version: 500 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:27 Pos: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Constant: @@ -188,7 +188,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) Linked vertex stage: @@ -363,7 +363,7 @@ Shader version: 500 0:? Sequence 0:27 Sequence 0:27 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:27 Pos: direct index for structure ( temp 4-component vector of float) 0:27 Function Call: @main( ( temp structure{ temp 4-component vector of float Pos}) 0:27 Constant: @@ -383,7 +383,7 @@ Shader version: 500 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -425,7 +425,7 @@ Shader version: 500 Name 139 "txval42" Name 142 "g_tTexcdu4" Name 149 "vsout" - Name 158 "@entryPointOutput_Pos" + Name 158 "@entryPointOutput.Pos" Name 161 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -442,7 +442,7 @@ Shader version: 500 Decorate 124(g_tTexcdf4) DescriptorSet 0 Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 - Decorate 158(@entryPointOutput_Pos) BuiltIn Position + Decorate 158(@entryPointOutput.Pos) BuiltIn Position Decorate 161(g_tTex1df4a) DescriptorSet 0 Decorate 161(g_tTex1df4a) Binding 1 2: TypeVoid @@ -532,13 +532,13 @@ Shader version: 500 151: 6(float) Constant 0 152: 7(fvec4) ConstantComposite 151 151 151 151 157: TypePointer Output 7(fvec4) -158(@entryPointOutput_Pos): 157(ptr) Variable Output +158(@entryPointOutput.Pos): 157(ptr) Variable Output 161(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 159:8(VS_OUTPUT) FunctionCall 10(@main() 160: 7(fvec4) CompositeExtract 159 0 - Store 158(@entryPointOutput_Pos) 160 + Store 158(@entryPointOutput.Pos) 160 Return FunctionEnd 10(@main():8(VS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 89e5152b..bb92ea7c 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -167,13 +167,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -368,13 +368,13 @@ gl_FragCoord origin is upper left 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:28 Color: direct index for structure ( temp 4-component vector of float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -394,8 +394,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -434,8 +434,8 @@ gl_FragCoord origin is upper left Name 121 "g_tTex3du4" Name 133 "psout" Name 142 "flattenTemp" - Name 145 "Color" - Name 149 "@entryPointOutput_Depth" + Name 145 "@entryPointOutput.Color" + Name 149 "@entryPointOutput.Depth" Name 152 "g_tTex1df4a" Name 155 "g_tTexcdf4" Name 158 "g_tTexcdi4" @@ -452,8 +452,8 @@ gl_FragCoord origin is upper left Decorate 97(g_tTex3df4) DescriptorSet 0 Decorate 110(g_tTex3di4) DescriptorSet 0 Decorate 121(g_tTex3du4) DescriptorSet 0 - Decorate 145(Color) Location 0 - Decorate 149(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 145(@entryPointOutput.Color) Location 0 + Decorate 149(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 152(g_tTex1df4a) DescriptorSet 0 Decorate 152(g_tTex1df4a) Binding 1 Decorate 155(g_tTexcdf4) DescriptorSet 0 @@ -545,9 +545,9 @@ gl_FragCoord origin is upper left 135: 7(fvec4) ConstantComposite 134 134 134 134 137: TypePointer Function 6(float) 144: TypePointer Output 7(fvec4) - 145(Color): 144(ptr) Variable Output +145(@entryPointOutput.Color): 144(ptr) Variable Output 148: TypePointer Output 6(float) -149(@entryPointOutput_Depth): 148(ptr) Variable Output +149(@entryPointOutput.Depth): 148(ptr) Variable Output 152(g_tTex1df4a): 15(ptr) Variable UniformConstant 153: TypeImage 6(float) Cube sampled format:Unknown 154: TypePointer UniformConstant 153 @@ -565,10 +565,10 @@ gl_FragCoord origin is upper left Store 142(flattenTemp) 143 146: 12(ptr) AccessChain 142(flattenTemp) 65 147: 7(fvec4) Load 146 - Store 145(Color) 147 + Store 145(@entryPointOutput.Color) 147 150: 137(ptr) AccessChain 142(flattenTemp) 27 151: 6(float) Load 150 - Store 149(@entryPointOutput_Depth) 151 + Store 149(@entryPointOutput.Depth) 151 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index 0a2e3358..adb4a8f0 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -122,13 +122,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -272,13 +272,13 @@ gl_FragCoord origin is upper left 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Function Call: @main( ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:20 Color: direct index for structure ( temp 4-component vector of float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? '@entryPointOutput_Depth' ( out float FragDepth) +0:? '@entryPointOutput.Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -292,8 +292,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) -0:? '@entryPointOutput_Depth' ( out float FragDepth) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Depth' ( out float FragDepth) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -326,8 +326,8 @@ gl_FragCoord origin is upper left Name 88 "g_tTex2du4" Name 99 "psout" Name 108 "flattenTemp" - Name 111 "Color" - Name 115 "@entryPointOutput_Depth" + Name 111 "@entryPointOutput.Color" + Name 115 "@entryPointOutput.Depth" Name 118 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -338,8 +338,8 @@ gl_FragCoord origin is upper left Decorate 64(g_tTex2df4) DescriptorSet 0 Decorate 77(g_tTex2di4) DescriptorSet 0 Decorate 88(g_tTex2du4) DescriptorSet 0 - Decorate 111(Color) Location 0 - Decorate 115(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 111(@entryPointOutput.Color) Location 0 + Decorate 115(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 118(g_tTex1df4a) DescriptorSet 0 Decorate 118(g_tTex1df4a) Binding 1 2: TypeVoid @@ -409,9 +409,9 @@ gl_FragCoord origin is upper left 101: 7(fvec4) ConstantComposite 100 100 100 100 103: TypePointer Function 6(float) 110: TypePointer Output 7(fvec4) - 111(Color): 110(ptr) Variable Output +111(@entryPointOutput.Color): 110(ptr) Variable Output 114: TypePointer Output 6(float) -115(@entryPointOutput_Depth): 114(ptr) Variable Output +115(@entryPointOutput.Depth): 114(ptr) Variable Output 118(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -420,10 +420,10 @@ gl_FragCoord origin is upper left Store 108(flattenTemp) 109 112: 12(ptr) AccessChain 108(flattenTemp) 30 113: 7(fvec4) Load 112 - Store 111(Color) 113 + Store 111(@entryPointOutput.Color) 113 116: 103(ptr) AccessChain 108(flattenTemp) 44 117: 6(float) Load 116 - Store 115(@entryPointOutput_Depth) 117 + Store 115(@entryPointOutput.Depth) 117 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.scalarCast.vert.out b/Test/baseResults/hlsl.scalarCast.vert.out index e1683c07..2ed9f2b5 100755 --- a/Test/baseResults/hlsl.scalarCast.vert.out +++ b/Test/baseResults/hlsl.scalarCast.vert.out @@ -143,7 +143,7 @@ Shader version: 500 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.position' ( out 4-component vector of float Position) 0:29 position: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 Constant: @@ -158,7 +158,7 @@ Shader version: 500 0:29 Constant: 0:29 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.position' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp 2-component vector of float texCoord}) @@ -309,7 +309,7 @@ Shader version: 500 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 Function Call: @main( ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.position' ( out 4-component vector of float Position) 0:29 position: direct index for structure ( temp 4-component vector of float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float position, temp 2-component vector of float texCoord}) 0:29 Constant: @@ -324,7 +324,7 @@ Shader version: 500 0:29 Constant: 0:29 1 (const int) 0:? Linker Objects -0:? '@entryPointOutput_position' ( out 4-component vector of float Position) +0:? '@entryPointOutput.position' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp 2-component vector of float texCoord}) // Module Version 10000 @@ -359,11 +359,11 @@ Shader version: 500 Name 96 "v4" Name 98 "v5" Name 105 "flattenTemp" - Name 108 "@entryPointOutput_position" + Name 108 "@entryPointOutput.position" Name 114 "VertexOut" MemberName 114(VertexOut) 0 "texCoord" Name 116 "@entryPointOutput" - Decorate 108(@entryPointOutput_position) BuiltIn Position + Decorate 108(@entryPointOutput.position) BuiltIn Position Decorate 116(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -391,7 +391,7 @@ Shader version: 500 101: 8(fvec2) ConstantComposite 59 59 102:9(VertexOut) ConstantComposite 100 101 107: TypePointer Output 7(fvec4) -108(@entryPointOutput_position): 107(ptr) Variable Output +108(@entryPointOutput.position): 107(ptr) Variable Output 109: TypeInt 32 1 110: 109(int) Constant 0 111: TypePointer Function 7(fvec4) @@ -408,7 +408,7 @@ Shader version: 500 Store 105(flattenTemp) 106 112: 111(ptr) AccessChain 105(flattenTemp) 110 113: 7(fvec4) Load 112 - Store 108(@entryPointOutput_position) 113 + Store 108(@entryPointOutput.position) 113 119: 118(ptr) AccessChain 105(flattenTemp) 117 120: 8(fvec2) Load 119 122: 121(ptr) AccessChain 116(@entryPointOutput) 110 diff --git a/Test/baseResults/hlsl.semantic.geom.out b/Test/baseResults/hlsl.semantic.geom.out index 5da0e611..88865184 100755 --- a/Test/baseResults/hlsl.semantic.geom.out +++ b/Test/baseResults/hlsl.semantic.geom.out @@ -13,7 +13,7 @@ output primitive = line_strip 0:15 Sequence 0:15 Sequence 0:15 move second child to first child ( temp float) -0:? 'OutputStream_clip0' ( out float Position) +0:? 'OutputStream.clip0' ( out float Position) 0:15 clip0: direct index for structure ( temp float) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: @@ -21,7 +21,7 @@ output primitive = line_strip 0:? Sequence 0:15 move second child to first child ( temp float) 0:15 direct index ( temp float) -0:? 'OutputStream_clip0' ( out 1-element array of float ClipDistance) +0:? 'OutputStream.clip0' ( out 1-element array of float ClipDistance) 0:15 Constant: 0:15 0 (const int) 0:15 clip0: direct index for structure ( temp float) @@ -31,7 +31,7 @@ output primitive = line_strip 0:? Sequence 0:15 move second child to first child ( temp float) 0:15 direct index ( temp float) -0:? 'OutputStream_cull0' ( out 1-element array of float CullDistance) +0:? 'OutputStream.cull0' ( out 1-element array of float CullDistance) 0:15 Constant: 0:15 0 (const int) 0:15 cull0: direct index for structure ( temp float) @@ -39,13 +39,13 @@ output primitive = line_strip 0:15 Constant: 0:15 2 (const int) 0:15 move second child to first child ( temp uint) -0:? 'OutputStream_vpai' ( out uint ViewportIndex) +0:? 'OutputStream.vpai' ( out uint ViewportIndex) 0:15 vpai: direct index for structure ( temp uint) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: 0:15 3 (const int) 0:15 move second child to first child ( temp uint) -0:? 'OutputStream_rtai' ( out uint Layer) +0:? 'OutputStream.rtai' ( out uint Layer) 0:15 rtai: direct index for structure ( temp uint) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: @@ -71,12 +71,12 @@ output primitive = line_strip 0:? 'OutputStream' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:? Linker Objects 0:? 'VertexID' (layout( location=0) in 3-element array of uint) -0:? 'OutputStream_clip0' ( out float Position) -0:? 'OutputStream_vpai' ( out uint ViewportIndex) -0:? 'OutputStream_rtai' ( out uint Layer) +0:? 'OutputStream.clip0' ( out float Position) +0:? 'OutputStream.vpai' ( out uint ViewportIndex) +0:? 'OutputStream.rtai' ( out uint Layer) 0:? 'OutputStream' (layout( location=0) out structure{ temp int ii}) -0:? 'OutputStream_clip0' ( out 1-element array of float ClipDistance) -0:? 'OutputStream_cull0' ( out 1-element array of float CullDistance) +0:? 'OutputStream.clip0' ( out 1-element array of float ClipDistance) +0:? 'OutputStream.cull0' ( out 1-element array of float CullDistance) Linked geometry stage: @@ -96,7 +96,7 @@ output primitive = line_strip 0:15 Sequence 0:15 Sequence 0:15 move second child to first child ( temp float) -0:? 'OutputStream_clip0' ( out float Position) +0:? 'OutputStream.clip0' ( out float Position) 0:15 clip0: direct index for structure ( temp float) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: @@ -104,7 +104,7 @@ output primitive = line_strip 0:? Sequence 0:15 move second child to first child ( temp float) 0:15 direct index ( temp float) -0:? 'OutputStream_clip0' ( out 1-element array of float ClipDistance) +0:? 'OutputStream.clip0' ( out 1-element array of float ClipDistance) 0:15 Constant: 0:15 0 (const int) 0:15 clip0: direct index for structure ( temp float) @@ -114,7 +114,7 @@ output primitive = line_strip 0:? Sequence 0:15 move second child to first child ( temp float) 0:15 direct index ( temp float) -0:? 'OutputStream_cull0' ( out 1-element array of float CullDistance) +0:? 'OutputStream.cull0' ( out 1-element array of float CullDistance) 0:15 Constant: 0:15 0 (const int) 0:15 cull0: direct index for structure ( temp float) @@ -122,13 +122,13 @@ output primitive = line_strip 0:15 Constant: 0:15 2 (const int) 0:15 move second child to first child ( temp uint) -0:? 'OutputStream_vpai' ( out uint ViewportIndex) +0:? 'OutputStream.vpai' ( out uint ViewportIndex) 0:15 vpai: direct index for structure ( temp uint) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: 0:15 3 (const int) 0:15 move second child to first child ( temp uint) -0:? 'OutputStream_rtai' ( out uint Layer) +0:? 'OutputStream.rtai' ( out uint Layer) 0:15 rtai: direct index for structure ( temp uint) 0:15 's' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:15 Constant: @@ -154,12 +154,12 @@ output primitive = line_strip 0:? 'OutputStream' ( temp structure{ temp float clip0, temp float clip0, temp float cull0, temp uint vpai, temp uint rtai, temp int ii}) 0:? Linker Objects 0:? 'VertexID' (layout( location=0) in 3-element array of uint) -0:? 'OutputStream_clip0' ( out float Position) -0:? 'OutputStream_vpai' ( out uint ViewportIndex) -0:? 'OutputStream_rtai' ( out uint Layer) +0:? 'OutputStream.clip0' ( out float Position) +0:? 'OutputStream.vpai' ( out uint ViewportIndex) +0:? 'OutputStream.rtai' ( out uint Layer) 0:? 'OutputStream' (layout( location=0) out structure{ temp int ii}) -0:? 'OutputStream_clip0' ( out 1-element array of float ClipDistance) -0:? 'OutputStream_cull0' ( out 1-element array of float CullDistance) +0:? 'OutputStream.clip0' ( out 1-element array of float ClipDistance) +0:? 'OutputStream.cull0' ( out 1-element array of float CullDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -188,12 +188,12 @@ output primitive = line_strip Name 17 "@main(u1[3];struct-S-f1-f1-f1-u1-u1-i11;" Name 15 "VertexID" Name 16 "OutputStream" - Name 20 "OutputStream_clip0" + Name 20 "OutputStream.clip0" Name 21 "s" - Name 29 "OutputStream_clip0" - Name 34 "OutputStream_cull0" - Name 40 "OutputStream_vpai" - Name 45 "OutputStream_rtai" + Name 29 "OutputStream.clip0" + Name 34 "OutputStream.cull0" + Name 40 "OutputStream.vpai" + Name 45 "OutputStream.rtai" Name 49 "S" MemberName 49(S) 0 "ii" Name 51 "OutputStream" @@ -202,11 +202,11 @@ output primitive = line_strip Name 62 "OutputStream" Name 63 "param" Name 65 "param" - Decorate 20(OutputStream_clip0) BuiltIn Position - Decorate 29(OutputStream_clip0) BuiltIn ClipDistance - Decorate 34(OutputStream_cull0) BuiltIn CullDistance - Decorate 40(OutputStream_vpai) BuiltIn ViewportIndex - Decorate 45(OutputStream_rtai) BuiltIn Layer + Decorate 20(OutputStream.clip0) BuiltIn Position + Decorate 29(OutputStream.clip0) BuiltIn ClipDistance + Decorate 34(OutputStream.cull0) BuiltIn CullDistance + Decorate 40(OutputStream.vpai) BuiltIn ViewportIndex + Decorate 45(OutputStream.rtai) BuiltIn Layer Decorate 51(OutputStream) Location 0 Decorate 60(VertexID) Location 0 2: TypeVoid @@ -221,21 +221,21 @@ output primitive = line_strip 13: TypePointer Function 12(S) 14: TypeFunction 2 9(ptr) 13(ptr) 19: TypePointer Output 10(float) -20(OutputStream_clip0): 19(ptr) Variable Output +20(OutputStream.clip0): 19(ptr) Variable Output 22: 11(int) Constant 0 23: TypePointer Function 10(float) 26: 6(int) Constant 1 27: TypeArray 10(float) 26 28: TypePointer Output 27 -29(OutputStream_clip0): 28(ptr) Variable Output +29(OutputStream.clip0): 28(ptr) Variable Output 30: 11(int) Constant 1 -34(OutputStream_cull0): 28(ptr) Variable Output +34(OutputStream.cull0): 28(ptr) Variable Output 35: 11(int) Constant 2 39: TypePointer Output 6(int) -40(OutputStream_vpai): 39(ptr) Variable Output +40(OutputStream.vpai): 39(ptr) Variable Output 41: 11(int) Constant 3 42: TypePointer Function 6(int) -45(OutputStream_rtai): 39(ptr) Variable Output +45(OutputStream.rtai): 39(ptr) Variable Output 46: 11(int) Constant 4 49(S): TypeStruct 11(int) 50: TypePointer Output 49(S) @@ -267,21 +267,21 @@ output primitive = line_strip 21(s): 13(ptr) Variable Function 24: 23(ptr) AccessChain 21(s) 22 25: 10(float) Load 24 - Store 20(OutputStream_clip0) 25 + Store 20(OutputStream.clip0) 25 31: 23(ptr) AccessChain 21(s) 30 32: 10(float) Load 31 - 33: 19(ptr) AccessChain 29(OutputStream_clip0) 22 + 33: 19(ptr) AccessChain 29(OutputStream.clip0) 22 Store 33 32 36: 23(ptr) AccessChain 21(s) 35 37: 10(float) Load 36 - 38: 19(ptr) AccessChain 34(OutputStream_cull0) 22 + 38: 19(ptr) AccessChain 34(OutputStream.cull0) 22 Store 38 37 43: 42(ptr) AccessChain 21(s) 41 44: 6(int) Load 43 - Store 40(OutputStream_vpai) 44 + Store 40(OutputStream.vpai) 44 47: 42(ptr) AccessChain 21(s) 46 48: 6(int) Load 47 - Store 45(OutputStream_rtai) 48 + Store 45(OutputStream.rtai) 48 54: 53(ptr) AccessChain 21(s) 52 55: 11(int) Load 54 57: 56(ptr) AccessChain 51(OutputStream) 22 diff --git a/Test/baseResults/hlsl.semantic.vert.out b/Test/baseResults/hlsl.semantic.vert.out index 106578e0..de7214f0 100755 --- a/Test/baseResults/hlsl.semantic.vert.out +++ b/Test/baseResults/hlsl.semantic.vert.out @@ -16,31 +16,31 @@ Shader version: 500 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 0 (const int) -0:? 'clip0' (layout( location=0) in float) +0:? 'ins.clip0' (layout( location=0) in float) 0:10 move second child to first child ( temp float) 0:10 clip1: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 1 (const int) -0:? 'clip1' (layout( location=1) in float) +0:? 'ins.clip1' (layout( location=1) in float) 0:10 move second child to first child ( temp float) 0:10 cull0: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 2 (const int) -0:? 'cull0' (layout( location=2) in float) +0:? 'ins.cull0' (layout( location=2) in float) 0:10 move second child to first child ( temp float) 0:10 cull1: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 3 (const int) -0:? 'cull1' (layout( location=3) in float) +0:? 'ins.cull1' (layout( location=3) in float) 0:10 move second child to first child ( temp int) 0:10 ii: direct index for structure ( temp int) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 4 (const int) -0:? 'ins_ii' ( in int InstanceIndex) +0:? 'ins.ii' ( in int InstanceIndex) 0:10 Sequence 0:10 move second child to first child ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 'flattenTemp' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) @@ -49,7 +49,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) 0:10 Constant: 0:10 0 (const int) 0:10 clip0: direct index for structure ( temp float) @@ -59,7 +59,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) 0:10 Constant: 0:10 1 (const int) 0:10 clip1: direct index for structure ( temp float) @@ -69,7 +69,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) 0:10 Constant: 0:10 0 (const int) 0:10 cull0: direct index for structure ( temp float) @@ -79,7 +79,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) 0:10 Constant: 0:10 1 (const int) 0:10 cull1: direct index for structure ( temp float) @@ -97,13 +97,13 @@ Shader version: 500 0:10 4 (const int) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int ii}) -0:? 'ins_ii' ( in int InstanceIndex) -0:? 'clip0' (layout( location=0) in float) -0:? 'clip1' (layout( location=1) in float) -0:? 'cull0' (layout( location=2) in float) -0:? 'cull1' (layout( location=3) in float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? 'ins.ii' ( in int InstanceIndex) +0:? 'ins.clip0' (layout( location=0) in float) +0:? 'ins.clip1' (layout( location=1) in float) +0:? 'ins.cull0' (layout( location=2) in float) +0:? 'ins.cull1' (layout( location=3) in float) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) Linked vertex stage: @@ -126,31 +126,31 @@ Shader version: 500 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 0 (const int) -0:? 'clip0' (layout( location=0) in float) +0:? 'ins.clip0' (layout( location=0) in float) 0:10 move second child to first child ( temp float) 0:10 clip1: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 1 (const int) -0:? 'clip1' (layout( location=1) in float) +0:? 'ins.clip1' (layout( location=1) in float) 0:10 move second child to first child ( temp float) 0:10 cull0: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 2 (const int) -0:? 'cull0' (layout( location=2) in float) +0:? 'ins.cull0' (layout( location=2) in float) 0:10 move second child to first child ( temp float) 0:10 cull1: direct index for structure ( temp float) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 3 (const int) -0:? 'cull1' (layout( location=3) in float) +0:? 'ins.cull1' (layout( location=3) in float) 0:10 move second child to first child ( temp int) 0:10 ii: direct index for structure ( temp int) 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 4 (const int) -0:? 'ins_ii' ( in int InstanceIndex) +0:? 'ins.ii' ( in int InstanceIndex) 0:10 Sequence 0:10 move second child to first child ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 'flattenTemp' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) @@ -159,7 +159,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) 0:10 Constant: 0:10 0 (const int) 0:10 clip0: direct index for structure ( temp float) @@ -169,7 +169,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) 0:10 Constant: 0:10 1 (const int) 0:10 clip1: direct index for structure ( temp float) @@ -179,7 +179,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) 0:10 Constant: 0:10 0 (const int) 0:10 cull0: direct index for structure ( temp float) @@ -189,7 +189,7 @@ Shader version: 500 0:? Sequence 0:10 move second child to first child ( temp float) 0:10 direct index ( temp float) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) 0:10 Constant: 0:10 1 (const int) 0:10 cull1: direct index for structure ( temp float) @@ -207,13 +207,13 @@ Shader version: 500 0:10 4 (const int) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int ii}) -0:? 'ins_ii' ( in int InstanceIndex) -0:? 'clip0' (layout( location=0) in float) -0:? 'clip1' (layout( location=1) in float) -0:? 'cull0' (layout( location=2) in float) -0:? 'cull1' (layout( location=3) in float) -0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) -0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) +0:? 'ins.ii' ( in int InstanceIndex) +0:? 'ins.clip0' (layout( location=0) in float) +0:? 'ins.clip1' (layout( location=1) in float) +0:? 'ins.cull0' (layout( location=2) in float) +0:? 'ins.cull1' (layout( location=3) in float) +0:? '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance) +0:? '@entryPointOutput.cull1' ( out 2-element array of float CullDistance) // Module Version 10000 // Generated by (magic number): 80001 @@ -237,25 +237,25 @@ Shader version: 500 Name 11 "ins" Name 14 "s" Name 18 "ins" - Name 21 "clip0" - Name 26 "clip1" - Name 30 "cull0" - Name 34 "cull1" - Name 39 "ins_ii" + Name 21 "ins.clip0" + Name 26 "ins.clip1" + Name 30 "ins.cull0" + Name 34 "ins.cull1" + Name 39 "ins.ii" Name 43 "flattenTemp" Name 44 "param" - Name 51 "@entryPointOutput_clip1" - Name 59 "@entryPointOutput_cull1" + Name 51 "@entryPointOutput.clip1" + Name 59 "@entryPointOutput.cull1" Name 66 "S" MemberName 66(S) 0 "ii" Name 68 "@entryPointOutput" - Decorate 21(clip0) Location 0 - Decorate 26(clip1) Location 1 - Decorate 30(cull0) Location 2 - Decorate 34(cull1) Location 3 - Decorate 39(ins_ii) BuiltIn InstanceIndex - Decorate 51(@entryPointOutput_clip1) BuiltIn ClipDistance - Decorate 59(@entryPointOutput_cull1) BuiltIn CullDistance + Decorate 21(ins.clip0) Location 0 + Decorate 26(ins.clip1) Location 1 + Decorate 30(ins.cull0) Location 2 + Decorate 34(ins.cull1) Location 3 + Decorate 39(ins.ii) BuiltIn InstanceIndex + Decorate 51(@entryPointOutput.clip1) BuiltIn ClipDistance + Decorate 59(@entryPointOutput.cull1) BuiltIn CullDistance Decorate 68(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -266,25 +266,25 @@ Shader version: 500 10: TypeFunction 8(S) 9(ptr) 19: 7(int) Constant 0 20: TypePointer Input 6(float) - 21(clip0): 20(ptr) Variable Input + 21(ins.clip0): 20(ptr) Variable Input 23: TypePointer Function 6(float) 25: 7(int) Constant 1 - 26(clip1): 20(ptr) Variable Input + 26(ins.clip1): 20(ptr) Variable Input 29: 7(int) Constant 2 - 30(cull0): 20(ptr) Variable Input + 30(ins.cull0): 20(ptr) Variable Input 33: 7(int) Constant 3 - 34(cull1): 20(ptr) Variable Input + 34(ins.cull1): 20(ptr) Variable Input 37: 7(int) Constant 4 38: TypePointer Input 7(int) - 39(ins_ii): 38(ptr) Variable Input + 39(ins.ii): 38(ptr) Variable Input 41: TypePointer Function 7(int) 47: TypeInt 32 0 48: 47(int) Constant 2 49: TypeArray 6(float) 48 50: TypePointer Output 49 -51(@entryPointOutput_clip1): 50(ptr) Variable Output +51(@entryPointOutput.clip1): 50(ptr) Variable Output 54: TypePointer Output 6(float) -59(@entryPointOutput_cull1): 50(ptr) Variable Output +59(@entryPointOutput.cull1): 50(ptr) Variable Output 66(S): TypeStruct 7(int) 67: TypePointer Output 66(S) 68(@entryPointOutput): 67(ptr) Variable Output @@ -294,19 +294,19 @@ Shader version: 500 18(ins): 9(ptr) Variable Function 43(flattenTemp): 9(ptr) Variable Function 44(param): 9(ptr) Variable Function - 22: 6(float) Load 21(clip0) + 22: 6(float) Load 21(ins.clip0) 24: 23(ptr) AccessChain 18(ins) 19 Store 24 22 - 27: 6(float) Load 26(clip1) + 27: 6(float) Load 26(ins.clip1) 28: 23(ptr) AccessChain 18(ins) 25 Store 28 27 - 31: 6(float) Load 30(cull0) + 31: 6(float) Load 30(ins.cull0) 32: 23(ptr) AccessChain 18(ins) 29 Store 32 31 - 35: 6(float) Load 34(cull1) + 35: 6(float) Load 34(ins.cull1) 36: 23(ptr) AccessChain 18(ins) 33 Store 36 35 - 40: 7(int) Load 39(ins_ii) + 40: 7(int) Load 39(ins.ii) 42: 41(ptr) AccessChain 18(ins) 37 Store 42 40 45: 8(S) Load 18(ins) @@ -315,19 +315,19 @@ Shader version: 500 Store 43(flattenTemp) 46 52: 23(ptr) AccessChain 43(flattenTemp) 19 53: 6(float) Load 52 - 55: 54(ptr) AccessChain 51(@entryPointOutput_clip1) 19 + 55: 54(ptr) AccessChain 51(@entryPointOutput.clip1) 19 Store 55 53 56: 23(ptr) AccessChain 43(flattenTemp) 25 57: 6(float) Load 56 - 58: 54(ptr) AccessChain 51(@entryPointOutput_clip1) 25 + 58: 54(ptr) AccessChain 51(@entryPointOutput.clip1) 25 Store 58 57 60: 23(ptr) AccessChain 43(flattenTemp) 29 61: 6(float) Load 60 - 62: 54(ptr) AccessChain 59(@entryPointOutput_cull1) 19 + 62: 54(ptr) AccessChain 59(@entryPointOutput.cull1) 19 Store 62 61 63: 23(ptr) AccessChain 43(flattenTemp) 33 64: 6(float) Load 63 - 65: 54(ptr) AccessChain 59(@entryPointOutput_cull1) 25 + 65: 54(ptr) AccessChain 59(@entryPointOutput.cull1) 25 Store 65 64 69: 41(ptr) AccessChain 43(flattenTemp) 37 70: 7(int) Load 69 diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index 2c26daad..87e0a4e9 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -26,13 +26,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:13 Sequence 0:13 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:13 color: direct index for structure ( temp 4-component vector of float) 0:13 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:13 Constant: 0:13 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -65,13 +65,13 @@ gl_FragCoord origin is upper left 0:? Sequence 0:13 Sequence 0:13 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) 0:13 color: direct index for structure ( temp 4-component vector of float) 0:13 Function Call: @main( ( temp structure{ temp 4-component vector of float color}) 0:13 Constant: 0:13 0 (const int) 0:? Linker Objects -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -90,8 +90,8 @@ gl_FragCoord origin is upper left MemberName 12(PS_OUTPUT) 0 "color" Name 14 "@main(" Name 17 "ps_output" - Name 28 "color" - Decorate 28(color) Location 0 + Name 28 "@entryPointOutput.color" + Decorate 28(@entryPointOutput.color) Location 0 2: TypeVoid 3: TypeFunction 2 10: TypeFloat 32 @@ -105,12 +105,12 @@ gl_FragCoord origin is upper left 21: 11(fvec4) ConstantComposite 20 20 20 20 22: TypePointer Function 11(fvec4) 27: TypePointer Output 11(fvec4) - 28(color): 27(ptr) Variable Output +28(@entryPointOutput.color): 27(ptr) Variable Output 4(main): 2 Function None 3 5: Label 29:12(PS_OUTPUT) FunctionCall 14(@main() 30: 11(fvec4) CompositeExtract 29 0 - Store 28(color) 30 + Store 28(@entryPointOutput.color) 30 Return FunctionEnd 6(MyFunc(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index 045b8fe0..d1f75224 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -22,7 +22,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:16 Sequence 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:16 Color: direct index for structure ( temp 4-component vector of float) 0:16 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:16 Constant: @@ -30,7 +30,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'TestTexture' ( uniform texture2D) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float TestUF}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -59,7 +59,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:16 Sequence 0:16 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:16 Color: direct index for structure ( temp 4-component vector of float) 0:16 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:16 Constant: @@ -67,7 +67,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'TestTexture' ( uniform texture2D) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float TestUF}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -84,12 +84,12 @@ gl_FragCoord origin is upper left MemberName 8(PS_OUTPUT) 0 "Color" Name 10 "@main(" Name 13 "psout" - Name 25 "Color" + Name 25 "@entryPointOutput.Color" Name 30 "TestTexture" Name 31 "$Global" MemberName 31($Global) 0 "TestUF" Name 33 "" - Decorate 25(Color) Location 0 + Decorate 25(@entryPointOutput.Color) Location 0 Decorate 30(TestTexture) DescriptorSet 0 MemberDecorate 31($Global) 0 Offset 0 Decorate 31($Global) Block @@ -108,7 +108,7 @@ gl_FragCoord origin is upper left 18: 7(fvec4) ConstantComposite 16 16 16 17 19: TypePointer Function 7(fvec4) 24: TypePointer Output 7(fvec4) - 25(Color): 24(ptr) Variable Output +25(@entryPointOutput.Color): 24(ptr) Variable Output 28: TypeImage 6(float) 2D sampled format:Unknown 29: TypePointer UniformConstant 28 30(TestTexture): 29(ptr) Variable UniformConstant @@ -119,7 +119,7 @@ gl_FragCoord origin is upper left 5: Label 26:8(PS_OUTPUT) FunctionCall 10(@main() 27: 7(fvec4) CompositeExtract 26 0 - Store 25(Color) 27 + Store 25(@entryPointOutput.Color) 27 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index b613b2bd..8cf6e37c 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -79,7 +79,7 @@ gl_FragCoord origin is upper left 0:? 's' ( temp structure{ temp 4-component vector of float a, temp bool b, temp 1-component vector of float c, temp 2-component vector of float d, temp bool ff1, temp bool ff2, temp bool ff3, temp 4-component vector of float ff4}) 0:40 Constant: 0:40 4 (const int) -0:? 's_ff1' ( flat in bool Face) +0:? 's.ff1' ( flat in bool Face) 0:40 move second child to first child ( temp bool) 0:40 ff2: direct index for structure ( temp bool) 0:? 's' ( temp structure{ temp 4-component vector of float a, temp bool b, temp 1-component vector of float c, temp 2-component vector of float d, temp bool ff1, temp bool ff2, temp bool ff3, temp 4-component vector of float ff4}) @@ -117,7 +117,7 @@ gl_FragCoord origin is upper left 0:? 's2' ( global structure{ temp 4-component vector of float i}) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) -0:? 's_ff1' ( flat in bool Face) +0:? 's.ff1' ( flat in bool Face) 0:? 's' (layout( location=1) in structure{ smooth temp 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, flat temp bool ff2, flat temp bool ff3, temp 4-component vector of float ff4}) @@ -200,7 +200,7 @@ gl_FragCoord origin is upper left 0:? 's' ( temp structure{ temp 4-component vector of float a, temp bool b, temp 1-component vector of float c, temp 2-component vector of float d, temp bool ff1, temp bool ff2, temp bool ff3, temp 4-component vector of float ff4}) 0:40 Constant: 0:40 4 (const int) -0:? 's_ff1' ( flat in bool Face) +0:? 's.ff1' ( flat in bool Face) 0:40 move second child to first child ( temp bool) 0:40 ff2: direct index for structure ( temp bool) 0:? 's' ( temp structure{ temp 4-component vector of float a, temp bool b, temp 1-component vector of float c, temp 2-component vector of float d, temp bool ff1, temp bool ff2, temp bool ff3, temp 4-component vector of float ff4}) @@ -238,7 +238,7 @@ gl_FragCoord origin is upper left 0:? 's2' ( global structure{ temp 4-component vector of float i}) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'input' (layout( location=0) in 4-component vector of float) -0:? 's_ff1' ( flat in bool Face) +0:? 's.ff1' ( flat in bool Face) 0:? 's' (layout( location=1) in structure{ smooth temp 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, flat temp bool ff2, flat temp bool ff3, temp 4-component vector of float ff4}) // Module Version 10000 @@ -287,7 +287,7 @@ gl_FragCoord origin is upper left MemberName 54(IN_S) 5 "ff3" MemberName 54(IN_S) 6 "ff4" Name 56 "s" - Name 79 "s_ff1" + Name 79 "s.ff1" Name 94 "@entryPointOutput" Name 95 "param" Name 97 "param" @@ -309,8 +309,8 @@ gl_FragCoord origin is upper left MemberDecorate 54(IN_S) 4 Flat MemberDecorate 54(IN_S) 5 Flat Decorate 56(s) Location 1 - Decorate 79(s_ff1) Flat - Decorate 79(s_ff1) BuiltIn FrontFacing + Decorate 79(s.ff1) Flat + Decorate 79(s.ff1) BuiltIn FrontFacing Decorate 94(@entryPointOutput) Location 0 MemberDecorate 101(myS) 0 Offset 0 MemberDecorate 101(myS) 1 Offset 4 @@ -360,7 +360,7 @@ gl_FragCoord origin is upper left 73: TypePointer Input 10(fvec2) 76: TypePointer Function 10(fvec2) 78: 31(int) Constant 4 - 79(s_ff1): 61(ptr) Variable Input + 79(s.ff1): 61(ptr) Variable Input 82: 31(int) Constant 5 86: 31(int) Constant 6 93: TypePointer Output 7(fvec4) @@ -394,7 +394,7 @@ gl_FragCoord origin is upper left 75: 10(fvec2) Load 74 77: 76(ptr) AccessChain 53(s) 72 Store 77 75 - 80: 9(bool) Load 79(s_ff1) + 80: 9(bool) Load 79(s.ff1) 81: 64(ptr) AccessChain 53(s) 78 Store 81 80 83: 61(ptr) AccessChain 56(s) 78 diff --git a/Test/baseResults/hlsl.struct.split-1.vert.out b/Test/baseResults/hlsl.struct.split-1.vert.out index 71d051b4..893895e7 100644 --- a/Test/baseResults/hlsl.struct.split-1.vert.out +++ b/Test/baseResults/hlsl.struct.split-1.vert.out @@ -46,19 +46,19 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 0 (const int) -0:? 'x0_in' (layout( location=0) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) 0:17 move second child to first child ( temp 4-component vector of float) 0:17 Pos_in: direct index for structure ( temp 4-component vector of float) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 1 (const int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) 0:17 move second child to first child ( temp int) 0:17 x1_in: direct index for structure ( temp int) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 2 (const int) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:17 move second child to first child ( temp 4-component vector of float) 0:? 'Pos_loose' ( temp 4-component vector of float) 0:? 'Pos_loose' (layout( location=3) in 4-component vector of float) @@ -78,7 +78,7 @@ Shader version: 500 0:17 Constant: 0:17 0 (const int) 0:17 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:17 Pos_out: direct index for structure ( temp 4-component vector of float) 0:17 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:17 Constant: @@ -93,11 +93,11 @@ Shader version: 500 0:17 Constant: 0:17 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int x0_out, temp int x1_out}) -0:? 'x0_in' (layout( location=0) in int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:? 'Pos_loose' (layout( location=3) in 4-component vector of float) @@ -151,19 +151,19 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 0 (const int) -0:? 'x0_in' (layout( location=0) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) 0:17 move second child to first child ( temp 4-component vector of float) 0:17 Pos_in: direct index for structure ( temp 4-component vector of float) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 1 (const int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) 0:17 move second child to first child ( temp int) 0:17 x1_in: direct index for structure ( temp int) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:17 Constant: 0:17 2 (const int) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:17 move second child to first child ( temp 4-component vector of float) 0:? 'Pos_loose' ( temp 4-component vector of float) 0:? 'Pos_loose' (layout( location=3) in 4-component vector of float) @@ -183,7 +183,7 @@ Shader version: 500 0:17 Constant: 0:17 0 (const int) 0:17 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:17 Pos_out: direct index for structure ( temp 4-component vector of float) 0:17 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:17 Constant: @@ -198,11 +198,11 @@ Shader version: 500 0:17 Constant: 0:17 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int x0_out, temp int x1_out}) -0:? 'x0_in' (layout( location=0) in int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:? 'Pos_loose' (layout( location=3) in 4-component vector of float) // Module Version 10000 @@ -228,9 +228,9 @@ Shader version: 500 Name 15 "Pos_loose" Name 19 "vsout" Name 38 "vsin" - Name 40 "x0_in" - Name 44 "Pos_in" - Name 47 "x1_in" + Name 40 "vsin.x0_in" + Name 44 "vsin.Pos_in" + Name 47 "vsin.x1_in" Name 50 "Pos_loose" Name 51 "Pos_loose" Name 53 "flattenTemp" @@ -240,13 +240,13 @@ Shader version: 500 MemberName 59(VS_OUTPUT) 0 "x0_out" MemberName 59(VS_OUTPUT) 1 "x1_out" Name 61 "@entryPointOutput" - Name 67 "@entryPointOutput_Pos_out" - Decorate 40(x0_in) Location 0 - Decorate 44(Pos_in) Location 1 - Decorate 47(x1_in) Location 2 + Name 67 "@entryPointOutput.Pos_out" + Decorate 40(vsin.x0_in) Location 0 + Decorate 44(vsin.Pos_in) Location 1 + Decorate 47(vsin.x1_in) Location 2 Decorate 51(Pos_loose) Location 3 Decorate 61(@entryPointOutput) Location 0 - Decorate 67(@entryPointOutput_Pos_out) BuiltIn Position + Decorate 67(@entryPointOutput.Pos_out) BuiltIn Position 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -263,17 +263,17 @@ Shader version: 500 25: 6(int) Constant 1 31: 6(int) Constant 2 39: TypePointer Input 6(int) - 40(x0_in): 39(ptr) Variable Input + 40(vsin.x0_in): 39(ptr) Variable Input 43: TypePointer Input 8(fvec4) - 44(Pos_in): 43(ptr) Variable Input - 47(x1_in): 39(ptr) Variable Input + 44(vsin.Pos_in): 43(ptr) Variable Input + 47(vsin.x1_in): 39(ptr) Variable Input 51(Pos_loose): 43(ptr) Variable Input 59(VS_OUTPUT): TypeStruct 6(int) 6(int) 60: TypePointer Output 59(VS_OUTPUT) 61(@entryPointOutput): 60(ptr) Variable Output 64: TypePointer Output 6(int) 66: TypePointer Output 8(fvec4) -67(@entryPointOutput_Pos_out): 66(ptr) Variable Output +67(@entryPointOutput.Pos_out): 66(ptr) Variable Output 4(main): 2 Function None 3 5: Label 38(vsin): 10(ptr) Variable Function @@ -281,13 +281,13 @@ Shader version: 500 53(flattenTemp): 18(ptr) Variable Function 54(param): 10(ptr) Variable Function 56(param): 11(ptr) Variable Function - 41: 6(int) Load 40(x0_in) + 41: 6(int) Load 40(vsin.x0_in) 42: 21(ptr) AccessChain 38(vsin) 20 Store 42 41 - 45: 8(fvec4) Load 44(Pos_in) + 45: 8(fvec4) Load 44(vsin.Pos_in) 46: 11(ptr) AccessChain 38(vsin) 25 Store 46 45 - 48: 6(int) Load 47(x1_in) + 48: 6(int) Load 47(vsin.x1_in) 49: 21(ptr) AccessChain 38(vsin) 31 Store 49 48 52: 8(fvec4) Load 51(Pos_loose) @@ -304,7 +304,7 @@ Shader version: 500 Store 65 63 68: 11(ptr) AccessChain 53(flattenTemp) 25 69: 8(fvec4) Load 68 - Store 67(@entryPointOutput_Pos_out) 69 + Store 67(@entryPointOutput.Pos_out) 69 70: 21(ptr) AccessChain 53(flattenTemp) 31 71: 6(int) Load 70 72: 64(ptr) AccessChain 61(@entryPointOutput) 25 diff --git a/Test/baseResults/hlsl.struct.split.array.geom.out b/Test/baseResults/hlsl.struct.split.array.geom.out index 01700865..1f181caf 100644 --- a/Test/baseResults/hlsl.struct.split.array.geom.out +++ b/Test/baseResults/hlsl.struct.split.array.geom.out @@ -72,7 +72,7 @@ output primitive = triangle_strip 0:? 'OutputStream' ( temp structure{ temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID}) 0:? Linker Objects 0:? 'v' (layout( location=0) in 1-element array of uint) -0:? 'OutputStream_Pos' ( out 4-component vector of float Position) +0:? 'OutputStream.Pos' ( out 4-component vector of float Position) 0:? 'OutputStream' (layout( location=0) out structure{ temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID}) @@ -152,7 +152,7 @@ output primitive = triangle_strip 0:? 'OutputStream' ( temp structure{ temp 4-component vector of float Pos, temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID}) 0:? Linker Objects 0:? 'v' (layout( location=0) in 1-element array of uint) -0:? 'OutputStream_Pos' ( out 4-component vector of float Position) +0:? 'OutputStream.Pos' ( out 4-component vector of float Position) 0:? 'OutputStream' (layout( location=0) out structure{ temp 2-component vector of float TexCoord, temp 3-component vector of float TerrainPos, temp uint VertexID}) // Module Version 10000 @@ -186,14 +186,14 @@ output primitive = triangle_strip Name 68 "OutputStream" Name 69 "param" Name 71 "param" - Name 75 "OutputStream_Pos" + Name 75 "OutputStream.Pos" Name 76 "PSInput" MemberName 76(PSInput) 0 "TexCoord" MemberName 76(PSInput) 1 "TerrainPos" MemberName 76(PSInput) 2 "VertexID" Name 78 "OutputStream" Decorate 66(v) Location 0 - Decorate 75(OutputStream_Pos) BuiltIn Position + Decorate 75(OutputStream.Pos) BuiltIn Position Decorate 78(OutputStream) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -228,7 +228,7 @@ output primitive = triangle_strip 65: TypePointer Input 8 66(v): 65(ptr) Variable Input 74: TypePointer Output 11(fvec4) -75(OutputStream_Pos): 74(ptr) Variable Output +75(OutputStream.Pos): 74(ptr) Variable Output 76(PSInput): TypeStruct 12(fvec2) 13(fvec3) 6(int) 77: TypePointer Output 76(PSInput) 78(OutputStream): 77(ptr) Variable Output diff --git a/Test/baseResults/hlsl.struct.split.assign.frag.out b/Test/baseResults/hlsl.struct.split.assign.frag.out index 9a50f770..ce2f50de 100644 --- a/Test/baseResults/hlsl.struct.split.assign.frag.out +++ b/Test/baseResults/hlsl.struct.split.assign.frag.out @@ -46,7 +46,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 0 (const int) 0:7 move second child to first child ( temp float) @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 1 (const int) 0:7 move second child to first child ( temp float) @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 2 (const int) 0:7 move second child to first child ( temp 4-component vector of float) @@ -111,7 +111,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'i' (layout( location=0) flat in int) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:? 'input' (layout( location=1) in 3-element array of structure{ temp float f}) @@ -165,7 +165,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 0 (const int) 0:7 move second child to first child ( temp float) @@ -192,7 +192,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 1 (const int) 0:7 move second child to first child ( temp float) @@ -219,7 +219,7 @@ gl_FragCoord origin is upper left 0:7 Constant: 0:7 1 (const int) 0:7 direct index ( in 4-component vector of float FragCoord) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:7 Constant: 0:7 2 (const int) 0:7 move second child to first child ( temp 4-component vector of float) @@ -230,7 +230,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:? 'i' (layout( location=0) flat in int) -0:? 'input_pos' ( in 3-element array of 4-component vector of float FragCoord) +0:? 'input.pos' ( in 3-element array of 4-component vector of float FragCoord) 0:? 'input' (layout( location=1) in 3-element array of structure{ temp float f}) // Module Version 10000 @@ -257,14 +257,14 @@ gl_FragCoord origin is upper left Name 36 "S" MemberName 36(S) 0 "f" Name 39 "input" - Name 48 "input_pos" + Name 48 "input.pos" Name 67 "@entryPointOutput" Name 68 "param" Name 70 "param" Decorate 32(i) Flat Decorate 32(i) Location 0 Decorate 39(input) Location 1 - Decorate 48(input_pos) BuiltIn FragCoord + Decorate 48(input.pos) BuiltIn FragCoord Decorate 67(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -294,7 +294,7 @@ gl_FragCoord origin is upper left 45: 6(int) Constant 1 46: TypeArray 9(fvec4) 12 47: TypePointer Input 46 - 48(input_pos): 47(ptr) Variable Input + 48(input.pos): 47(ptr) Variable Input 49: TypePointer Input 9(fvec4) 59: 6(int) Constant 2 66: TypePointer Output 9(fvec4) @@ -311,7 +311,7 @@ gl_FragCoord origin is upper left 42: 8(float) Load 41 44: 43(ptr) AccessChain 34(input) 35 35 Store 44 42 - 50: 49(ptr) AccessChain 48(input_pos) 35 + 50: 49(ptr) AccessChain 48(input.pos) 35 51: 9(fvec4) Load 50 52: 25(ptr) AccessChain 34(input) 35 45 Store 52 51 @@ -319,7 +319,7 @@ gl_FragCoord origin is upper left 54: 8(float) Load 53 55: 43(ptr) AccessChain 34(input) 45 35 Store 55 54 - 56: 49(ptr) AccessChain 48(input_pos) 45 + 56: 49(ptr) AccessChain 48(input.pos) 45 57: 9(fvec4) Load 56 58: 25(ptr) AccessChain 34(input) 45 45 Store 58 57 @@ -327,7 +327,7 @@ gl_FragCoord origin is upper left 61: 8(float) Load 60 62: 43(ptr) AccessChain 34(input) 59 35 Store 62 61 - 63: 49(ptr) AccessChain 48(input_pos) 59 + 63: 49(ptr) AccessChain 48(input.pos) 59 64: 9(fvec4) Load 63 65: 25(ptr) AccessChain 34(input) 59 45 Store 65 64 diff --git a/Test/baseResults/hlsl.struct.split.call.vert.out b/Test/baseResults/hlsl.struct.split.call.vert.out index 12fa3855..1921ef2c 100644 --- a/Test/baseResults/hlsl.struct.split.call.vert.out +++ b/Test/baseResults/hlsl.struct.split.call.vert.out @@ -60,19 +60,19 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 0 (const int) -0:? 'x0_in' (layout( location=0) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) 0:22 move second child to first child ( temp 4-component vector of float) 0:22 Pos_in: direct index for structure ( temp 4-component vector of float) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 1 (const int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) 0:22 move second child to first child ( temp int) 0:22 x1_in: direct index for structure ( temp int) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 2 (const int) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:22 Sequence 0:22 move second child to first child ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:22 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) @@ -88,7 +88,7 @@ Shader version: 500 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:22 Pos_out: direct index for structure ( temp 4-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:22 Constant: @@ -103,11 +103,11 @@ Shader version: 500 0:22 Constant: 0:22 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int x0_out, temp int x1_out}) -0:? 'x0_in' (layout( location=0) in int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.x1_in' (layout( location=2) in int) Linked vertex stage: @@ -174,19 +174,19 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 0 (const int) -0:? 'x0_in' (layout( location=0) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) 0:22 move second child to first child ( temp 4-component vector of float) 0:22 Pos_in: direct index for structure ( temp 4-component vector of float) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 1 (const int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) 0:22 move second child to first child ( temp int) 0:22 x1_in: direct index for structure ( temp int) 0:? 'vsin' ( temp structure{ temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in}) 0:22 Constant: 0:22 2 (const int) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x1_in' (layout( location=2) in int) 0:22 Sequence 0:22 move second child to first child ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:22 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) @@ -202,7 +202,7 @@ Shader version: 500 0:22 Constant: 0:22 0 (const int) 0:22 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:22 Pos_out: direct index for structure ( temp 4-component vector of float) 0:22 'flattenTemp' ( temp structure{ temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out}) 0:22 Constant: @@ -217,11 +217,11 @@ Shader version: 500 0:22 Constant: 0:22 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos_out' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos_out' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int x0_out, temp int x1_out}) -0:? 'x0_in' (layout( location=0) in int) -0:? 'Pos_in' (layout( location=1) in 4-component vector of float) -0:? 'x1_in' (layout( location=2) in int) +0:? 'vsin.x0_in' (layout( location=0) in int) +0:? 'vsin.Pos_in' (layout( location=1) in 4-component vector of float) +0:? 'vsin.x1_in' (layout( location=2) in int) // Module Version 10000 // Generated by (magic number): 80001 @@ -250,21 +250,21 @@ Shader version: 500 Name 42 "param" Name 44 "param" Name 50 "vsin" - Name 52 "x0_in" - Name 56 "Pos_in" - Name 59 "x1_in" + Name 52 "vsin.x0_in" + Name 56 "vsin.Pos_in" + Name 59 "vsin.x1_in" Name 62 "flattenTemp" Name 63 "param" Name 66 "VS_OUTPUT" MemberName 66(VS_OUTPUT) 0 "x0_out" MemberName 66(VS_OUTPUT) 1 "x1_out" Name 68 "@entryPointOutput" - Name 74 "@entryPointOutput_Pos_out" - Decorate 52(x0_in) Location 0 - Decorate 56(Pos_in) Location 1 - Decorate 59(x1_in) Location 2 + Name 74 "@entryPointOutput.Pos_out" + Decorate 52(vsin.x0_in) Location 0 + Decorate 56(vsin.Pos_in) Location 1 + Decorate 59(vsin.x1_in) Location 2 Decorate 68(@entryPointOutput) Location 0 - Decorate 74(@entryPointOutput_Pos_out) BuiltIn Position + Decorate 74(@entryPointOutput.Pos_out) BuiltIn Position 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -282,28 +282,28 @@ Shader version: 500 31: TypePointer Function 6(int) 38: 6(int) Constant 2 51: TypePointer Input 6(int) - 52(x0_in): 51(ptr) Variable Input + 52(vsin.x0_in): 51(ptr) Variable Input 55: TypePointer Input 8(fvec4) - 56(Pos_in): 55(ptr) Variable Input - 59(x1_in): 51(ptr) Variable Input + 56(vsin.Pos_in): 55(ptr) Variable Input + 59(vsin.x1_in): 51(ptr) Variable Input 66(VS_OUTPUT): TypeStruct 6(int) 6(int) 67: TypePointer Output 66(VS_OUTPUT) 68(@entryPointOutput): 67(ptr) Variable Output 71: TypePointer Output 6(int) 73: TypePointer Output 8(fvec4) -74(@entryPointOutput_Pos_out): 73(ptr) Variable Output +74(@entryPointOutput.Pos_out): 73(ptr) Variable Output 4(main): 2 Function None 3 5: Label 50(vsin): 10(ptr) Variable Function 62(flattenTemp): 12(ptr) Variable Function 63(param): 10(ptr) Variable Function - 53: 6(int) Load 52(x0_in) + 53: 6(int) Load 52(vsin.x0_in) 54: 31(ptr) AccessChain 50(vsin) 30 Store 54 53 - 57: 8(fvec4) Load 56(Pos_in) + 57: 8(fvec4) Load 56(vsin.Pos_in) 58: 23(ptr) AccessChain 50(vsin) 22 Store 58 57 - 60: 6(int) Load 59(x1_in) + 60: 6(int) Load 59(vsin.x1_in) 61: 31(ptr) AccessChain 50(vsin) 38 Store 61 60 64: 9(VS_INPUT) Load 50(vsin) @@ -316,7 +316,7 @@ Shader version: 500 Store 72 70 75: 23(ptr) AccessChain 62(flattenTemp) 22 76: 8(fvec4) Load 75 - Store 74(@entryPointOutput_Pos_out) 76 + Store 74(@entryPointOutput.Pos_out) 76 77: 31(ptr) AccessChain 62(flattenTemp) 38 78: 6(int) Load 77 79: 71(ptr) AccessChain 68(@entryPointOutput) 22 diff --git a/Test/baseResults/hlsl.struct.split.nested.geom.out b/Test/baseResults/hlsl.struct.split.nested.geom.out index 7182fc75..3a103ae6 100644 --- a/Test/baseResults/hlsl.struct.split.nested.geom.out +++ b/Test/baseResults/hlsl.struct.split.nested.geom.out @@ -73,7 +73,7 @@ output primitive = triangle_strip 0:33 Sequence 0:33 Sequence 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'ts_psIn_pos' ( out 4-component vector of float Position) +0:? 'ts.psIn.pos' ( out 4-component vector of float Position) 0:33 pos: direct index for structure ( temp 4-component vector of float) 0:33 psIn: direct index for structure ( temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc}) 0:33 'o' ( temp structure{ temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) @@ -119,7 +119,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -146,7 +146,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 1 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -173,7 +173,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 2 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -195,9 +195,9 @@ output primitive = triangle_strip 0:? 'tin' ( temp 3-element array of structure{ temp 4-component vector of float pos, temp 2-component vector of float tc}) 0:? 'ts' ( temp structure{ temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) 0:? Linker Objects -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:? 'tin' (layout( location=0) in 3-element array of structure{ temp 2-component vector of float tc}) -0:? 'ts_psIn_pos' ( out 4-component vector of float Position) +0:? 'ts.psIn.pos' ( out 4-component vector of float Position) 0:? 'ts' (layout( location=0) out structure{ temp structure{ temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) @@ -278,7 +278,7 @@ output primitive = triangle_strip 0:33 Sequence 0:33 Sequence 0:33 move second child to first child ( temp 4-component vector of float) -0:? 'ts_psIn_pos' ( out 4-component vector of float Position) +0:? 'ts.psIn.pos' ( out 4-component vector of float Position) 0:33 pos: direct index for structure ( temp 4-component vector of float) 0:33 psIn: direct index for structure ( temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc}) 0:33 'o' ( temp structure{ temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) @@ -324,7 +324,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -351,7 +351,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 1 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -378,7 +378,7 @@ output primitive = triangle_strip 0:24 Constant: 0:24 0 (const int) 0:24 direct index ( in 4-component vector of float Position) -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:24 Constant: 0:24 2 (const int) 0:24 move second child to first child ( temp 2-component vector of float) @@ -400,9 +400,9 @@ output primitive = triangle_strip 0:? 'tin' ( temp 3-element array of structure{ temp 4-component vector of float pos, temp 2-component vector of float tc}) 0:? 'ts' ( temp structure{ temp structure{ temp 4-component vector of float pos, temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) 0:? Linker Objects -0:? 'tin_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'tin.pos' ( in 3-element array of 4-component vector of float Position) 0:? 'tin' (layout( location=0) in 3-element array of structure{ temp 2-component vector of float tc}) -0:? 'ts_psIn_pos' ( out 4-component vector of float Position) +0:? 'ts.psIn.pos' ( out 4-component vector of float Position) 0:? 'ts' (layout( location=0) out structure{ temp structure{ temp 2-component vector of float tc} psIn, temp structure{ temp 2-element array of float m0_array, temp int m1} contains_no_builtin_io}) // Module Version 10000 @@ -432,7 +432,7 @@ output primitive = triangle_strip Name 21 "tin" Name 22 "ts" Name 25 "o" - Name 48 "ts_psIn_pos" + Name 48 "ts.psIn.pos" Name 51 "PS_IN" MemberName 51(PS_IN) 0 "tc" Name 52 "STRUCT_WITH_NO_BUILTIN_INTERSTAGE_IO" @@ -443,16 +443,16 @@ output primitive = triangle_strip MemberName 53(GS_OUT) 1 "contains_no_builtin_io" Name 55 "ts" Name 71 "tin" - Name 74 "tin_pos" + Name 74 "tin.pos" Name 79 "PS_IN" MemberName 79(PS_IN) 0 "tc" Name 82 "tin" Name 99 "ts" Name 100 "param" Name 102 "param" - Decorate 48(ts_psIn_pos) BuiltIn Position + Decorate 48(ts.psIn.pos) BuiltIn Position Decorate 55(ts) Location 0 - Decorate 74(tin_pos) BuiltIn Position + Decorate 74(tin.pos) BuiltIn Position Decorate 82(tin) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -488,7 +488,7 @@ output primitive = triangle_strip 44: 16(int) Constant 2 45: TypePointer Function 16(int) 47: TypePointer Output 7(fvec4) - 48(ts_psIn_pos): 47(ptr) Variable Output + 48(ts.psIn.pos): 47(ptr) Variable Output 51(PS_IN): TypeStruct 8(fvec2) 52(STRUCT_WITH_NO_BUILTIN_INTERSTAGE_IO): TypeStruct 15 16(int) 53(GS_OUT): TypeStruct 51(PS_IN) 52(STRUCT_WITH_NO_BUILTIN_INTERSTAGE_IO) @@ -501,7 +501,7 @@ output primitive = triangle_strip 69: TypePointer Output 16(int) 72: TypeArray 7(fvec4) 11 73: TypePointer Input 72 - 74(tin_pos): 73(ptr) Variable Input + 74(tin.pos): 73(ptr) Variable Input 75: TypePointer Input 7(fvec4) 79(PS_IN): TypeStruct 8(fvec2) 80: TypeArray 79(PS_IN) 11 @@ -514,7 +514,7 @@ output primitive = triangle_strip 99(ts): 19(ptr) Variable Function 100(param): 13(ptr) Variable Function 102(param): 19(ptr) Variable Function - 76: 75(ptr) AccessChain 74(tin_pos) 26 + 76: 75(ptr) AccessChain 74(tin.pos) 26 77: 7(fvec4) Load 76 78: 32(ptr) AccessChain 71(tin) 26 26 Store 78 77 @@ -522,7 +522,7 @@ output primitive = triangle_strip 85: 8(fvec2) Load 84 86: 38(ptr) AccessChain 71(tin) 26 34 Store 86 85 - 87: 75(ptr) AccessChain 74(tin_pos) 34 + 87: 75(ptr) AccessChain 74(tin.pos) 34 88: 7(fvec4) Load 87 89: 32(ptr) AccessChain 71(tin) 34 26 Store 89 88 @@ -530,7 +530,7 @@ output primitive = triangle_strip 91: 8(fvec2) Load 90 92: 38(ptr) AccessChain 71(tin) 34 34 Store 92 91 - 93: 75(ptr) AccessChain 74(tin_pos) 44 + 93: 75(ptr) AccessChain 74(tin.pos) 44 94: 7(fvec4) Load 93 95: 32(ptr) AccessChain 71(tin) 44 26 Store 95 94 @@ -562,7 +562,7 @@ output primitive = triangle_strip Store 46 44 49: 32(ptr) AccessChain 25(o) 26 26 50: 7(fvec4) Load 49 - Store 48(ts_psIn_pos) 50 + Store 48(ts.psIn.pos) 50 56: 38(ptr) AccessChain 25(o) 26 34 57: 8(fvec2) Load 56 59: 58(ptr) AccessChain 55(ts) 26 26 diff --git a/Test/baseResults/hlsl.struct.split.trivial.geom.out b/Test/baseResults/hlsl.struct.split.trivial.geom.out index e55eb033..25f2fdf1 100644 --- a/Test/baseResults/hlsl.struct.split.trivial.geom.out +++ b/Test/baseResults/hlsl.struct.split.trivial.geom.out @@ -37,7 +37,7 @@ output primitive = triangle_strip 0:19 Sequence 0:19 Sequence 0:19 move second child to first child ( temp 4-component vector of float) -0:? 'ts_pos' ( out 4-component vector of float Position) +0:? 'ts.pos' ( out 4-component vector of float Position) 0:19 pos: direct index for structure ( temp 4-component vector of float) 0:19 'o' ( temp structure{ temp 4-component vector of float pos}) 0:19 Constant: @@ -59,7 +59,7 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 0 (const int) 0:14 move second child to first child ( temp 4-component vector of float) @@ -71,7 +71,7 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 1 (const int) 0:14 move second child to first child ( temp 4-component vector of float) @@ -83,15 +83,15 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 2 (const int) 0:14 Function Call: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; ( temp void) 0:? 'i' ( temp 3-element array of structure{ temp 4-component vector of float pos}) 0:? 'ts' ( temp structure{ temp 4-component vector of float pos}) 0:? Linker Objects -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) -0:? 'ts_pos' ( out 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) +0:? 'ts.pos' ( out 4-component vector of float Position) Linked geometry stage: @@ -135,7 +135,7 @@ output primitive = triangle_strip 0:19 Sequence 0:19 Sequence 0:19 move second child to first child ( temp 4-component vector of float) -0:? 'ts_pos' ( out 4-component vector of float Position) +0:? 'ts.pos' ( out 4-component vector of float Position) 0:19 pos: direct index for structure ( temp 4-component vector of float) 0:19 'o' ( temp structure{ temp 4-component vector of float pos}) 0:19 Constant: @@ -157,7 +157,7 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 0 (const int) 0:14 move second child to first child ( temp 4-component vector of float) @@ -169,7 +169,7 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 1 (const int) 0:14 move second child to first child ( temp 4-component vector of float) @@ -181,15 +181,15 @@ output primitive = triangle_strip 0:14 Constant: 0:14 0 (const int) 0:14 direct index ( in 4-component vector of float Position) -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) 0:14 Constant: 0:14 2 (const int) 0:14 Function Call: @main(struct-PS_IN-vf41[3];struct-GS_OUT-vf41; ( temp void) 0:? 'i' ( temp 3-element array of structure{ temp 4-component vector of float pos}) 0:? 'ts' ( temp structure{ temp 4-component vector of float pos}) 0:? Linker Objects -0:? 'i_pos' ( in 3-element array of 4-component vector of float Position) -0:? 'ts_pos' ( out 4-component vector of float Position) +0:? 'i.pos' ( in 3-element array of 4-component vector of float Position) +0:? 'ts.pos' ( out 4-component vector of float Position) // Module Version 10000 // Generated by (magic number): 80001 @@ -214,14 +214,14 @@ output primitive = triangle_strip Name 17 "ts" Name 22 "x" Name 33 "o" - Name 40 "ts_pos" + Name 40 "ts.pos" Name 46 "i" - Name 49 "i_pos" + Name 49 "i.pos" Name 61 "ts" Name 62 "param" Name 64 "param" - Decorate 40(ts_pos) BuiltIn Position - Decorate 49(i_pos) BuiltIn Position + Decorate 40(ts.pos) BuiltIn Position + Decorate 49(i.pos) BuiltIn Position 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -241,11 +241,11 @@ output primitive = triangle_strip 31: TypeBool 35: TypePointer Function 7(fvec4) 39: TypePointer Output 7(fvec4) - 40(ts_pos): 39(ptr) Variable Output + 40(ts.pos): 39(ptr) Variable Output 44: 20(int) Constant 1 47: TypeArray 7(fvec4) 10 48: TypePointer Input 47 - 49(i_pos): 48(ptr) Variable Input + 49(i.pos): 48(ptr) Variable Input 50: TypePointer Input 7(fvec4) 57: 20(int) Constant 2 4(main): 2 Function None 3 @@ -254,15 +254,15 @@ output primitive = triangle_strip 61(ts): 14(ptr) Variable Function 62(param): 12(ptr) Variable Function 64(param): 14(ptr) Variable Function - 51: 50(ptr) AccessChain 49(i_pos) 23 + 51: 50(ptr) AccessChain 49(i.pos) 23 52: 7(fvec4) Load 51 53: 35(ptr) AccessChain 46(i) 23 23 Store 53 52 - 54: 50(ptr) AccessChain 49(i_pos) 44 + 54: 50(ptr) AccessChain 49(i.pos) 44 55: 7(fvec4) Load 54 56: 35(ptr) AccessChain 46(i) 44 23 Store 56 55 - 58: 50(ptr) AccessChain 49(i_pos) 57 + 58: 50(ptr) AccessChain 49(i.pos) 57 59: 7(fvec4) Load 58 60: 35(ptr) AccessChain 46(i) 57 23 Store 60 59 @@ -296,7 +296,7 @@ output primitive = triangle_strip Store 38 37 41: 35(ptr) AccessChain 33(o) 23 42: 7(fvec4) Load 41 - Store 40(ts_pos) 42 + Store 40(ts.pos) 42 EmitVertex Branch 27 27: Label diff --git a/Test/baseResults/hlsl.struct.split.trivial.vert.out b/Test/baseResults/hlsl.struct.split.trivial.vert.out index 80192cc4..6711312b 100644 --- a/Test/baseResults/hlsl.struct.split.trivial.vert.out +++ b/Test/baseResults/hlsl.struct.split.trivial.vert.out @@ -28,13 +28,13 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp 4-component vector of float Pos_in}) 0:16 Constant: 0:16 0 (const int) -0:? 'Pos_in' (layout( location=0) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=0) in 4-component vector of float) 0:16 move second child to first child ( temp 4-component vector of float) 0:? 'Pos_loose' ( temp 4-component vector of float) 0:? 'Pos_loose' (layout( location=1) in 4-component vector of float) 0:16 Sequence 0:16 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:16 Pos: direct index for structure ( temp 4-component vector of float) 0:16 Function Call: @main(struct-VS_INPUT-vf41;vf4; ( temp structure{ temp 4-component vector of float Pos}) 0:? 'vsin' ( temp structure{ temp 4-component vector of float Pos_in}) @@ -42,8 +42,8 @@ Shader version: 500 0:16 Constant: 0:16 0 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) -0:? 'Pos_in' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) +0:? 'vsin.Pos_in' (layout( location=0) in 4-component vector of float) 0:? 'Pos_loose' (layout( location=1) in 4-component vector of float) @@ -79,13 +79,13 @@ Shader version: 500 0:? 'vsin' ( temp structure{ temp 4-component vector of float Pos_in}) 0:16 Constant: 0:16 0 (const int) -0:? 'Pos_in' (layout( location=0) in 4-component vector of float) +0:? 'vsin.Pos_in' (layout( location=0) in 4-component vector of float) 0:16 move second child to first child ( temp 4-component vector of float) 0:? 'Pos_loose' ( temp 4-component vector of float) 0:? 'Pos_loose' (layout( location=1) in 4-component vector of float) 0:16 Sequence 0:16 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) 0:16 Pos: direct index for structure ( temp 4-component vector of float) 0:16 Function Call: @main(struct-VS_INPUT-vf41;vf4; ( temp structure{ temp 4-component vector of float Pos}) 0:? 'vsin' ( temp structure{ temp 4-component vector of float Pos_in}) @@ -93,8 +93,8 @@ Shader version: 500 0:16 Constant: 0:16 0 (const int) 0:? Linker Objects -0:? '@entryPointOutput_Pos' ( out 4-component vector of float Position) -0:? 'Pos_in' (layout( location=0) in 4-component vector of float) +0:? '@entryPointOutput.Pos' ( out 4-component vector of float Position) +0:? 'vsin.Pos_in' (layout( location=0) in 4-component vector of float) 0:? 'Pos_loose' (layout( location=1) in 4-component vector of float) // Module Version 10000 @@ -116,15 +116,15 @@ Shader version: 500 Name 14 "Pos_loose" Name 18 "vsout" Name 29 "vsin" - Name 31 "Pos_in" + Name 31 "vsin.Pos_in" Name 34 "Pos_loose" Name 35 "Pos_loose" - Name 38 "@entryPointOutput_Pos" + Name 38 "@entryPointOutput.Pos" Name 39 "param" Name 41 "param" - Decorate 31(Pos_in) Location 0 + Decorate 31(vsin.Pos_in) Location 0 Decorate 35(Pos_loose) Location 1 - Decorate 38(@entryPointOutput_Pos) BuiltIn Position + Decorate 38(@entryPointOutput.Pos) BuiltIn Position 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -138,17 +138,17 @@ Shader version: 500 19: TypeInt 32 1 20: 19(int) Constant 0 30: TypePointer Input 7(fvec4) - 31(Pos_in): 30(ptr) Variable Input + 31(vsin.Pos_in): 30(ptr) Variable Input 35(Pos_loose): 30(ptr) Variable Input 37: TypePointer Output 7(fvec4) -38(@entryPointOutput_Pos): 37(ptr) Variable Output +38(@entryPointOutput.Pos): 37(ptr) Variable Output 4(main): 2 Function None 3 5: Label 29(vsin): 9(ptr) Variable Function 34(Pos_loose): 10(ptr) Variable Function 39(param): 9(ptr) Variable Function 41(param): 10(ptr) Variable Function - 32: 7(fvec4) Load 31(Pos_in) + 32: 7(fvec4) Load 31(vsin.Pos_in) 33: 10(ptr) AccessChain 29(vsin) 20 Store 33 32 36: 7(fvec4) Load 35(Pos_loose) @@ -159,7 +159,7 @@ Shader version: 500 Store 41(param) 42 43:11(VS_OUTPUT) FunctionCall 15(@main(struct-VS_INPUT-vf41;vf4;) 39(param) 41(param) 44: 7(fvec4) CompositeExtract 43 0 - Store 38(@entryPointOutput_Pos) 44 + Store 38(@entryPointOutput.Pos) 44 Return FunctionEnd 15(@main(struct-VS_INPUT-vf41;vf4;):11(VS_OUTPUT) Function None 12 diff --git a/Test/baseResults/hlsl.structIoFourWay.frag.out b/Test/baseResults/hlsl.structIoFourWay.frag.out index 3eb6c243..e0d9725f 100755 --- a/Test/baseResults/hlsl.structIoFourWay.frag.out +++ b/Test/baseResults/hlsl.structIoFourWay.frag.out @@ -18,50 +18,50 @@ using depth_greater 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 0 (const int) -0:? 'f' (layout( location=0) in float) +0:? 't.f' (layout( location=0) in float) 0:15 move second child to first child ( temp float) 0:15 g: direct index for structure ( temp float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 1 (const int) -0:? 'g' (layout( location=1) centroid in float) +0:? 't.g' (layout( location=1) centroid in float) 0:15 move second child to first child ( temp float) 0:15 d: direct index for structure ( temp float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 2 (const int) -0:? 'd' (layout( location=2) in float) +0:? 't.d' (layout( location=2) in float) 0:15 move second child to first child ( temp 4-component vector of float) 0:15 normal: direct index for structure ( temp 4-component vector of float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 3 (const int) -0:? 'normal' (layout( location=3) in 4-component vector of float) +0:? 't.normal' (layout( location=3) in 4-component vector of float) 0:15 Sequence 0:15 move second child to first child ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Function Call: @main(struct-T-f1-f1-f1-vf41; ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 move second child to first child ( temp float) -0:? 'f' (layout( location=0) out float) +0:? '@entryPointOutput.f' (layout( location=0) out float) 0:15 f: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 0 (const int) 0:15 move second child to first child ( temp float) -0:? 'g' (layout( location=1) out float) +0:? '@entryPointOutput.g' (layout( location=1) out float) 0:15 g: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 1 (const int) 0:15 move second child to first child ( temp float) -0:? '@entryPointOutput_d' ( out float FragDepth) +0:? '@entryPointOutput.d' ( out float FragDepth) 0:15 d: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 2 (const int) 0:15 move second child to first child ( temp 4-component vector of float) -0:? 'normal' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.normal' (layout( location=2) out 4-component vector of float) 0:15 normal: direct index for structure ( temp 4-component vector of float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: @@ -69,14 +69,14 @@ using depth_greater 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s}) 0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t}) -0:? '@entryPointOutput_d' ( out float FragDepth) -0:? 'f' (layout( location=0) out float) -0:? 'g' (layout( location=1) out float) -0:? 'normal' (layout( location=2) out 4-component vector of float) -0:? 'f' (layout( location=0) in float) -0:? 'g' (layout( location=1) centroid in float) -0:? 'd' (layout( location=2) in float) -0:? 'normal' (layout( location=3) in 4-component vector of float) +0:? '@entryPointOutput.d' ( out float FragDepth) +0:? '@entryPointOutput.f' (layout( location=0) out float) +0:? '@entryPointOutput.g' (layout( location=1) out float) +0:? '@entryPointOutput.normal' (layout( location=2) out 4-component vector of float) +0:? 't.f' (layout( location=0) in float) +0:? 't.g' (layout( location=1) centroid in float) +0:? 't.d' (layout( location=2) in float) +0:? 't.normal' (layout( location=3) in 4-component vector of float) Linked fragment stage: @@ -101,50 +101,50 @@ using depth_greater 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 0 (const int) -0:? 'f' (layout( location=0) in float) +0:? 't.f' (layout( location=0) in float) 0:15 move second child to first child ( temp float) 0:15 g: direct index for structure ( temp float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 1 (const int) -0:? 'g' (layout( location=1) centroid in float) +0:? 't.g' (layout( location=1) centroid in float) 0:15 move second child to first child ( temp float) 0:15 d: direct index for structure ( temp float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 2 (const int) -0:? 'd' (layout( location=2) in float) +0:? 't.d' (layout( location=2) in float) 0:15 move second child to first child ( temp 4-component vector of float) 0:15 normal: direct index for structure ( temp 4-component vector of float) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 3 (const int) -0:? 'normal' (layout( location=3) in 4-component vector of float) +0:? 't.normal' (layout( location=3) in 4-component vector of float) 0:15 Sequence 0:15 move second child to first child ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Function Call: @main(struct-T-f1-f1-f1-vf41; ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:? 't' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 move second child to first child ( temp float) -0:? 'f' (layout( location=0) out float) +0:? '@entryPointOutput.f' (layout( location=0) out float) 0:15 f: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 0 (const int) 0:15 move second child to first child ( temp float) -0:? 'g' (layout( location=1) out float) +0:? '@entryPointOutput.g' (layout( location=1) out float) 0:15 g: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 1 (const int) 0:15 move second child to first child ( temp float) -0:? '@entryPointOutput_d' ( out float FragDepth) +0:? '@entryPointOutput.d' ( out float FragDepth) 0:15 d: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: 0:15 2 (const int) 0:15 move second child to first child ( temp 4-component vector of float) -0:? 'normal' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.normal' (layout( location=2) out 4-component vector of float) 0:15 normal: direct index for structure ( temp 4-component vector of float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: @@ -152,14 +152,14 @@ using depth_greater 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s}) 0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t}) -0:? '@entryPointOutput_d' ( out float FragDepth) -0:? 'f' (layout( location=0) out float) -0:? 'g' (layout( location=1) out float) -0:? 'normal' (layout( location=2) out 4-component vector of float) -0:? 'f' (layout( location=0) in float) -0:? 'g' (layout( location=1) centroid in float) -0:? 'd' (layout( location=2) in float) -0:? 'normal' (layout( location=3) in 4-component vector of float) +0:? '@entryPointOutput.d' ( out float FragDepth) +0:? '@entryPointOutput.f' (layout( location=0) out float) +0:? '@entryPointOutput.g' (layout( location=1) out float) +0:? '@entryPointOutput.normal' (layout( location=2) out 4-component vector of float) +0:? 't.f' (layout( location=0) in float) +0:? 't.g' (layout( location=1) centroid in float) +0:? 't.d' (layout( location=2) in float) +0:? 't.normal' (layout( location=3) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -182,16 +182,16 @@ using depth_greater Name 11 "t" Name 14 "local" Name 18 "t" - Name 22 "f" - Name 27 "g" - Name 31 "d" - Name 36 "normal" + Name 22 "t.f" + Name 27 "t.g" + Name 31 "t.d" + Name 36 "t.normal" Name 40 "flattenTemp" Name 41 "param" - Name 45 "f" - Name 48 "g" - Name 51 "@entryPointOutput_d" - Name 55 "normal" + Name 45 "@entryPointOutput.f" + Name 48 "@entryPointOutput.g" + Name 51 "@entryPointOutput.d" + Name 55 "@entryPointOutput.normal" Name 58 "T" MemberName 58(T) 0 "f" MemberName 58(T) 1 "g" @@ -203,15 +203,15 @@ using depth_greater Name 62 "buff" MemberName 62(buff) 0 "t" Name 64 "" - Decorate 22(f) Location 0 - Decorate 27(g) Centroid - Decorate 27(g) Location 1 - Decorate 31(d) Location 2 - Decorate 36(normal) Location 3 - Decorate 45(f) Location 0 - Decorate 48(g) Location 1 - Decorate 51(@entryPointOutput_d) BuiltIn FragDepth - Decorate 55(normal) Location 2 + Decorate 22(t.f) Location 0 + Decorate 27(t.g) Centroid + Decorate 27(t.g) Location 1 + Decorate 31(t.d) Location 2 + Decorate 36(t.normal) Location 3 + Decorate 45(@entryPointOutput.f) Location 0 + Decorate 48(@entryPointOutput.g) Location 1 + Decorate 51(@entryPointOutput.d) BuiltIn FragDepth + Decorate 55(@entryPointOutput.normal) Location 2 MemberDecorate 58(T) 0 Offset 68 MemberDecorate 58(T) 1 Offset 72 MemberDecorate 58(T) 2 Offset 76 @@ -232,22 +232,22 @@ using depth_greater 19: TypeInt 32 1 20: 19(int) Constant 0 21: TypePointer Input 6(float) - 22(f): 21(ptr) Variable Input + 22(t.f): 21(ptr) Variable Input 24: TypePointer Function 6(float) 26: 19(int) Constant 1 - 27(g): 21(ptr) Variable Input + 27(t.g): 21(ptr) Variable Input 30: 19(int) Constant 2 - 31(d): 21(ptr) Variable Input + 31(t.d): 21(ptr) Variable Input 34: 19(int) Constant 3 35: TypePointer Input 7(fvec4) - 36(normal): 35(ptr) Variable Input + 36(t.normal): 35(ptr) Variable Input 38: TypePointer Function 7(fvec4) 44: TypePointer Output 6(float) - 45(f): 44(ptr) Variable Output - 48(g): 44(ptr) Variable Output -51(@entryPointOutput_d): 44(ptr) Variable Output +45(@entryPointOutput.f): 44(ptr) Variable Output +48(@entryPointOutput.g): 44(ptr) Variable Output +51(@entryPointOutput.d): 44(ptr) Variable Output 54: TypePointer Output 7(fvec4) - 55(normal): 54(ptr) Variable Output +55(@entryPointOutput.normal): 54(ptr) Variable Output 58(T): TypeStruct 6(float) 6(float) 6(float) 7(fvec4) 59($Global): TypeStruct 58(T) 60: TypePointer Uniform 59($Global) @@ -260,16 +260,16 @@ using depth_greater 18(t): 9(ptr) Variable Function 40(flattenTemp): 9(ptr) Variable Function 41(param): 9(ptr) Variable Function - 23: 6(float) Load 22(f) + 23: 6(float) Load 22(t.f) 25: 24(ptr) AccessChain 18(t) 20 Store 25 23 - 28: 6(float) Load 27(g) + 28: 6(float) Load 27(t.g) 29: 24(ptr) AccessChain 18(t) 26 Store 29 28 - 32: 6(float) Load 31(d) + 32: 6(float) Load 31(t.d) 33: 24(ptr) AccessChain 18(t) 30 Store 33 32 - 37: 7(fvec4) Load 36(normal) + 37: 7(fvec4) Load 36(t.normal) 39: 38(ptr) AccessChain 18(t) 34 Store 39 37 42: 8(T) Load 18(t) @@ -278,16 +278,16 @@ using depth_greater Store 40(flattenTemp) 43 46: 24(ptr) AccessChain 40(flattenTemp) 20 47: 6(float) Load 46 - Store 45(f) 47 + Store 45(@entryPointOutput.f) 47 49: 24(ptr) AccessChain 40(flattenTemp) 26 50: 6(float) Load 49 - Store 48(g) 50 + Store 48(@entryPointOutput.g) 50 52: 24(ptr) AccessChain 40(flattenTemp) 30 53: 6(float) Load 52 - Store 51(@entryPointOutput_d) 53 + Store 51(@entryPointOutput.d) 53 56: 38(ptr) AccessChain 40(flattenTemp) 34 57: 7(fvec4) Load 56 - Store 55(normal) 57 + Store 55(@entryPointOutput.normal) 57 Return FunctionEnd 12(@main(struct-T-f1-f1-f1-vf41;): 8(T) Function None 10 diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out index c58f6b80..97ef7bb5 100644 --- a/Test/baseResults/hlsl.structarray.flatten.frag.out +++ b/Test/baseResults/hlsl.structarray.flatten.frag.out @@ -15,8 +15,8 @@ gl_FragCoord origin is upper left 0:25 add ( temp 4-component vector of float) 0:25 texture ( temp 4-component vector of float) 0:25 Construct combined texture-sampler ( temp sampler1D) -0:? 'tex' ( uniform texture1D) -0:? 'samp' ( uniform sampler) +0:? 'g_texdata.tex' ( uniform texture1D) +0:? 'g_texdata.samp' ( uniform sampler) 0:25 Constant: 0:25 0.500000 0:26 texture ( temp 4-component vector of float) @@ -38,7 +38,7 @@ gl_FragCoord origin is upper left 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:23 Sequence 0:23 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) 0:23 color: direct index for structure ( temp 4-component vector of float) 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:23 Constant: @@ -46,9 +46,9 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'g_samp' ( uniform sampler) 0:? 'g_tex' ( uniform texture1D) -0:? 'samp' ( uniform sampler) -0:? 'tex' ( uniform texture1D) -0:? 'nonopaque_thing' ( uniform int) +0:? 'g_texdata.samp' ( uniform sampler) +0:? 'g_texdata.tex' ( uniform texture1D) +0:? 'g_texdata.nonopaque_thing' ( uniform int) 0:? 'g_texdata_array[0].samp' ( uniform sampler) 0:? 'g_texdata_array[0].tex' ( uniform texture1D) 0:? 'g_texdata_array[0].nonopaque_thing' ( uniform int) @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:? 'g_texdata_array2[2].tex[0]' ( uniform texture1D) 0:? 'g_texdata_array2[2].tex[1]' ( uniform texture1D) 0:? 'g_texdata_array2[2].nonopaque_thing' ( uniform int) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -95,8 +95,8 @@ gl_FragCoord origin is upper left 0:25 add ( temp 4-component vector of float) 0:25 texture ( temp 4-component vector of float) 0:25 Construct combined texture-sampler ( temp sampler1D) -0:? 'tex' ( uniform texture1D) -0:? 'samp' ( uniform sampler) +0:? 'g_texdata.tex' ( uniform texture1D) +0:? 'g_texdata.samp' ( uniform sampler) 0:25 Constant: 0:25 0.500000 0:26 texture ( temp 4-component vector of float) @@ -118,7 +118,7 @@ gl_FragCoord origin is upper left 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:23 Sequence 0:23 move second child to first child ( temp 4-component vector of float) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) 0:23 color: direct index for structure ( temp 4-component vector of float) 0:? 'ps_output' ( temp structure{ temp 4-component vector of float color}) 0:23 Constant: @@ -126,9 +126,9 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'g_samp' ( uniform sampler) 0:? 'g_tex' ( uniform texture1D) -0:? 'samp' ( uniform sampler) -0:? 'tex' ( uniform texture1D) -0:? 'nonopaque_thing' ( uniform int) +0:? 'g_texdata.samp' ( uniform sampler) +0:? 'g_texdata.tex' ( uniform texture1D) +0:? 'g_texdata.nonopaque_thing' ( uniform int) 0:? 'g_texdata_array[0].samp' ( uniform sampler) 0:? 'g_texdata_array[0].tex' ( uniform texture1D) 0:? 'g_texdata_array[0].nonopaque_thing' ( uniform int) @@ -153,7 +153,7 @@ gl_FragCoord origin is upper left 0:? 'g_texdata_array2[2].tex[0]' ( uniform texture1D) 0:? 'g_texdata_array2[2].tex[1]' ( uniform texture1D) 0:? 'g_texdata_array2[2].nonopaque_thing' ( uniform int) -0:? 'color' (layout( location=0) out 4-component vector of float) +0:? 'ps_output.color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -171,18 +171,18 @@ gl_FragCoord origin is upper left MemberName 8(PS_OUTPUT) 0 "color" Name 12 "@main(struct-PS_OUTPUT-vf41;" Name 11 "ps_output" - Name 18 "tex" - Name 22 "samp" + Name 18 "g_texdata.tex" + Name 22 "g_texdata.samp" Name 28 "g_texdata_array[1].tex" Name 30 "g_texdata_array[1].samp" Name 36 "g_texdata_array2[1].tex[0]" Name 38 "g_texdata_array2[1].samp[0]" Name 46 "ps_output" Name 47 "param" - Name 51 "color" + Name 51 "ps_output.color" Name 54 "g_samp" Name 55 "g_tex" - Name 57 "nonopaque_thing" + Name 57 "g_texdata.nonopaque_thing" Name 58 "g_texdata_array[0].samp" Name 59 "g_texdata_array[0].tex" Name 60 "g_texdata_array[0].nonopaque_thing" @@ -203,13 +203,13 @@ gl_FragCoord origin is upper left Name 75 "g_texdata_array2[2].tex[0]" Name 76 "g_texdata_array2[2].tex[1]" Name 77 "g_texdata_array2[2].nonopaque_thing" - Decorate 18(tex) DescriptorSet 0 - Decorate 22(samp) DescriptorSet 0 + Decorate 18(g_texdata.tex) DescriptorSet 0 + Decorate 22(g_texdata.samp) DescriptorSet 0 Decorate 28(g_texdata_array[1].tex) DescriptorSet 0 Decorate 30(g_texdata_array[1].samp) DescriptorSet 0 Decorate 36(g_texdata_array2[1].tex[0]) DescriptorSet 0 Decorate 38(g_texdata_array2[1].samp[0]) DescriptorSet 0 - Decorate 51(color) Location 0 + Decorate 51(ps_output.color) Location 0 Decorate 54(g_samp) DescriptorSet 0 Decorate 55(g_tex) DescriptorSet 0 Decorate 58(g_texdata_array[0].samp) DescriptorSet 0 @@ -237,10 +237,10 @@ gl_FragCoord origin is upper left 15: 14(int) Constant 0 16: TypeImage 6(float) 1D sampled format:Unknown 17: TypePointer UniformConstant 16 - 18(tex): 17(ptr) Variable UniformConstant +18(g_texdata.tex): 17(ptr) Variable UniformConstant 20: TypeSampler 21: TypePointer UniformConstant 20 - 22(samp): 21(ptr) Variable UniformConstant +22(g_texdata.samp): 21(ptr) Variable UniformConstant 24: TypeSampledImage 16 26: 6(float) Constant 1056964608 28(g_texdata_array[1].tex): 17(ptr) Variable UniformConstant @@ -251,11 +251,11 @@ gl_FragCoord origin is upper left 41: 6(float) Constant 1050253722 44: TypePointer Function 7(fvec4) 50: TypePointer Output 7(fvec4) - 51(color): 50(ptr) Variable Output +51(ps_output.color): 50(ptr) Variable Output 54(g_samp): 21(ptr) Variable UniformConstant 55(g_tex): 17(ptr) Variable UniformConstant 56: TypePointer UniformConstant 14(int) -57(nonopaque_thing): 56(ptr) Variable UniformConstant +57(g_texdata.nonopaque_thing): 56(ptr) Variable UniformConstant 58(g_texdata_array[0].samp): 21(ptr) Variable UniformConstant 59(g_texdata_array[0].tex): 17(ptr) Variable UniformConstant 60(g_texdata_array[0].nonopaque_thing): 56(ptr) Variable UniformConstant @@ -285,14 +285,14 @@ gl_FragCoord origin is upper left Store 46(ps_output) 49 52: 44(ptr) AccessChain 46(ps_output) 15 53: 7(fvec4) Load 52 - Store 51(color) 53 + Store 51(ps_output.color) 53 Return FunctionEnd 12(@main(struct-PS_OUTPUT-vf41;): 2 Function None 10 11(ps_output): 9(ptr) FunctionParameter 13: Label - 19: 16 Load 18(tex) - 23: 20 Load 22(samp) + 19: 16 Load 18(g_texdata.tex) + 23: 20 Load 22(g_texdata.samp) 25: 24 SampledImage 19 23 27: 7(fvec4) ImageSampleImplicitLod 25 26 29: 16 Load 28(g_texdata_array[1].tex) diff --git a/Test/baseResults/hlsl.structarray.flatten.geom.out b/Test/baseResults/hlsl.structarray.flatten.geom.out index 1d4bfa9a..5675fb47 100644 --- a/Test/baseResults/hlsl.structarray.flatten.geom.out +++ b/Test/baseResults/hlsl.structarray.flatten.geom.out @@ -49,7 +49,7 @@ output primitive = triangle_strip 0:22 Sequence 0:22 Sequence 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'outStream_position' ( out 4-component vector of float Position) +0:? 'outStream.position' ( out 4-component vector of float Position) 0:22 position: direct index for structure ( temp 4-component vector of float) 0:22 'vout' ( temp structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) 0:22 Constant: @@ -84,7 +84,7 @@ output primitive = triangle_strip 0:? 'outStream' ( temp structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) 0:? Linker Objects 0:? 'vin' (layout( location=0) in 2-element array of structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) -0:? 'outStream_position' ( out 4-component vector of float Position) +0:? 'outStream.position' ( out 4-component vector of float Position) 0:? 'outStream' (layout( location=0) out structure{ temp 4-component vector of float color, temp 2-component vector of float uv}) @@ -141,7 +141,7 @@ output primitive = triangle_strip 0:22 Sequence 0:22 Sequence 0:22 move second child to first child ( temp 4-component vector of float) -0:? 'outStream_position' ( out 4-component vector of float Position) +0:? 'outStream.position' ( out 4-component vector of float Position) 0:22 position: direct index for structure ( temp 4-component vector of float) 0:22 'vout' ( temp structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) 0:22 Constant: @@ -176,7 +176,7 @@ output primitive = triangle_strip 0:? 'outStream' ( temp structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) 0:? Linker Objects 0:? 'vin' (layout( location=0) in 2-element array of structure{ temp 4-component vector of float position, temp 4-component vector of float color, temp 2-component vector of float uv}) -0:? 'outStream_position' ( out 4-component vector of float Position) +0:? 'outStream.position' ( out 4-component vector of float Position) 0:? 'outStream' (layout( location=0) out structure{ temp 4-component vector of float color, temp 2-component vector of float uv}) // Module Version 10000 @@ -205,7 +205,7 @@ output primitive = triangle_strip Name 17 "vin" Name 18 "outStream" Name 21 "vout" - Name 38 "outStream_position" + Name 38 "outStream.position" Name 41 "PS_IN" MemberName 41(PS_IN) 0 "color" MemberName 41(PS_IN) 1 "uv" @@ -215,7 +215,7 @@ output primitive = triangle_strip Name 55 "outStream" Name 56 "param" Name 58 "param" - Decorate 38(outStream_position) BuiltIn Position + Decorate 38(outStream.position) BuiltIn Position Decorate 43(outStream) Location 0 Decorate 53(vin) Location 0 2: TypeVoid @@ -238,7 +238,7 @@ output primitive = triangle_strip 29: TypePointer Function 8(fvec2) 33: 22(int) Constant 0 37: TypePointer Output 7(fvec4) -38(outStream_position): 37(ptr) Variable Output +38(outStream.position): 37(ptr) Variable Output 41(PS_IN): TypeStruct 7(fvec4) 8(fvec2) 42: TypePointer Output 41(PS_IN) 43(outStream): 42(ptr) Variable Output @@ -279,7 +279,7 @@ output primitive = triangle_strip Store 36 35 39: 24(ptr) AccessChain 21(vout) 33 40: 7(fvec4) Load 39 - Store 38(outStream_position) 40 + Store 38(outStream.position) 40 44: 24(ptr) AccessChain 21(vout) 23 45: 7(fvec4) Load 44 46: 37(ptr) AccessChain 43(outStream) 33 diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out index 87749e20..11a3e429 100755 --- a/Test/baseResults/hlsl.structin.vert.out +++ b/Test/baseResults/hlsl.structin.vert.out @@ -93,7 +93,7 @@ Shader version: 500 0:8 0 (const int) 0:8 Constant: 0:8 0 (const int) -0:? 'm[0]' (layout( location=1) in 4-component vector of float) +0:? 'vi.m[0]' (layout( location=1) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 direct index ( temp 4-component vector of float) 0:8 m: direct index for structure ( temp 2-element array of 4-component vector of float) @@ -102,19 +102,19 @@ Shader version: 500 0:8 0 (const int) 0:8 Constant: 0:8 1 (const int) -0:? 'm[1]' (layout( location=2) in 4-component vector of float) +0:? 'vi.m[1]' (layout( location=2) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 coord: direct index for structure ( temp 4-component vector of float) 0:? 'vi' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: 0:8 1 (const int) -0:? 'coord' (layout( location=3) in 4-component vector of float) +0:? 'vi.coord' (layout( location=3) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 b: direct index for structure ( temp 4-component vector of float) 0:? 'vi' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: 0:8 2 (const int) -0:? 'b' (layout( location=4) in 4-component vector of float) +0:? 'vi.b' (layout( location=4) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:? 'e' ( temp 4-component vector of float) 0:? 'e' (layout( location=5) in 4-component vector of float) @@ -135,7 +135,7 @@ Shader version: 500 0:8 Constant: 0:8 0 (const int) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_coord' ( out 4-component vector of float Position) +0:? '@entryPointOutput.coord' ( out 4-component vector of float Position) 0:8 coord: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: @@ -150,13 +150,13 @@ Shader version: 500 0:8 Constant: 0:8 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_coord' ( out 4-component vector of float Position) +0:? '@entryPointOutput.coord' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp 2-element array of 4-component vector of float m, smooth temp 4-component vector of float b}) 0:? 'd' (layout( location=0) in 4-component vector of float) -0:? 'm[0]' (layout( location=1) in 4-component vector of float) -0:? 'm[1]' (layout( location=2) in 4-component vector of float) -0:? 'coord' (layout( location=3) in 4-component vector of float) -0:? 'b' (layout( location=4) in 4-component vector of float) +0:? 'vi.m[0]' (layout( location=1) in 4-component vector of float) +0:? 'vi.m[1]' (layout( location=2) in 4-component vector of float) +0:? 'vi.coord' (layout( location=3) in 4-component vector of float) +0:? 'vi.b' (layout( location=4) in 4-component vector of float) 0:? 'e' (layout( location=5) in 4-component vector of float) @@ -257,7 +257,7 @@ Shader version: 500 0:8 0 (const int) 0:8 Constant: 0:8 0 (const int) -0:? 'm[0]' (layout( location=1) in 4-component vector of float) +0:? 'vi.m[0]' (layout( location=1) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 direct index ( temp 4-component vector of float) 0:8 m: direct index for structure ( temp 2-element array of 4-component vector of float) @@ -266,19 +266,19 @@ Shader version: 500 0:8 0 (const int) 0:8 Constant: 0:8 1 (const int) -0:? 'm[1]' (layout( location=2) in 4-component vector of float) +0:? 'vi.m[1]' (layout( location=2) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 coord: direct index for structure ( temp 4-component vector of float) 0:? 'vi' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: 0:8 1 (const int) -0:? 'coord' (layout( location=3) in 4-component vector of float) +0:? 'vi.coord' (layout( location=3) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:8 b: direct index for structure ( temp 4-component vector of float) 0:? 'vi' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: 0:8 2 (const int) -0:? 'b' (layout( location=4) in 4-component vector of float) +0:? 'vi.b' (layout( location=4) in 4-component vector of float) 0:8 move second child to first child ( temp 4-component vector of float) 0:? 'e' ( temp 4-component vector of float) 0:? 'e' (layout( location=5) in 4-component vector of float) @@ -299,7 +299,7 @@ Shader version: 500 0:8 Constant: 0:8 0 (const int) 0:8 move second child to first child ( temp 4-component vector of float) -0:? '@entryPointOutput_coord' ( out 4-component vector of float Position) +0:? '@entryPointOutput.coord' ( out 4-component vector of float Position) 0:8 coord: direct index for structure ( temp 4-component vector of float) 0:8 'flattenTemp' ( temp structure{ temp 2-element array of 4-component vector of float m, temp 4-component vector of float coord, temp 4-component vector of float b}) 0:8 Constant: @@ -314,13 +314,13 @@ Shader version: 500 0:8 Constant: 0:8 2 (const int) 0:? Linker Objects -0:? '@entryPointOutput_coord' ( out 4-component vector of float Position) +0:? '@entryPointOutput.coord' ( out 4-component vector of float Position) 0:? '@entryPointOutput' (layout( location=0) out structure{ temp 2-element array of 4-component vector of float m, smooth temp 4-component vector of float b}) 0:? 'd' (layout( location=0) in 4-component vector of float) -0:? 'm[0]' (layout( location=1) in 4-component vector of float) -0:? 'm[1]' (layout( location=2) in 4-component vector of float) -0:? 'coord' (layout( location=3) in 4-component vector of float) -0:? 'b' (layout( location=4) in 4-component vector of float) +0:? 'vi.m[0]' (layout( location=1) in 4-component vector of float) +0:? 'vi.m[1]' (layout( location=2) in 4-component vector of float) +0:? 'vi.coord' (layout( location=3) in 4-component vector of float) +0:? 'vi.b' (layout( location=4) in 4-component vector of float) 0:? 'e' (layout( location=5) in 4-component vector of float) // Module Version 10000 @@ -345,10 +345,10 @@ Shader version: 500 Name 53 "d" Name 55 "d" Name 57 "vi" - Name 58 "m[0]" - Name 61 "m[1]" - Name 64 "coord" - Name 67 "b" + Name 58 "vi.m[0]" + Name 61 "vi.m[1]" + Name 64 "vi.coord" + Name 67 "vi.b" Name 70 "e" Name 71 "e" Name 73 "flattenTemp" @@ -359,15 +359,15 @@ Shader version: 500 MemberName 81(VI) 0 "m" MemberName 81(VI) 1 "b" Name 83 "@entryPointOutput" - Name 90 "@entryPointOutput_coord" + Name 90 "@entryPointOutput.coord" Decorate 55(d) Location 0 - Decorate 58(m[0]) Location 1 - Decorate 61(m[1]) Location 2 - Decorate 64(coord) Location 3 - Decorate 67(b) Location 4 + Decorate 58(vi.m[0]) Location 1 + Decorate 61(vi.m[1]) Location 2 + Decorate 64(vi.coord) Location 3 + Decorate 67(vi.b) Location 4 Decorate 71(e) Location 5 Decorate 83(@entryPointOutput) Location 0 - Decorate 90(@entryPointOutput_coord) BuiltIn Position + Decorate 90(@entryPointOutput.coord) BuiltIn Position 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -393,10 +393,10 @@ Shader version: 500 48: 7(fvec4) ConstantComposite 47 47 47 47 54: TypePointer Input 7(fvec4) 55(d): 54(ptr) Variable Input - 58(m[0]): 54(ptr) Variable Input - 61(m[1]): 54(ptr) Variable Input - 64(coord): 54(ptr) Variable Input - 67(b): 54(ptr) Variable Input + 58(vi.m[0]): 54(ptr) Variable Input + 61(vi.m[1]): 54(ptr) Variable Input + 64(vi.coord): 54(ptr) Variable Input + 67(vi.b): 54(ptr) Variable Input 71(e): 54(ptr) Variable Input 81(VI): TypeStruct 11 7(fvec4) 82: TypePointer Output 81(VI) @@ -404,7 +404,7 @@ Shader version: 500 84: TypePointer Function 11 87: TypePointer Output 11 89: TypePointer Output 7(fvec4) -90(@entryPointOutput_coord): 89(ptr) Variable Output +90(@entryPointOutput.coord): 89(ptr) Variable Output 4(main): 2 Function None 3 5: Label 53(d): 8(ptr) Variable Function @@ -416,16 +416,16 @@ Shader version: 500 78(param): 8(ptr) Variable Function 56: 7(fvec4) Load 55(d) Store 53(d) 56 - 59: 7(fvec4) Load 58(m[0]) + 59: 7(fvec4) Load 58(vi.m[0]) 60: 8(ptr) AccessChain 57(vi) 23 23 Store 60 59 - 62: 7(fvec4) Load 61(m[1]) + 62: 7(fvec4) Load 61(vi.m[1]) 63: 8(ptr) AccessChain 57(vi) 23 24 Store 63 62 - 65: 7(fvec4) Load 64(coord) + 65: 7(fvec4) Load 64(vi.coord) 66: 8(ptr) AccessChain 57(vi) 24 Store 66 65 - 68: 7(fvec4) Load 67(b) + 68: 7(fvec4) Load 67(vi.b) 69: 8(ptr) AccessChain 57(vi) 22 Store 69 68 72: 7(fvec4) Load 71(e) @@ -444,7 +444,7 @@ Shader version: 500 Store 88 86 91: 8(ptr) AccessChain 73(flattenTemp) 24 92: 7(fvec4) Load 91 - Store 90(@entryPointOutput_coord) 92 + Store 90(@entryPointOutput.coord) 92 93: 8(ptr) AccessChain 73(flattenTemp) 22 94: 7(fvec4) Load 93 95: 89(ptr) AccessChain 83(@entryPointOutput) 24 diff --git a/Test/baseResults/hlsl.synthesizeInput.frag.out b/Test/baseResults/hlsl.synthesizeInput.frag.out index d83db2ea..ef58d395 100755 --- a/Test/baseResults/hlsl.synthesizeInput.frag.out +++ b/Test/baseResults/hlsl.synthesizeInput.frag.out @@ -30,21 +30,21 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:7 move second child to first child ( temp uint) 0:7 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:7 move second child to first child ( temp 4-component vector of float) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:7 Function Call: @main(struct-PSInput-f1-u11; ( temp 4-component vector of float) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) Linked fragment stage: @@ -81,21 +81,21 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:7 move second child to first child ( temp uint) 0:7 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:7 move second child to first child ( temp 4-component vector of float) 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) 0:7 Function Call: @main(struct-PSInput-f1-u11; ( temp 4-component vector of float) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) // Module Version 10000 // Generated by (magic number): 80001 @@ -114,13 +114,13 @@ gl_FragCoord origin is upper left Name 13 "@main(struct-PSInput-f1-u11;" Name 12 "input" Name 30 "input" - Name 32 "interp" - Name 36 "no_interp" + Name 32 "input.interp" + Name 36 "input.no_interp" Name 40 "@entryPointOutput" Name 41 "param" - Decorate 32(interp) Location 0 - Decorate 36(no_interp) Flat - Decorate 36(no_interp) Location 1 + Decorate 32(input.interp) Location 0 + Decorate 36(input.no_interp) Flat + Decorate 36(input.no_interp) Location 1 Decorate 40(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -138,19 +138,19 @@ gl_FragCoord origin is upper left 25: 6(float) Constant 0 26: 6(float) Constant 1065353216 31: TypePointer Input 6(float) - 32(interp): 31(ptr) Variable Input +32(input.interp): 31(ptr) Variable Input 35: TypePointer Input 7(int) - 36(no_interp): 35(ptr) Variable Input +36(input.no_interp): 35(ptr) Variable Input 39: TypePointer Output 10(fvec4) 40(@entryPointOutput): 39(ptr) Variable Output 4(main): 2 Function None 3 5: Label 30(input): 9(ptr) Variable Function 41(param): 9(ptr) Variable Function - 33: 6(float) Load 32(interp) + 33: 6(float) Load 32(input.interp) 34: 22(ptr) AccessChain 30(input) 21 Store 34 33 - 37: 7(int) Load 36(no_interp) + 37: 7(int) Load 36(input.no_interp) 38: 17(ptr) AccessChain 30(input) 16 Store 38 37 42: 8(PSInput) Load 30(input) diff --git a/Test/baseResults/hlsl.target.frag.out b/Test/baseResults/hlsl.target.frag.out index 649f6558..b80c2841 100755 --- a/Test/baseResults/hlsl.target.frag.out +++ b/Test/baseResults/hlsl.target.frag.out @@ -31,13 +31,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:7 move second child to first child ( temp uint) 0:7 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:7 Function Call: @main(struct-PSInput-f1-u11;vf4;vf4; ( temp void) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'out1' ( temp 4-component vector of float) @@ -49,8 +49,8 @@ gl_FragCoord origin is upper left 0:? 'out2' (layout( location=3) out 4-component vector of float) 0:? 'out2' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'out1' (layout( location=1) out 4-component vector of float) 0:? 'out2' (layout( location=3) out 4-component vector of float) @@ -90,13 +90,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:7 move second child to first child ( temp uint) 0:7 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:7 Constant: 0:7 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:7 Function Call: @main(struct-PSInput-f1-u11;vf4;vf4; ( temp void) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'out1' ( temp 4-component vector of float) @@ -108,8 +108,8 @@ gl_FragCoord origin is upper left 0:? 'out2' (layout( location=3) out 4-component vector of float) 0:? 'out2' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'out1' (layout( location=1) out 4-component vector of float) 0:? 'out2' (layout( location=3) out 4-component vector of float) @@ -132,8 +132,8 @@ gl_FragCoord origin is upper left Name 14 "out1" Name 15 "out2" Name 22 "input" - Name 26 "interp" - Name 32 "no_interp" + Name 26 "input.interp" + Name 32 "input.no_interp" Name 36 "out1" Name 37 "out2" Name 38 "param" @@ -141,9 +141,9 @@ gl_FragCoord origin is upper left Name 41 "param" Name 46 "out1" Name 48 "out2" - Decorate 26(interp) Location 0 - Decorate 32(no_interp) Flat - Decorate 32(no_interp) Location 1 + Decorate 26(input.interp) Location 0 + Decorate 32(input.no_interp) Flat + Decorate 32(input.no_interp) Location 1 Decorate 46(out1) Location 1 Decorate 48(out2) Location 3 2: TypeVoid @@ -162,11 +162,11 @@ gl_FragCoord origin is upper left 23: TypeInt 32 1 24: 23(int) Constant 0 25: TypePointer Input 6(float) - 26(interp): 25(ptr) Variable Input +26(input.interp): 25(ptr) Variable Input 28: TypePointer Function 6(float) 30: 23(int) Constant 1 31: TypePointer Input 7(int) - 32(no_interp): 31(ptr) Variable Input +32(input.no_interp): 31(ptr) Variable Input 34: TypePointer Function 7(int) 45: TypePointer Output 10(fvec4) 46(out1): 45(ptr) Variable Output @@ -179,10 +179,10 @@ gl_FragCoord origin is upper left 38(param): 9(ptr) Variable Function 40(param): 11(ptr) Variable Function 41(param): 11(ptr) Variable Function - 27: 6(float) Load 26(interp) + 27: 6(float) Load 26(input.interp) 29: 28(ptr) AccessChain 22(input) 24 Store 29 27 - 33: 7(int) Load 32(no_interp) + 33: 7(int) Load 32(input.no_interp) 35: 34(ptr) AccessChain 22(input) 30 Store 35 33 39: 8(PSInput) Load 22(input) diff --git a/Test/baseResults/hlsl.targetStruct1.frag.out b/Test/baseResults/hlsl.targetStruct1.frag.out index d38d9b0c..6cbd1b33 100755 --- a/Test/baseResults/hlsl.targetStruct1.frag.out +++ b/Test/baseResults/hlsl.targetStruct1.frag.out @@ -54,13 +54,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:12 move second child to first child ( temp uint) 0:12 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:12 Sequence 0:12 move second child to first child ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) @@ -68,13 +68,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'po' ( temp 4-component vector of float) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) 0:12 o1: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: 0:12 0 (const int) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o2' (layout( location=1) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=1) out 4-component vector of float) 0:12 o2: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: @@ -83,10 +83,10 @@ gl_FragCoord origin is upper left 0:? 'po' (layout( location=0) out 4-component vector of float) 0:? 'po' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'o1' (layout( location=2) out 4-component vector of float) -0:? 'o2' (layout( location=1) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=1) out 4-component vector of float) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'po' (layout( location=0) out 4-component vector of float) @@ -148,13 +148,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:12 move second child to first child ( temp uint) 0:12 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:12 Sequence 0:12 move second child to first child ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) @@ -162,13 +162,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'po' ( temp 4-component vector of float) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) 0:12 o1: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: 0:12 0 (const int) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o2' (layout( location=1) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=1) out 4-component vector of float) 0:12 o2: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: @@ -177,10 +177,10 @@ gl_FragCoord origin is upper left 0:? 'po' (layout( location=0) out 4-component vector of float) 0:? 'po' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'o1' (layout( location=2) out 4-component vector of float) -0:? 'o2' (layout( location=1) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=1) out 4-component vector of float) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'po' (layout( location=0) out 4-component vector of float) // Module Version 10000 @@ -205,20 +205,20 @@ gl_FragCoord origin is upper left Name 15 "po" Name 19 "pso" Name 40 "input" - Name 42 "interp" - Name 46 "no_interp" + Name 42 "input.interp" + Name 46 "input.no_interp" Name 49 "flattenTemp" Name 50 "po" Name 51 "param" Name 53 "param" - Name 57 "o1" - Name 60 "o2" + Name 57 "@entryPointOutput.o1" + Name 60 "@entryPointOutput.o2" Name 63 "po" - Decorate 42(interp) Location 0 - Decorate 46(no_interp) Flat - Decorate 46(no_interp) Location 1 - Decorate 57(o1) Location 2 - Decorate 60(o2) Location 1 + Decorate 42(input.interp) Location 0 + Decorate 46(input.no_interp) Flat + Decorate 46(input.no_interp) Location 1 + Decorate 57(@entryPointOutput.o1) Location 2 + Decorate 60(@entryPointOutput.o2) Location 1 Decorate 63(po) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -241,12 +241,12 @@ gl_FragCoord origin is upper left 34: 10(fvec4) ConstantComposite 31 31 31 31 36: 10(fvec4) ConstantComposite 30 30 30 30 41: TypePointer Input 6(float) - 42(interp): 41(ptr) Variable Input +42(input.interp): 41(ptr) Variable Input 45: TypePointer Input 7(int) - 46(no_interp): 45(ptr) Variable Input +46(input.no_interp): 45(ptr) Variable Input 56: TypePointer Output 10(fvec4) - 57(o1): 56(ptr) Variable Output - 60(o2): 56(ptr) Variable Output +57(@entryPointOutput.o1): 56(ptr) Variable Output +60(@entryPointOutput.o2): 56(ptr) Variable Output 63(po): 56(ptr) Variable Output 4(main): 2 Function None 3 5: Label @@ -255,10 +255,10 @@ gl_FragCoord origin is upper left 50(po): 11(ptr) Variable Function 51(param): 9(ptr) Variable Function 53(param): 11(ptr) Variable Function - 43: 6(float) Load 42(interp) + 43: 6(float) Load 42(input.interp) 44: 27(ptr) AccessChain 40(input) 21 Store 44 43 - 47: 7(int) Load 46(no_interp) + 47: 7(int) Load 46(input.no_interp) 48: 23(ptr) AccessChain 40(input) 22 Store 48 47 52: 8(PSInput) Load 40(input) @@ -269,10 +269,10 @@ gl_FragCoord origin is upper left Store 49(flattenTemp) 54 58: 11(ptr) AccessChain 49(flattenTemp) 21 59: 10(fvec4) Load 58 - Store 57(o1) 59 + Store 57(@entryPointOutput.o1) 59 61: 11(ptr) AccessChain 49(flattenTemp) 22 62: 10(fvec4) Load 61 - Store 60(o2) 62 + Store 60(@entryPointOutput.o2) 62 64: 10(fvec4) Load 50(po) Store 63(po) 64 Return diff --git a/Test/baseResults/hlsl.targetStruct2.frag.out b/Test/baseResults/hlsl.targetStruct2.frag.out index 1e52055c..1fe27519 100755 --- a/Test/baseResults/hlsl.targetStruct2.frag.out +++ b/Test/baseResults/hlsl.targetStruct2.frag.out @@ -54,13 +54,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:12 move second child to first child ( temp uint) 0:12 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:12 Sequence 0:12 move second child to first child ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) @@ -68,13 +68,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'po' ( temp 4-component vector of float) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) 0:12 o1: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: 0:12 0 (const int) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o2' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=3) out 4-component vector of float) 0:12 o2: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: @@ -83,10 +83,10 @@ gl_FragCoord origin is upper left 0:? 'po' (layout( location=0) out 4-component vector of float) 0:? 'po' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'o1' (layout( location=2) out 4-component vector of float) -0:? 'o2' (layout( location=3) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=3) out 4-component vector of float) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'po' (layout( location=0) out 4-component vector of float) @@ -148,13 +148,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 0 (const int) -0:? 'interp' (layout( location=0) in float) +0:? 'input.interp' (layout( location=0) in float) 0:12 move second child to first child ( temp uint) 0:12 no_interp: direct index for structure ( temp uint) 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:12 Constant: 0:12 1 (const int) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:12 Sequence 0:12 move second child to first child ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) @@ -162,13 +162,13 @@ gl_FragCoord origin is upper left 0:? 'input' ( temp structure{ temp float interp, temp uint no_interp}) 0:? 'po' ( temp 4-component vector of float) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) 0:12 o1: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: 0:12 0 (const int) 0:12 move second child to first child ( temp 4-component vector of float) -0:? 'o2' (layout( location=3) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=3) out 4-component vector of float) 0:12 o2: direct index for structure ( temp 4-component vector of float) 0:12 'flattenTemp' ( temp structure{ temp 4-component vector of float o1, temp 4-component vector of float o2}) 0:12 Constant: @@ -177,10 +177,10 @@ gl_FragCoord origin is upper left 0:? 'po' (layout( location=0) out 4-component vector of float) 0:? 'po' ( temp 4-component vector of float) 0:? Linker Objects -0:? 'o1' (layout( location=2) out 4-component vector of float) -0:? 'o2' (layout( location=3) out 4-component vector of float) -0:? 'interp' (layout( location=0) in float) -0:? 'no_interp' (layout( location=1) flat in uint) +0:? '@entryPointOutput.o1' (layout( location=2) out 4-component vector of float) +0:? '@entryPointOutput.o2' (layout( location=3) out 4-component vector of float) +0:? 'input.interp' (layout( location=0) in float) +0:? 'input.no_interp' (layout( location=1) flat in uint) 0:? 'po' (layout( location=0) out 4-component vector of float) // Module Version 10000 @@ -205,20 +205,20 @@ gl_FragCoord origin is upper left Name 15 "po" Name 19 "pso" Name 40 "input" - Name 42 "interp" - Name 46 "no_interp" + Name 42 "input.interp" + Name 46 "input.no_interp" Name 49 "flattenTemp" Name 50 "po" Name 51 "param" Name 53 "param" - Name 57 "o1" - Name 60 "o2" + Name 57 "@entryPointOutput.o1" + Name 60 "@entryPointOutput.o2" Name 63 "po" - Decorate 42(interp) Location 0 - Decorate 46(no_interp) Flat - Decorate 46(no_interp) Location 1 - Decorate 57(o1) Location 2 - Decorate 60(o2) Location 3 + Decorate 42(input.interp) Location 0 + Decorate 46(input.no_interp) Flat + Decorate 46(input.no_interp) Location 1 + Decorate 57(@entryPointOutput.o1) Location 2 + Decorate 60(@entryPointOutput.o2) Location 3 Decorate 63(po) Location 0 2: TypeVoid 3: TypeFunction 2 @@ -241,12 +241,12 @@ gl_FragCoord origin is upper left 34: 10(fvec4) ConstantComposite 31 31 31 31 36: 10(fvec4) ConstantComposite 30 30 30 30 41: TypePointer Input 6(float) - 42(interp): 41(ptr) Variable Input +42(input.interp): 41(ptr) Variable Input 45: TypePointer Input 7(int) - 46(no_interp): 45(ptr) Variable Input +46(input.no_interp): 45(ptr) Variable Input 56: TypePointer Output 10(fvec4) - 57(o1): 56(ptr) Variable Output - 60(o2): 56(ptr) Variable Output +57(@entryPointOutput.o1): 56(ptr) Variable Output +60(@entryPointOutput.o2): 56(ptr) Variable Output 63(po): 56(ptr) Variable Output 4(main): 2 Function None 3 5: Label @@ -255,10 +255,10 @@ gl_FragCoord origin is upper left 50(po): 11(ptr) Variable Function 51(param): 9(ptr) Variable Function 53(param): 11(ptr) Variable Function - 43: 6(float) Load 42(interp) + 43: 6(float) Load 42(input.interp) 44: 27(ptr) AccessChain 40(input) 21 Store 44 43 - 47: 7(int) Load 46(no_interp) + 47: 7(int) Load 46(input.no_interp) 48: 23(ptr) AccessChain 40(input) 22 Store 48 47 52: 8(PSInput) Load 40(input) @@ -269,10 +269,10 @@ gl_FragCoord origin is upper left Store 49(flattenTemp) 54 58: 11(ptr) AccessChain 49(flattenTemp) 21 59: 10(fvec4) Load 58 - Store 57(o1) 59 + Store 57(@entryPointOutput.o1) 59 61: 11(ptr) AccessChain 49(flattenTemp) 22 62: 10(fvec4) Load 61 - Store 60(o2) 62 + Store 60(@entryPointOutput.o2) 62 64: 10(fvec4) Load 50(po) Store 63(po) 64 Return diff --git a/Test/baseResults/hlsl.tx.bracket.frag.out b/Test/baseResults/hlsl.tx.bracket.frag.out index 12d5f178..31f516cb 100644 --- a/Test/baseResults/hlsl.tx.bracket.frag.out +++ b/Test/baseResults/hlsl.tx.bracket.frag.out @@ -183,7 +183,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:45 Color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:45 Constant: @@ -206,7 +206,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' ( uniform itexture2DArray) 0:? 'g_tTex2du4a' ( uniform utexture2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) Linked fragment stage: @@ -396,7 +396,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:45 Sequence 0:45 move second child to first child ( temp 4-component vector of float) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) 0:45 Color: direct index for structure ( temp 4-component vector of float) 0:45 Function Call: @main( ( temp structure{ temp 4-component vector of float Color}) 0:45 Constant: @@ -419,7 +419,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' ( uniform itexture2DArray) 0:? 'g_tTex2du4a' ( uniform utexture2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) -0:? 'Color' (layout( location=0) out 4-component vector of float) +0:? '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 @@ -475,7 +475,7 @@ gl_FragCoord origin is upper left Name 147 "param" Name 153 "param" Name 156 "psout" - Name 164 "Color" + Name 164 "@entryPointOutput.Color" Name 169 "g_sSamp" Name 172 "g_tTex1df4a" Name 175 "g_tTex1di4a" @@ -503,7 +503,7 @@ gl_FragCoord origin is upper left Decorate 114(g_tTex3df4) DescriptorSet 0 Decorate 124(g_tTex3di4) DescriptorSet 0 Decorate 132(g_tTex3du4) DescriptorSet 0 - Decorate 164(Color) Location 0 + Decorate 164(@entryPointOutput.Color) Location 0 Decorate 169(g_sSamp) DescriptorSet 0 Decorate 169(g_sSamp) Binding 0 Decorate 172(g_tTex1df4a) DescriptorSet 0 @@ -573,7 +573,7 @@ gl_FragCoord origin is upper left 157: 20(float) Constant 1065353216 158: 21(fvec4) ConstantComposite 157 157 157 157 163: TypePointer Output 21(fvec4) - 164(Color): 163(ptr) Variable Output +164(@entryPointOutput.Color): 163(ptr) Variable Output 167: TypeSampler 168: TypePointer UniformConstant 167 169(g_sSamp): 168(ptr) Variable UniformConstant @@ -599,7 +599,7 @@ gl_FragCoord origin is upper left 5: Label 165:30(PS_OUTPUT) FunctionCall 32(@main() 166: 21(fvec4) CompositeExtract 165 0 - Store 164(Color) 166 + Store 164(@entryPointOutput.Color) 166 Return FunctionEnd 11(Fn1(vi4;): 7(ivec4) Function None 9 diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out index d8d77810..11b2acf4 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out @@ -9,7 +9,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 5663 "main" 4656 4257 + EntryPoint Fragment 5663 "main" 4253 3709 ExecutionMode 5663 OriginUpperLeft Decorate 4727 DescriptorSet 0 Decorate 4727 Binding 0 @@ -26,8 +26,8 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Decorate 3789 DescriptorSet 0 Decorate 3805 DescriptorSet 0 Decorate 3869 DescriptorSet 0 - Decorate 4656 Location 0 - Decorate 4257 BuiltIn FragDepth + Decorate 4253 Location 0 + Decorate 3709 BuiltIn FragDepth 8: TypeVoid 1282: TypeFunction 8 13: TypeFloat 32 @@ -127,9 +127,9 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented 1284: 29(fvec4) ConstantComposite 138 138 138 138 650: TypePointer Function 13(float) 667: TypePointer Output 29(fvec4) - 4656: 667(ptr) Variable Output + 4253: 667(ptr) Variable Output 651: TypePointer Output 13(float) - 4257: 651(ptr) Variable Output + 3709: 651(ptr) Variable Output 5663: 8 Function None 1282 24877: Label 4104: 1669(ptr) Variable Function @@ -137,10 +137,10 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Store 4104 18803 13396: 666(ptr) AccessChain 4104 2571 7967: 29(fvec4) Load 13396 - Store 4656 7967 + Store 4253 7967 16622: 650(ptr) AccessChain 4104 2574 11539: 13(float) Load 16622 - Store 4257 11539 + Store 3709 11539 Return FunctionEnd 3317:1032(struct) Function None 319 diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index 0641c523..37a2c907 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out @@ -58,8 +58,8 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Name 169 "g_tTexcdu4" Name 176 "psout" Name 185 "flattenTemp" - Name 188 "Color" - Name 192 "@entryPointOutput_Depth" + Name 188 "@entryPointOutput.Color" + Name 192 "@entryPointOutput.Depth" Name 195 "g_sSamp2d" Name 196 "g_sSamp2D_b" Name 197 "g_tTex1df4a" @@ -78,8 +78,8 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Decorate 151(g_tTexcdf4) DescriptorSet 0 Decorate 160(g_tTexcdi4) DescriptorSet 0 Decorate 169(g_tTexcdu4) DescriptorSet 0 - Decorate 188(Color) Location 0 - Decorate 192(@entryPointOutput_Depth) BuiltIn FragDepth + Decorate 188(@entryPointOutput.Color) Location 0 + Decorate 192(@entryPointOutput.Depth) BuiltIn FragDepth Decorate 195(g_sSamp2d) DescriptorSet 0 Decorate 196(g_sSamp2D_b) DescriptorSet 0 Decorate 197(g_tTex1df4a) DescriptorSet 0 @@ -185,9 +185,9 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented 178: 7(fvec4) ConstantComposite 177 177 177 177 180: TypePointer Function 6(float) 187: TypePointer Output 7(fvec4) - 188(Color): 187(ptr) Variable Output +188(@entryPointOutput.Color): 187(ptr) Variable Output 191: TypePointer Output 6(float) -192(@entryPointOutput_Depth): 191(ptr) Variable Output +192(@entryPointOutput.Depth): 191(ptr) Variable Output 195(g_sSamp2d): 48(ptr) Variable UniformConstant 196(g_sSamp2D_b): 48(ptr) Variable UniformConstant 197(g_tTex1df4a): 44(ptr) Variable UniformConstant @@ -198,10 +198,10 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Store 185(flattenTemp) 186 189: 41(ptr) AccessChain 185(flattenTemp) 29 190: 7(fvec4) Load 189 - Store 188(Color) 190 + Store 188(@entryPointOutput.Color) 190 193: 180(ptr) AccessChain 185(flattenTemp) 16 194: 6(float) Load 193 - Store 192(@entryPointOutput_Depth) 194 + Store 192(@entryPointOutput.Depth) 194 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/spv.buffer.autoassign.frag.out b/Test/baseResults/spv.buffer.autoassign.frag.out index 2a316eed..643b333a 100644 --- a/Test/baseResults/spv.buffer.autoassign.frag.out +++ b/Test/baseResults/spv.buffer.autoassign.frag.out @@ -24,7 +24,7 @@ spv.buffer.autoassign.frag Name 34 "MyUB3" MemberName 34(MyUB3) 0 "g_d" Name 36 "" - Name 47 "Color" + Name 47 "@entryPointOutput.Color" MemberDecorate 16(MyUB1) 0 Offset 0 MemberDecorate 16(MyUB1) 1 Offset 4 Decorate 16(MyUB1) Block @@ -38,7 +38,7 @@ spv.buffer.autoassign.frag Decorate 34(MyUB3) Block Decorate 36 DescriptorSet 0 Decorate 36 Binding 16 - Decorate 47(Color) Location 0 + Decorate 47(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -62,12 +62,12 @@ spv.buffer.autoassign.frag 36: 35(ptr) Variable Uniform 41: TypePointer Function 7(fvec4) 46: TypePointer Output 7(fvec4) - 47(Color): 46(ptr) Variable Output +47(@entryPointOutput.Color): 46(ptr) Variable Output 4(main): 2 Function None 3 5: Label 48:8(PS_OUTPUT) FunctionCall 10(@main() 49: 7(fvec4) CompositeExtract 48 0 - Store 47(Color) 49 + Store 47(@entryPointOutput.Color) 49 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/spv.register.autoassign-2.frag.out b/Test/baseResults/spv.register.autoassign-2.frag.out index f09a4682..988cd0c6 100644 --- a/Test/baseResults/spv.register.autoassign-2.frag.out +++ b/Test/baseResults/spv.register.autoassign-2.frag.out @@ -19,14 +19,14 @@ spv.register.autoassign-2.frag Name 31 "g_tScene[1]" Name 39 "psout" Name 40 "param" - Name 44 "Color" + Name 44 "psout.Color" Decorate 18(g_tScene[0]) DescriptorSet 0 Decorate 18(g_tScene[0]) Binding 10 Decorate 22(g_tSamp) DescriptorSet 0 Decorate 22(g_tSamp) Binding 5 Decorate 31(g_tScene[1]) DescriptorSet 0 Decorate 31(g_tScene[1]) Binding 11 - Decorate 44(Color) Location 0 + Decorate 44(psout.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -50,7 +50,7 @@ spv.register.autoassign-2.frag 31(g_tScene[1]): 17(ptr) Variable UniformConstant 37: TypePointer Function 7(fvec4) 43: TypePointer Output 7(fvec4) - 44(Color): 43(ptr) Variable Output + 44(psout.Color): 43(ptr) Variable Output 4(main): 2 Function None 3 5: Label 39(psout): 9(ptr) Variable Function @@ -60,7 +60,7 @@ spv.register.autoassign-2.frag Store 39(psout) 42 45: 37(ptr) AccessChain 39(psout) 15 46: 7(fvec4) Load 45 - Store 44(Color) 46 + Store 44(psout.Color) 46 Return FunctionEnd 12(@main(struct-PS_OUTPUT-vf41;): 2 Function None 10 diff --git a/Test/baseResults/spv.register.autoassign.frag.out b/Test/baseResults/spv.register.autoassign.frag.out index 4874d90c..6516d4f6 100644 --- a/Test/baseResults/spv.register.autoassign.frag.out +++ b/Test/baseResults/spv.register.autoassign.frag.out @@ -42,7 +42,7 @@ spv.register.autoassign.frag Name 130 "g_tTex_unused2" Name 132 "g_sSamp_unused2" Name 141 "psout" - Name 151 "Color" + Name 151 "@entryPointOutput.Color" Name 154 "g_tTex_unused3" Decorate 21(g_tTex1) DescriptorSet 0 Decorate 21(g_tTex1) Binding 11 @@ -80,7 +80,7 @@ spv.register.autoassign.frag Decorate 130(g_tTex_unused2) DescriptorSet 0 Decorate 130(g_tTex_unused2) Binding 12 Decorate 132(g_sSamp_unused2) DescriptorSet 0 - Decorate 151(Color) Location 0 + Decorate 151(@entryPointOutput.Color) Location 0 Decorate 154(g_tTex_unused3) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 @@ -141,13 +141,13 @@ spv.register.autoassign.frag 140: TypePointer Function 15(PS_OUTPUT) 145: TypePointer Function 7(fvec4) 150: TypePointer Output 7(fvec4) - 151(Color): 150(ptr) Variable Output +151(@entryPointOutput.Color): 150(ptr) Variable Output 154(g_tTex_unused3): 20(ptr) Variable UniformConstant 4(main_ep): 2 Function None 3 5: Label 152:15(PS_OUTPUT) FunctionCall 17(@main_ep() 153: 7(fvec4) CompositeExtract 152 0 - Store 151(Color) 153 + Store 151(@entryPointOutput.Color) 153 Return FunctionEnd 9(Func1(): 7(fvec4) Function None 8 diff --git a/Test/baseResults/spv.register.noautoassign.frag.out b/Test/baseResults/spv.register.noautoassign.frag.out index 71c0b37e..482e5585 100644 --- a/Test/baseResults/spv.register.noautoassign.frag.out +++ b/Test/baseResults/spv.register.noautoassign.frag.out @@ -42,7 +42,7 @@ spv.register.noautoassign.frag Name 130 "g_tTex_unused2" Name 132 "g_sSamp_unused2" Name 141 "psout" - Name 151 "Color" + Name 151 "@entryPointOutput.Color" Name 154 "g_tTex_unused3" Decorate 21(g_tTex1) DescriptorSet 0 Decorate 21(g_tTex1) Binding 11 @@ -73,7 +73,7 @@ spv.register.noautoassign.frag Decorate 130(g_tTex_unused2) DescriptorSet 0 Decorate 130(g_tTex_unused2) Binding 12 Decorate 132(g_sSamp_unused2) DescriptorSet 0 - Decorate 151(Color) Location 0 + Decorate 151(@entryPointOutput.Color) Location 0 Decorate 154(g_tTex_unused3) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 @@ -134,13 +134,13 @@ spv.register.noautoassign.frag 140: TypePointer Function 15(PS_OUTPUT) 145: TypePointer Function 7(fvec4) 150: TypePointer Output 7(fvec4) - 151(Color): 150(ptr) Variable Output +151(@entryPointOutput.Color): 150(ptr) Variable Output 154(g_tTex_unused3): 20(ptr) Variable UniformConstant 4(main_ep): 2 Function None 3 5: Label 152:15(PS_OUTPUT) FunctionCall 17(@main_ep() 153: 7(fvec4) CompositeExtract 152 0 - Store 151(Color) 153 + Store 151(@entryPointOutput.Color) 153 Return FunctionEnd 9(Func1(): 7(fvec4) Function None 8 diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out index 9069666d..0f2a51d2 100644 --- a/Test/baseResults/spv.rw.autoassign.frag.out +++ b/Test/baseResults/spv.rw.autoassign.frag.out @@ -20,12 +20,12 @@ spv.rw.autoassign.frag Name 23 "r01" Name 26 "g_tBuf1du1" Name 30 "psout" - Name 39 "Color" + Name 39 "@entryPointOutput.Color" Decorate 16(g_tTex1df1) DescriptorSet 0 Decorate 16(g_tTex1df1) Binding 20 Decorate 26(g_tBuf1du1) DescriptorSet 0 Decorate 26(g_tBuf1du1) Binding 21 - Decorate 39(Color) Location 0 + Decorate 39(@entryPointOutput.Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -48,12 +48,12 @@ spv.rw.autoassign.frag 32: 7(fvec4) ConstantComposite 31 31 31 31 33: TypePointer Function 7(fvec4) 38: TypePointer Output 7(fvec4) - 39(Color): 38(ptr) Variable Output +39(@entryPointOutput.Color): 38(ptr) Variable Output 4(main): 2 Function None 3 5: Label 40:8(PS_OUTPUT) FunctionCall 10(@main() 41: 7(fvec4) CompositeExtract 40 0 - Store 39(Color) 41 + Store 39(@entryPointOutput.Color) 41 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 62f60bb9..4c5cf050 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -1136,8 +1136,7 @@ void HlslParseContext::splitBuiltIn(const TString& baseName, const TType& member splitBuiltIns.end()) return; - TVariable* ioVar = makeInternalVariable(baseName + (baseName.empty() ? "" : "_") + memberType.getFieldName(), - memberType); + TVariable* ioVar = makeInternalVariable(baseName + "." + memberType.getFieldName(), memberType); if (arraySizes != nullptr && !memberType.isArray()) ioVar->getWritableType().newArraySizes(*arraySizes); @@ -1177,7 +1176,7 @@ const TType& HlslParseContext::split(const TType& type, const TString& name, con splitBuiltIn(name, *ioType->type, type.getArraySizes(), outerQualifier); ioType = userStructure->erase(ioType); } else { - split(*ioType->type, name + (name.empty() ? "" : "_") + ioType->type->getFieldName(), outerQualifier); + split(*ioType->type, name + "." + ioType->type->getFieldName(), outerQualifier); ++ioType; } } @@ -1209,7 +1208,7 @@ void HlslParseContext::flatten(const TVariable& variable, bool linkage) type.getQualifier().layoutLocation))); // the item is a map pair, so first->second is the TFlattenData itself. - flatten(variable, type, entry.first->second, "", linkage, type.getQualifier(), nullptr); + flatten(variable, type, entry.first->second, variable.getName(), linkage, type.getQualifier(), nullptr); } // Recursively flatten the given variable at the provided type, building the flattenData as we go. @@ -1319,10 +1318,9 @@ int HlslParseContext::flattenStruct(const TVariable& variable, const TType& type if (dereferencedType.isBuiltIn()) splitBuiltIn(variable.getName(), dereferencedType, builtInArraySizes, outerQualifier); else { - const TString memberName = name + (name.empty() ? "" : ".") + dereferencedType.getFieldName(); - - const int mpos = addFlattenedMember(variable, dereferencedType, flattenData, memberName, linkage, - outerQualifier, + const int mpos = addFlattenedMember(variable, dereferencedType, flattenData, + name + "." + dereferencedType.getFieldName(), + linkage, outerQualifier, builtInArraySizes == nullptr && dereferencedType.isArray() ? &dereferencedType.getArraySizes() : builtInArraySizes);