diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out index 4d075111..cb1589e6 100755 --- a/Test/baseResults/hlsl.array.frag.out +++ b/Test/baseResults/hlsl.array.frag.out @@ -9,7 +9,7 @@ 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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) @@ -64,7 +64,7 @@ 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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) @@ -123,6 +123,7 @@ gl_FragCoord origin is upper left Name 54 "" MemberName 54 0 "m" Name 58 "s" + Decorate 9(@entryPointOutput) Location 0 Decorate 21(i) Location 0 Decorate 29(input) Location 1 2: TypeVoid diff --git a/Test/baseResults/hlsl.assoc.frag.out b/Test/baseResults/hlsl.assoc.frag.out index b419cc01..8201aaf3 100755 --- a/Test/baseResults/hlsl.assoc.frag.out +++ b/Test/baseResults/hlsl.assoc.frag.out @@ -21,7 +21,7 @@ gl_FragCoord origin is upper left 0:9 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Sequence 0:10 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left 0:9 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Sequence 0:10 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) 0:10 add (temp 4-component vector of float) @@ -94,6 +94,7 @@ gl_FragCoord origin is upper left Decorate 11(a3) Location 2 Decorate 12(a4) Location 3 Decorate 13(a5) Location 4 + Decorate 16(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out index edcbbb84..9f79ab90 100755 --- a/Test/baseResults/hlsl.buffer.frag.out +++ b/Test/baseResults/hlsl.buffer.frag.out @@ -8,7 +8,7 @@ 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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:27 add (temp 4-component vector of float) 0:27 add (temp 4-component vector of float) 0:27 add (temp 4-component vector of float) @@ -50,7 +50,7 @@ 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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:27 add (temp 4-component vector of float) 0:27 add (temp 4-component vector of float) 0:27 add (temp 4-component vector of float) @@ -111,6 +111,7 @@ gl_FragCoord origin is upper left MemberName 34 6 "f6" MemberName 34 7 "f7" Name 36 "" + Decorate 9(@entryPointOutput) Location 0 Decorate 11(input) Location 0 MemberDecorate 13 0 Offset 0 Decorate 13 Block diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index 0ce3e645..9e4f3678 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -303,7 +303,7 @@ gl_FragCoord origin is upper left 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -321,7 +321,7 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 145 +// Id's are bound by 146 Capability Shader Capability Sampled1D @@ -329,7 +329,7 @@ gl_FragCoord origin is upper left Capability ImageQuery 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 141 + EntryPoint Fragment 4 "main" 142 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "txval10" @@ -355,8 +355,11 @@ gl_FragCoord origin is upper left MemberName 131(PS_OUTPUT) 0 "Color" MemberName 131(PS_OUTPUT) 1 "Depth" Name 133 "psout" - Name 141 "@entryPointOutput" - Name 144 "g_tTex1df4" + Name 140 "PS_OUTPUT" + MemberName 140(PS_OUTPUT) 0 "Color" + MemberName 140(PS_OUTPUT) 1 "Depth" + Name 142 "@entryPointOutput" + Name 145 "g_tTex1df4" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 11(g_tTex1df4a) Binding 1 Decorate 15(g_sSamp) DescriptorSet 0 @@ -370,8 +373,10 @@ gl_FragCoord origin is upper left Decorate 106(g_tTexcdi4a) DescriptorSet 0 Decorate 118(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 144(g_tTex1df4) DescriptorSet 0 - Decorate 144(g_tTex1df4) Binding 0 + MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 142(@entryPointOutput) Location 0 + Decorate 145(g_tTex1df4) DescriptorSet 0 + Decorate 145(g_tTex1df4) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -442,9 +447,10 @@ gl_FragCoord origin is upper left 135: 130(fvec4) ConstantComposite 134 134 134 134 136: TypePointer Function 130(fvec4) 138: 23(int) Constant 1 - 140: TypePointer Output 131(PS_OUTPUT) -141(@entryPointOutput): 140(ptr) Variable Output - 144(g_tTex1df4): 10(ptr) Variable UniformConstant + 140(PS_OUTPUT): TypeStruct 130(fvec4) 6(float) + 141: TypePointer Output 140(PS_OUTPUT) +142(@entryPointOutput): 141(ptr) Variable Output + 145(g_tTex1df4): 10(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(txval10): 7(ptr) Variable Function @@ -524,7 +530,7 @@ gl_FragCoord origin is upper left Store 137 135 139: 7(ptr) AccessChain 133(psout) 138 Store 139 134 - 142:131(PS_OUTPUT) Load 133(psout) - Store 141(@entryPointOutput) 142 + 143:131(PS_OUTPUT) Load 133(psout) + Store 142(@entryPointOutput) 143 Return FunctionEnd diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index 8dbdc57b..e46c1a65 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -153,7 +153,7 @@ ERROR: node is still EOpNull! 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -315,7 +315,7 @@ ERROR: node is still EOpNull! 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects diff --git a/Test/baseResults/hlsl.cast.frag.out b/Test/baseResults/hlsl.cast.frag.out index 5554be15..bcf35cb1 100755 --- a/Test/baseResults/hlsl.cast.frag.out +++ b/Test/baseResults/hlsl.cast.frag.out @@ -8,7 +8,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 add (temp 4-component vector of float) 0:3 add (temp 4-component vector of float) 0:3 Construct vec4 (temp 4-component vector of float) @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 add (temp 4-component vector of float) 0:3 add (temp 4-component vector of float) 0:3 Construct vec4 (temp 4-component vector of float) @@ -65,6 +65,7 @@ gl_FragCoord origin is upper left Name 4 "PixelShaderFunction" Name 9 "@entryPointOutput" Name 11 "input" + Decorate 9(@entryPointOutput) Location 0 Decorate 11(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out index 672024c4..e0356b5e 100755 --- a/Test/baseResults/hlsl.conditional.frag.out +++ b/Test/baseResults/hlsl.conditional.frag.out @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:14 'input' (layout(location=0 ) in 4-component vector of float) 0:15 Sequence 0:15 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:15 add (temp 4-component vector of float) 0:15 vector-scale (temp 4-component vector of float) 0:15 Convert int to float (temp float) @@ -215,7 +215,7 @@ gl_FragCoord origin is upper left 0:14 'input' (layout(location=0 ) in 4-component vector of float) 0:15 Sequence 0:15 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:15 add (temp 4-component vector of float) 0:15 vector-scale (temp 4-component vector of float) 0:15 Convert int to float (temp float) @@ -245,6 +245,7 @@ gl_FragCoord origin is upper left Name 57 "f" Name 83 "@entryPointOutput" Decorate 22(input) Location 0 + Decorate 83(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index 0dab6a80..a8ed49cf 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -36,7 +36,7 @@ gl_FragCoord origin is upper left 0:15 1.000000 0:16 Sequence 0:16 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:16 'ps_output' (temp structure{temp 4-component vector of float color}) 0:16 Branch: Return 0:? Linker Objects @@ -82,25 +82,28 @@ gl_FragCoord origin is upper left 0:15 1.000000 0:16 Sequence 0:16 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:16 'ps_output' (temp structure{temp 4-component vector of float color}) 0:16 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 34 +// Id's are bound by 35 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 31 + EntryPoint Fragment 4 "main" 32 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 22 "PS_OUTPUT" MemberName 22(PS_OUTPUT) 0 "color" Name 24 "ps_output" - Name 31 "@entryPointOutput" + Name 30 "PS_OUTPUT" + MemberName 30(PS_OUTPUT) 0 "color" + Name 32 "@entryPointOutput" + Decorate 32(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -125,14 +128,15 @@ gl_FragCoord origin is upper left 26: 13(float) Constant 1065353216 27: 21(fvec4) ConstantComposite 26 26 26 26 28: TypePointer Function 21(fvec4) - 30: TypePointer Output 22(PS_OUTPUT) -31(@entryPointOutput): 30(ptr) Variable Output + 30(PS_OUTPUT): TypeStruct 21(fvec4) + 31: TypePointer Output 30(PS_OUTPUT) +32(@entryPointOutput): 31(ptr) Variable Output 4(main): 2 Function None 3 5: Label 24(ps_output): 23(ptr) Variable Function 29: 28(ptr) AccessChain 24(ps_output) 25 Store 29 27 - 32:22(PS_OUTPUT) Load 24(ps_output) - Store 31(@entryPointOutput) 32 + 33:22(PS_OUTPUT) Load 24(ps_output) + Store 32(@entryPointOutput) 33 Return FunctionEnd diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out index 3de57472..5f5d384e 100755 --- a/Test/baseResults/hlsl.doLoop.frag.out +++ b/Test/baseResults/hlsl.doLoop.frag.out @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:5 Loop Body 0:5 Sequence 0:5 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects @@ -58,7 +58,7 @@ gl_FragCoord origin is upper left 0:5 Loop Body 0:5 Sequence 0:5 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects @@ -75,6 +75,7 @@ gl_FragCoord origin is upper left Name 4 "PixelShaderFunction" Name 23 "@entryPointOutput" Name 25 "input" + Decorate 23(@entryPointOutput) Location 0 Decorate 25(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index f63bb3da..a5cac6fe 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -29,7 +29,7 @@ gl_FragCoord origin is upper left 0:10 3 (const int) 0:11 Sequence 0:11 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:11 'out1' (out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:10 3 (const int) 0:11 Sequence 0:11 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:11 'out1' (out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects @@ -91,6 +91,7 @@ gl_FragCoord origin is upper left Name 18 "out2" Name 29 "@entryPointOutput" Decorate 11(input) Location 0 + Decorate 29(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out index 44010957..ad9dc88f 100755 --- a/Test/baseResults/hlsl.forLoop.frag.out +++ b/Test/baseResults/hlsl.forLoop.frag.out @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:6 Sequence 0:6 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:6 Negate value (temp 4-component vector of float) 0:6 'input' (layout(location=0 ) in 4-component vector of float) 0:6 Branch: Return @@ -49,7 +49,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:7 Sequence 0:7 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:7 Negate value (temp 4-component vector of float) 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 Branch: Return @@ -153,7 +153,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:6 Sequence 0:6 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:6 Negate value (temp 4-component vector of float) 0:6 'input' (layout(location=0 ) in 4-component vector of float) 0:6 Branch: Return @@ -169,7 +169,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:7 Sequence 0:7 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:7 Negate value (temp 4-component vector of float) 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 Branch: Return @@ -250,6 +250,7 @@ gl_FragCoord origin is upper left Name 91 "ii" Name 111 "ii" Decorate 13(input) Location 0 + Decorate 43(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 10: TypeFloat 32 diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index 58f7a77c..f2042c54 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -93,7 +93,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -207,7 +207,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -225,14 +225,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 112 +// Id's are bound by 113 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 99 + EntryPoint Fragment 4 "main" 100 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -252,11 +252,14 @@ gl_FragCoord origin is upper left MemberName 90(PS_OUTPUT) 0 "Color" MemberName 90(PS_OUTPUT) 1 "Depth" Name 92 "psout" - Name 99 "@entryPointOutput" - Name 104 "g_tTex1df4a" - Name 105 "g_tTex1df4" - Name 108 "g_tTex1di4a" - Name 111 "g_tTex1du4a" + Name 98 "PS_OUTPUT" + MemberName 98(PS_OUTPUT) 0 "Color" + MemberName 98(PS_OUTPUT) 1 "Depth" + Name 100 "@entryPointOutput" + Name 105 "g_tTex1df4a" + Name 106 "g_tTex1df4" + Name 109 "g_tTex1di4a" + Name 112 "g_tTex1du4a" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -266,12 +269,14 @@ gl_FragCoord origin is upper left Decorate 70(g_tTexcdi4a) DescriptorSet 0 Decorate 80(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 104(g_tTex1df4a) DescriptorSet 0 - Decorate 104(g_tTex1df4a) Binding 1 - Decorate 105(g_tTex1df4) DescriptorSet 0 - Decorate 105(g_tTex1df4) Binding 0 - Decorate 108(g_tTex1di4a) DescriptorSet 0 - Decorate 111(g_tTex1du4a) DescriptorSet 0 + MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 100(@entryPointOutput) Location 0 + Decorate 105(g_tTex1df4a) DescriptorSet 0 + Decorate 105(g_tTex1df4a) Binding 1 + Decorate 106(g_tTex1df4) DescriptorSet 0 + Decorate 106(g_tTex1df4) Binding 0 + Decorate 109(g_tTex1di4a) DescriptorSet 0 + Decorate 112(g_tTex1du4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -333,18 +338,19 @@ gl_FragCoord origin is upper left 93: 7(fvec4) ConstantComposite 87 87 87 87 95: 25(int) Constant 1 96: TypePointer Function 6(float) - 98: TypePointer Output 90(PS_OUTPUT) -99(@entryPointOutput): 98(ptr) Variable Output - 102: TypeImage 6(float) 1D array sampled format:Unknown - 103: TypePointer UniformConstant 102 -104(g_tTex1df4a): 103(ptr) Variable UniformConstant - 105(g_tTex1df4): 103(ptr) Variable UniformConstant - 106: TypeImage 25(int) 1D array sampled format:Unknown - 107: TypePointer UniformConstant 106 -108(g_tTex1di4a): 107(ptr) Variable UniformConstant - 109: TypeImage 42(int) 1D array sampled format:Unknown - 110: TypePointer UniformConstant 109 -111(g_tTex1du4a): 110(ptr) Variable UniformConstant + 98(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 99: TypePointer Output 98(PS_OUTPUT) +100(@entryPointOutput): 99(ptr) Variable Output + 103: TypeImage 6(float) 1D array sampled format:Unknown + 104: TypePointer UniformConstant 103 +105(g_tTex1df4a): 104(ptr) Variable UniformConstant + 106(g_tTex1df4): 104(ptr) Variable UniformConstant + 107: TypeImage 25(int) 1D array sampled format:Unknown + 108: TypePointer UniformConstant 107 +109(g_tTex1di4a): 108(ptr) Variable UniformConstant + 110: TypeImage 42(int) 1D array sampled format:Unknown + 111: TypePointer UniformConstant 110 +112(g_tTex1du4a): 111(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function @@ -388,7 +394,7 @@ gl_FragCoord origin is upper left Store 94 93 97: 96(ptr) AccessChain 92(psout) 95 Store 97 87 - 100:90(PS_OUTPUT) Load 92(psout) - Store 99(@entryPointOutput) 100 + 101:90(PS_OUTPUT) Load 92(psout) + Store 100(@entryPointOutput) 101 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index c75a0598..94bd1b02 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -87,7 +87,7 @@ gl_FragCoord origin is upper left 0:45 1.000000 0:47 Sequence 0:47 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 Branch: Return 0:? Linker Objects @@ -199,7 +199,7 @@ gl_FragCoord origin is upper left 0:45 1.000000 0:47 Sequence 0:47 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 Branch: Return 0:? Linker Objects @@ -221,13 +221,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 123 +// Id's are bound by 124 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 100 + EntryPoint Fragment 4 "main" 101 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -247,15 +247,18 @@ gl_FragCoord origin is upper left MemberName 90(PS_OUTPUT) 0 "Color" MemberName 90(PS_OUTPUT) 1 "Depth" Name 92 "psout" - Name 100 "@entryPointOutput" - Name 103 "g_sSamp2d" - Name 106 "g_tTex1df4a" - Name 107 "g_tTex1df4" - Name 110 "g_tTex1di4" - Name 113 "g_tTex1du4" - Name 116 "g_tTex3df4" - Name 119 "g_tTex3di4" - Name 122 "g_tTex3du4" + Name 99 "PS_OUTPUT" + MemberName 99(PS_OUTPUT) 0 "Color" + MemberName 99(PS_OUTPUT) 1 "Depth" + Name 101 "@entryPointOutput" + Name 104 "g_sSamp2d" + Name 107 "g_tTex1df4a" + Name 108 "g_tTex1df4" + Name 111 "g_tTex1di4" + Name 114 "g_tTex1du4" + Name 117 "g_tTex3df4" + Name 120 "g_tTex3di4" + Name 123 "g_tTex3du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -265,16 +268,18 @@ gl_FragCoord origin is upper left Decorate 70(g_tTexcdi4) DescriptorSet 0 Decorate 80(g_tTexcdu4) DescriptorSet 0 MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 103(g_sSamp2d) DescriptorSet 0 - Decorate 106(g_tTex1df4a) DescriptorSet 0 - Decorate 106(g_tTex1df4a) Binding 1 - Decorate 107(g_tTex1df4) DescriptorSet 0 - Decorate 107(g_tTex1df4) Binding 0 - Decorate 110(g_tTex1di4) DescriptorSet 0 - Decorate 113(g_tTex1du4) DescriptorSet 0 - Decorate 116(g_tTex3df4) DescriptorSet 0 - Decorate 119(g_tTex3di4) DescriptorSet 0 - Decorate 122(g_tTex3du4) DescriptorSet 0 + MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 101(@entryPointOutput) Location 0 + Decorate 104(g_sSamp2d) DescriptorSet 0 + Decorate 107(g_tTex1df4a) DescriptorSet 0 + Decorate 107(g_tTex1df4a) Binding 1 + Decorate 108(g_tTex1df4) DescriptorSet 0 + Decorate 108(g_tTex1df4) Binding 0 + Decorate 111(g_tTex1di4) DescriptorSet 0 + Decorate 114(g_tTex1du4) DescriptorSet 0 + Decorate 117(g_tTex3df4) DescriptorSet 0 + Decorate 120(g_tTex3di4) DescriptorSet 0 + Decorate 123(g_tTex3du4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -337,28 +342,29 @@ gl_FragCoord origin is upper left 94: 7(fvec4) ConstantComposite 93 93 93 93 96: 24(int) Constant 1 97: TypePointer Function 6(float) - 99: TypePointer Output 90(PS_OUTPUT) -100(@entryPointOutput): 99(ptr) Variable Output - 103(g_sSamp2d): 15(ptr) Variable UniformConstant - 104: TypeImage 6(float) 1D sampled format:Unknown - 105: TypePointer UniformConstant 104 -106(g_tTex1df4a): 105(ptr) Variable UniformConstant - 107(g_tTex1df4): 105(ptr) Variable UniformConstant - 108: TypeImage 24(int) 1D sampled format:Unknown - 109: TypePointer UniformConstant 108 - 110(g_tTex1di4): 109(ptr) Variable UniformConstant - 111: TypeImage 41(int) 1D sampled format:Unknown - 112: TypePointer UniformConstant 111 - 113(g_tTex1du4): 112(ptr) Variable UniformConstant - 114: TypeImage 6(float) 3D sampled format:Unknown - 115: TypePointer UniformConstant 114 - 116(g_tTex3df4): 115(ptr) Variable UniformConstant - 117: TypeImage 24(int) 3D sampled format:Unknown - 118: TypePointer UniformConstant 117 - 119(g_tTex3di4): 118(ptr) Variable UniformConstant - 120: TypeImage 41(int) 3D sampled format:Unknown - 121: TypePointer UniformConstant 120 - 122(g_tTex3du4): 121(ptr) Variable UniformConstant + 99(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 100: TypePointer Output 99(PS_OUTPUT) +101(@entryPointOutput): 100(ptr) Variable Output + 104(g_sSamp2d): 15(ptr) Variable UniformConstant + 105: TypeImage 6(float) 1D sampled format:Unknown + 106: TypePointer UniformConstant 105 +107(g_tTex1df4a): 106(ptr) Variable UniformConstant + 108(g_tTex1df4): 106(ptr) Variable UniformConstant + 109: TypeImage 24(int) 1D sampled format:Unknown + 110: TypePointer UniformConstant 109 + 111(g_tTex1di4): 110(ptr) Variable UniformConstant + 112: TypeImage 41(int) 1D sampled format:Unknown + 113: TypePointer UniformConstant 112 + 114(g_tTex1du4): 113(ptr) Variable UniformConstant + 115: TypeImage 6(float) 3D sampled format:Unknown + 116: TypePointer UniformConstant 115 + 117(g_tTex3df4): 116(ptr) Variable UniformConstant + 118: TypeImage 24(int) 3D sampled format:Unknown + 119: TypePointer UniformConstant 118 + 120(g_tTex3di4): 119(ptr) Variable UniformConstant + 121: TypeImage 41(int) 3D sampled format:Unknown + 122: TypePointer UniformConstant 121 + 123(g_tTex3du4): 122(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function @@ -402,7 +408,7 @@ gl_FragCoord origin is upper left Store 95 94 98: 97(ptr) AccessChain 92(psout) 96 Store 98 93 - 101:90(PS_OUTPUT) Load 92(psout) - Store 100(@entryPointOutput) 101 + 102:90(PS_OUTPUT) Load 92(psout) + Store 101(@entryPointOutput) 102 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 291caa76..13fd9484 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -79,7 +79,7 @@ Shader version: 450 0:? 0.000000 0:45 Sequence 0:45 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:45 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:45 Branch: Return 0:? Linker Objects @@ -183,7 +183,7 @@ Shader version: 450 0:? 0.000000 0:45 Sequence 0:45 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:45 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:45 Branch: Return 0:? Linker Objects @@ -205,13 +205,13 @@ Shader version: 450 // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 120 +// Id's are bound by 121 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 97 + EntryPoint Vertex 4 "main" 98 Name 4 "main" Name 9 "txval20" Name 12 "g_tTex2df4" @@ -229,15 +229,17 @@ Shader version: 450 Name 90 "VS_OUTPUT" MemberName 90(VS_OUTPUT) 0 "Pos" Name 92 "vsout" - Name 97 "@entryPointOutput" - Name 100 "g_sSamp2d" - Name 103 "g_tTex1df4a" - Name 104 "g_tTex1df4" - Name 107 "g_tTex1di4" - Name 110 "g_tTex1du4" - Name 113 "g_tTex3df4" - Name 116 "g_tTex3di4" - Name 119 "g_tTex3du4" + Name 96 "VS_OUTPUT" + MemberName 96(VS_OUTPUT) 0 "Pos" + Name 98 "@entryPointOutput" + Name 101 "g_sSamp2d" + Name 104 "g_tTex1df4a" + Name 105 "g_tTex1df4" + Name 108 "g_tTex1di4" + Name 111 "g_tTex1du4" + Name 114 "g_tTex3df4" + Name 117 "g_tTex3di4" + Name 120 "g_tTex3du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -247,16 +249,18 @@ Shader version: 450 Decorate 70(g_tTexcdi4) DescriptorSet 0 Decorate 80(g_tTexcdu4) DescriptorSet 0 MemberDecorate 90(VS_OUTPUT) 0 BuiltIn Position - Decorate 100(g_sSamp2d) DescriptorSet 0 - Decorate 103(g_tTex1df4a) DescriptorSet 0 - Decorate 103(g_tTex1df4a) Binding 1 - Decorate 104(g_tTex1df4) DescriptorSet 0 - Decorate 104(g_tTex1df4) Binding 0 - Decorate 107(g_tTex1di4) DescriptorSet 0 - Decorate 110(g_tTex1du4) DescriptorSet 0 - Decorate 113(g_tTex3df4) DescriptorSet 0 - Decorate 116(g_tTex3di4) DescriptorSet 0 - Decorate 119(g_tTex3du4) DescriptorSet 0 + MemberDecorate 96(VS_OUTPUT) 0 BuiltIn Position + Decorate 98(@entryPointOutput) Location 0 + Decorate 101(g_sSamp2d) DescriptorSet 0 + Decorate 104(g_tTex1df4a) DescriptorSet 0 + Decorate 104(g_tTex1df4a) Binding 1 + Decorate 105(g_tTex1df4) DescriptorSet 0 + Decorate 105(g_tTex1df4) Binding 0 + Decorate 108(g_tTex1di4) DescriptorSet 0 + Decorate 111(g_tTex1du4) DescriptorSet 0 + Decorate 114(g_tTex3df4) DescriptorSet 0 + Decorate 117(g_tTex3di4) DescriptorSet 0 + Decorate 120(g_tTex3du4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -317,28 +321,29 @@ Shader version: 450 91: TypePointer Function 90(VS_OUTPUT) 93: 6(float) Constant 0 94: 7(fvec4) ConstantComposite 93 93 93 93 - 96: TypePointer Output 90(VS_OUTPUT) -97(@entryPointOutput): 96(ptr) Variable Output - 100(g_sSamp2d): 15(ptr) Variable UniformConstant - 101: TypeImage 6(float) 1D sampled format:Unknown - 102: TypePointer UniformConstant 101 -103(g_tTex1df4a): 102(ptr) Variable UniformConstant - 104(g_tTex1df4): 102(ptr) Variable UniformConstant - 105: TypeImage 24(int) 1D sampled format:Unknown - 106: TypePointer UniformConstant 105 - 107(g_tTex1di4): 106(ptr) Variable UniformConstant - 108: TypeImage 41(int) 1D sampled format:Unknown - 109: TypePointer UniformConstant 108 - 110(g_tTex1du4): 109(ptr) Variable UniformConstant - 111: TypeImage 6(float) 3D sampled format:Unknown - 112: TypePointer UniformConstant 111 - 113(g_tTex3df4): 112(ptr) Variable UniformConstant - 114: TypeImage 24(int) 3D sampled format:Unknown - 115: TypePointer UniformConstant 114 - 116(g_tTex3di4): 115(ptr) Variable UniformConstant - 117: TypeImage 41(int) 3D sampled format:Unknown - 118: TypePointer UniformConstant 117 - 119(g_tTex3du4): 118(ptr) Variable UniformConstant + 96(VS_OUTPUT): TypeStruct 7(fvec4) + 97: TypePointer Output 96(VS_OUTPUT) +98(@entryPointOutput): 97(ptr) Variable Output + 101(g_sSamp2d): 15(ptr) Variable UniformConstant + 102: TypeImage 6(float) 1D sampled format:Unknown + 103: TypePointer UniformConstant 102 +104(g_tTex1df4a): 103(ptr) Variable UniformConstant + 105(g_tTex1df4): 103(ptr) Variable UniformConstant + 106: TypeImage 24(int) 1D sampled format:Unknown + 107: TypePointer UniformConstant 106 + 108(g_tTex1di4): 107(ptr) Variable UniformConstant + 109: TypeImage 41(int) 1D sampled format:Unknown + 110: TypePointer UniformConstant 109 + 111(g_tTex1du4): 110(ptr) Variable UniformConstant + 112: TypeImage 6(float) 3D sampled format:Unknown + 113: TypePointer UniformConstant 112 + 114(g_tTex3df4): 113(ptr) Variable UniformConstant + 115: TypeImage 24(int) 3D sampled format:Unknown + 116: TypePointer UniformConstant 115 + 117(g_tTex3di4): 116(ptr) Variable UniformConstant + 118: TypeImage 41(int) 3D sampled format:Unknown + 119: TypePointer UniformConstant 118 + 120(g_tTex3du4): 119(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function @@ -380,7 +385,7 @@ Shader version: 450 Store 77(txval42) 89 95: 8(ptr) AccessChain 92(vsout) 25 Store 95 94 - 98:90(VS_OUTPUT) Load 92(vsout) - Store 97(@entryPointOutput) 98 + 99:90(VS_OUTPUT) Load 92(vsout) + Store 98(@entryPointOutput) 99 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index 2f856642..7cb6ad7a 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -63,7 +63,7 @@ gl_FragCoord origin is upper left 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:41 1.000000 0:43 Sequence 0:43 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -171,13 +171,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 102 +// Id's are bound by 103 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 71 + EntryPoint Fragment 4 "main" 72 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -191,35 +191,40 @@ gl_FragCoord origin is upper left MemberName 62(PS_OUTPUT) 0 "Color" MemberName 62(PS_OUTPUT) 1 "Depth" Name 64 "psout" - Name 71 "@entryPointOutput" - Name 76 "g_tTex1df4a" - Name 77 "g_tTex1df4" - Name 80 "g_tTex1di4" - Name 83 "g_tTex1du4" - Name 86 "g_tTex3df4" - Name 89 "g_tTex3di4" - Name 92 "g_tTex3du4" - Name 95 "g_tTexcdf4" - Name 98 "g_tTexcdi4" - Name 101 "g_tTexcdu4" + Name 70 "PS_OUTPUT" + MemberName 70(PS_OUTPUT) 0 "Color" + MemberName 70(PS_OUTPUT) 1 "Depth" + Name 72 "@entryPointOutput" + Name 77 "g_tTex1df4a" + Name 78 "g_tTex1df4" + Name 81 "g_tTex1di4" + Name 84 "g_tTex1du4" + Name 87 "g_tTex3df4" + Name 90 "g_tTex3di4" + Name 93 "g_tTex3du4" + Name 96 "g_tTexcdf4" + Name 99 "g_tTexcdi4" + Name 102 "g_tTexcdu4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 Decorate 35(g_tTex2di4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0 MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 76(g_tTex1df4a) DescriptorSet 0 - Decorate 76(g_tTex1df4a) Binding 1 - Decorate 77(g_tTex1df4) DescriptorSet 0 - Decorate 77(g_tTex1df4) Binding 0 - Decorate 80(g_tTex1di4) DescriptorSet 0 - Decorate 83(g_tTex1du4) DescriptorSet 0 - Decorate 86(g_tTex3df4) DescriptorSet 0 - Decorate 89(g_tTex3di4) DescriptorSet 0 - Decorate 92(g_tTex3du4) DescriptorSet 0 - Decorate 95(g_tTexcdf4) DescriptorSet 0 - Decorate 98(g_tTexcdi4) DescriptorSet 0 - Decorate 101(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 70(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 72(@entryPointOutput) Location 0 + Decorate 77(g_tTex1df4a) DescriptorSet 0 + Decorate 77(g_tTex1df4a) Binding 1 + Decorate 78(g_tTex1df4) DescriptorSet 0 + Decorate 78(g_tTex1df4) Binding 0 + Decorate 81(g_tTex1di4) DescriptorSet 0 + Decorate 84(g_tTex1du4) DescriptorSet 0 + Decorate 87(g_tTex3df4) DescriptorSet 0 + Decorate 90(g_tTex3di4) DescriptorSet 0 + Decorate 93(g_tTex3du4) DescriptorSet 0 + Decorate 96(g_tTexcdf4) DescriptorSet 0 + Decorate 99(g_tTexcdi4) DescriptorSet 0 + Decorate 102(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -268,36 +273,37 @@ gl_FragCoord origin is upper left 65: 6(float) Constant 1065353216 66: 7(fvec4) ConstantComposite 65 65 65 65 68: TypePointer Function 6(float) - 70: TypePointer Output 62(PS_OUTPUT) -71(@entryPointOutput): 70(ptr) Variable Output - 74: TypeImage 6(float) 1D sampled format:Unknown - 75: TypePointer UniformConstant 74 - 76(g_tTex1df4a): 75(ptr) Variable UniformConstant - 77(g_tTex1df4): 75(ptr) Variable UniformConstant - 78: TypeImage 24(int) 1D sampled format:Unknown - 79: TypePointer UniformConstant 78 - 80(g_tTex1di4): 79(ptr) Variable UniformConstant - 81: TypeImage 45(int) 1D sampled format:Unknown - 82: TypePointer UniformConstant 81 - 83(g_tTex1du4): 82(ptr) Variable UniformConstant - 84: TypeImage 6(float) 3D sampled format:Unknown - 85: TypePointer UniformConstant 84 - 86(g_tTex3df4): 85(ptr) Variable UniformConstant - 87: TypeImage 24(int) 3D sampled format:Unknown - 88: TypePointer UniformConstant 87 - 89(g_tTex3di4): 88(ptr) Variable UniformConstant - 90: TypeImage 45(int) 3D sampled format:Unknown - 91: TypePointer UniformConstant 90 - 92(g_tTex3du4): 91(ptr) Variable UniformConstant - 93: TypeImage 6(float) Cube sampled format:Unknown - 94: TypePointer UniformConstant 93 - 95(g_tTexcdf4): 94(ptr) Variable UniformConstant - 96: TypeImage 24(int) Cube sampled format:Unknown - 97: TypePointer UniformConstant 96 - 98(g_tTexcdi4): 97(ptr) Variable UniformConstant - 99: TypeImage 45(int) Cube sampled format:Unknown - 100: TypePointer UniformConstant 99 - 101(g_tTexcdu4): 100(ptr) Variable UniformConstant + 70(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 71: TypePointer Output 70(PS_OUTPUT) +72(@entryPointOutput): 71(ptr) Variable Output + 75: TypeImage 6(float) 1D sampled format:Unknown + 76: TypePointer UniformConstant 75 + 77(g_tTex1df4a): 76(ptr) Variable UniformConstant + 78(g_tTex1df4): 76(ptr) Variable UniformConstant + 79: TypeImage 24(int) 1D sampled format:Unknown + 80: TypePointer UniformConstant 79 + 81(g_tTex1di4): 80(ptr) Variable UniformConstant + 82: TypeImage 45(int) 1D sampled format:Unknown + 83: TypePointer UniformConstant 82 + 84(g_tTex1du4): 83(ptr) Variable UniformConstant + 85: TypeImage 6(float) 3D sampled format:Unknown + 86: TypePointer UniformConstant 85 + 87(g_tTex3df4): 86(ptr) Variable UniformConstant + 88: TypeImage 24(int) 3D sampled format:Unknown + 89: TypePointer UniformConstant 88 + 90(g_tTex3di4): 89(ptr) Variable UniformConstant + 91: TypeImage 45(int) 3D sampled format:Unknown + 92: TypePointer UniformConstant 91 + 93(g_tTex3du4): 92(ptr) Variable UniformConstant + 94: TypeImage 6(float) Cube sampled format:Unknown + 95: TypePointer UniformConstant 94 + 96(g_tTexcdf4): 95(ptr) Variable UniformConstant + 97: TypeImage 24(int) Cube sampled format:Unknown + 98: TypePointer UniformConstant 97 + 99(g_tTexcdi4): 98(ptr) Variable UniformConstant + 100: TypeImage 45(int) Cube sampled format:Unknown + 101: TypePointer UniformConstant 100 + 102(g_tTexcdu4): 101(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function @@ -323,7 +329,7 @@ gl_FragCoord origin is upper left Store 67 66 69: 68(ptr) AccessChain 64(psout) 26 Store 69 65 - 72:62(PS_OUTPUT) Load 64(psout) - Store 71(@entryPointOutput) 72 + 73:62(PS_OUTPUT) Load 64(psout) + Store 72(@entryPointOutput) 73 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 5cfae1ef..d4cfa005 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -66,7 +66,7 @@ gl_FragCoord origin is upper left 0:33 1.000000 0:35 Sequence 0:35 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 Branch: Return 0:? Linker Objects @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:33 1.000000 0:35 Sequence 0:35 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 Branch: Return 0:? Linker Objects @@ -165,13 +165,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 85 +// Id's are bound by 86 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 72 + EntryPoint Fragment 4 "main" 73 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -185,23 +185,28 @@ gl_FragCoord origin is upper left MemberName 63(PS_OUTPUT) 0 "Color" MemberName 63(PS_OUTPUT) 1 "Depth" Name 65 "psout" - Name 72 "@entryPointOutput" - Name 77 "g_tTex1df4a" - Name 78 "g_tTex1df4" - Name 81 "g_tTex1di4" - Name 84 "g_tTex1du4" + Name 71 "PS_OUTPUT" + MemberName 71(PS_OUTPUT) 0 "Color" + MemberName 71(PS_OUTPUT) 1 "Depth" + Name 73 "@entryPointOutput" + Name 78 "g_tTex1df4a" + Name 79 "g_tTex1df4" + Name 82 "g_tTex1di4" + Name 85 "g_tTex1du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 Decorate 36(g_tTex2di4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0 MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 77(g_tTex1df4a) DescriptorSet 0 - Decorate 77(g_tTex1df4a) Binding 1 - Decorate 78(g_tTex1df4) DescriptorSet 0 - Decorate 78(g_tTex1df4) Binding 0 - Decorate 81(g_tTex1di4) DescriptorSet 0 - Decorate 84(g_tTex1du4) DescriptorSet 0 + MemberDecorate 71(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 73(@entryPointOutput) Location 0 + Decorate 78(g_tTex1df4a) DescriptorSet 0 + Decorate 78(g_tTex1df4a) Binding 1 + Decorate 79(g_tTex1df4) DescriptorSet 0 + Decorate 79(g_tTex1df4) Binding 0 + Decorate 82(g_tTex1di4) DescriptorSet 0 + Decorate 85(g_tTex1du4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -251,18 +256,19 @@ gl_FragCoord origin is upper left 66: 6(float) Constant 1065353216 67: 7(fvec4) ConstantComposite 66 66 66 66 69: TypePointer Function 6(float) - 71: TypePointer Output 63(PS_OUTPUT) -72(@entryPointOutput): 71(ptr) Variable Output - 75: TypeImage 6(float) 1D array sampled format:Unknown - 76: TypePointer UniformConstant 75 - 77(g_tTex1df4a): 76(ptr) Variable UniformConstant - 78(g_tTex1df4): 76(ptr) Variable UniformConstant - 79: TypeImage 25(int) 1D array sampled format:Unknown - 80: TypePointer UniformConstant 79 - 81(g_tTex1di4): 80(ptr) Variable UniformConstant - 82: TypeImage 45(int) 1D array sampled format:Unknown - 83: TypePointer UniformConstant 82 - 84(g_tTex1du4): 83(ptr) Variable UniformConstant + 71(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 72: TypePointer Output 71(PS_OUTPUT) +73(@entryPointOutput): 72(ptr) Variable Output + 76: TypeImage 6(float) 1D array sampled format:Unknown + 77: TypePointer UniformConstant 76 + 78(g_tTex1df4a): 77(ptr) Variable UniformConstant + 79(g_tTex1df4): 77(ptr) Variable UniformConstant + 80: TypeImage 25(int) 1D array sampled format:Unknown + 81: TypePointer UniformConstant 80 + 82(g_tTex1di4): 81(ptr) Variable UniformConstant + 83: TypeImage 45(int) 1D array sampled format:Unknown + 84: TypePointer UniformConstant 83 + 85(g_tTex1du4): 84(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function @@ -288,7 +294,7 @@ gl_FragCoord origin is upper left Store 68 67 70: 69(ptr) AccessChain 65(psout) 27 Store 70 66 - 73:63(PS_OUTPUT) Load 65(psout) - Store 72(@entryPointOutput) 73 + 74:63(PS_OUTPUT) Load 65(psout) + Store 73(@entryPointOutput) 74 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index ac59887b..c2ccd50d 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -264,7 +264,7 @@ gl_FragCoord origin is upper left 0:68 1.000000 0:70 Sequence 0:70 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -553,7 +553,7 @@ gl_FragCoord origin is upper left 0:68 1.000000 0:70 Sequence 0:70 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -575,14 +575,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 222 +// Id's are bound by 223 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 204 + EntryPoint Fragment 4 "main" 205 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval00" @@ -622,13 +622,16 @@ gl_FragCoord origin is upper left MemberName 195(PS_OUTPUT) 0 "Color" MemberName 195(PS_OUTPUT) 1 "Depth" Name 197 "psout" - Name 204 "@entryPointOutput" - Name 207 "g_sSamp2d" - Name 210 "g_tTex1df4a" - Name 213 "g_tTex1di4a" - Name 216 "g_tTex1du4a" - Name 218 "c1" - Name 221 "c2" + Name 203 "PS_OUTPUT" + MemberName 203(PS_OUTPUT) 0 "Color" + MemberName 203(PS_OUTPUT) 1 "Depth" + Name 205 "@entryPointOutput" + Name 208 "g_sSamp2d" + Name 211 "g_tTex1df4a" + Name 214 "g_tTex1di4a" + Name 217 "g_tTex1du4a" + Name 219 "c1" + Name 222 "c2" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -638,11 +641,13 @@ gl_FragCoord origin is upper left Decorate 124(g_tTexcdi4a) DescriptorSet 0 Decorate 134(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 195(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 207(g_sSamp2d) DescriptorSet 0 - Decorate 210(g_tTex1df4a) DescriptorSet 0 - Decorate 210(g_tTex1df4a) Binding 0 - Decorate 213(g_tTex1di4a) DescriptorSet 0 - Decorate 216(g_tTex1du4a) DescriptorSet 0 + MemberDecorate 203(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 205(@entryPointOutput) Location 0 + Decorate 208(g_sSamp2d) DescriptorSet 0 + Decorate 211(g_tTex1df4a) DescriptorSet 0 + Decorate 211(g_tTex1df4a) Binding 0 + Decorate 214(g_tTex1di4a) DescriptorSet 0 + Decorate 217(g_tTex1du4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -695,23 +700,24 @@ gl_FragCoord origin is upper left 198: 6(float) Constant 1065353216 199: 7(fvec4) ConstantComposite 198 198 198 198 201: TypePointer Function 6(float) - 203: TypePointer Output 195(PS_OUTPUT) -204(@entryPointOutput): 203(ptr) Variable Output - 207(g_sSamp2d): 15(ptr) Variable UniformConstant - 208: TypeImage 6(float) 1D array sampled format:Unknown - 209: TypePointer UniformConstant 208 -210(g_tTex1df4a): 209(ptr) Variable UniformConstant - 211: TypeImage 24(int) 1D array sampled format:Unknown - 212: TypePointer UniformConstant 211 -213(g_tTex1di4a): 212(ptr) Variable UniformConstant - 214: TypeImage 39(int) 1D array sampled format:Unknown - 215: TypePointer UniformConstant 214 -216(g_tTex1du4a): 215(ptr) Variable UniformConstant - 217: TypePointer UniformConstant 6(float) - 218(c1): 217(ptr) Variable UniformConstant - 219: TypeVector 6(float) 2 - 220: TypePointer UniformConstant 219(fvec2) - 221(c2): 220(ptr) Variable UniformConstant + 203(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 204: TypePointer Output 203(PS_OUTPUT) +205(@entryPointOutput): 204(ptr) Variable Output + 208(g_sSamp2d): 15(ptr) Variable UniformConstant + 209: TypeImage 6(float) 1D array sampled format:Unknown + 210: TypePointer UniformConstant 209 +211(g_tTex1df4a): 210(ptr) Variable UniformConstant + 212: TypeImage 24(int) 1D array sampled format:Unknown + 213: TypePointer UniformConstant 212 +214(g_tTex1di4a): 213(ptr) Variable UniformConstant + 215: TypeImage 39(int) 1D array sampled format:Unknown + 216: TypePointer UniformConstant 215 +217(g_tTex1du4a): 216(ptr) Variable UniformConstant + 218: TypePointer UniformConstant 6(float) + 219(c1): 218(ptr) Variable UniformConstant + 220: TypeVector 6(float) 2 + 221: TypePointer UniformConstant 220(fvec2) + 222(c2): 221(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval00): 8(ptr) Variable Function @@ -887,7 +893,7 @@ gl_FragCoord origin is upper left Store 200 199 202: 201(ptr) AccessChain 197(psout) 57 Store 202 198 - 205:195(PS_OUTPUT) Load 197(psout) - Store 204(@entryPointOutput) 205 + 206:195(PS_OUTPUT) Load 197(psout) + Store 205(@entryPointOutput) 206 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 63c9946d..8be5ba60 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -264,7 +264,7 @@ gl_FragCoord origin is upper left 0:74 1.000000 0:76 Sequence 0:76 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 Branch: Return 0:? Linker Objects @@ -557,7 +557,7 @@ gl_FragCoord origin is upper left 0:74 1.000000 0:76 Sequence 0:76 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 Branch: Return 0:? Linker Objects @@ -583,13 +583,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 232 +// Id's are bound by 233 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 205 + EntryPoint Fragment 4 "main" 206 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval00" @@ -629,17 +629,20 @@ gl_FragCoord origin is upper left MemberName 196(PS_OUTPUT) 0 "Color" MemberName 196(PS_OUTPUT) 1 "Depth" Name 198 "psout" - Name 205 "@entryPointOutput" - Name 208 "g_sSamp2d" - Name 211 "g_tTex1df4a" - Name 212 "g_tTex1df4" - Name 215 "g_tTex1di4" - Name 218 "g_tTex1du4" - Name 221 "g_tTex3df4" - Name 224 "g_tTex3di4" - Name 227 "g_tTex3du4" - Name 229 "c1" - Name 231 "c4" + Name 204 "PS_OUTPUT" + MemberName 204(PS_OUTPUT) 0 "Color" + MemberName 204(PS_OUTPUT) 1 "Depth" + Name 206 "@entryPointOutput" + Name 209 "g_sSamp2d" + Name 212 "g_tTex1df4a" + Name 213 "g_tTex1df4" + Name 216 "g_tTex1di4" + Name 219 "g_tTex1du4" + Name 222 "g_tTex3df4" + Name 225 "g_tTex3di4" + Name 228 "g_tTex3du4" + Name 230 "c1" + Name 232 "c4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -649,16 +652,18 @@ gl_FragCoord origin is upper left Decorate 125(g_tTexcdi4) DescriptorSet 0 Decorate 135(g_tTexcdu4) DescriptorSet 0 MemberDecorate 196(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 208(g_sSamp2d) DescriptorSet 0 - Decorate 211(g_tTex1df4a) DescriptorSet 0 - Decorate 211(g_tTex1df4a) Binding 1 - Decorate 212(g_tTex1df4) DescriptorSet 0 - Decorate 212(g_tTex1df4) Binding 0 - Decorate 215(g_tTex1di4) DescriptorSet 0 - Decorate 218(g_tTex1du4) DescriptorSet 0 - Decorate 221(g_tTex3df4) DescriptorSet 0 - Decorate 224(g_tTex3di4) DescriptorSet 0 - Decorate 227(g_tTex3du4) DescriptorSet 0 + MemberDecorate 204(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 206(@entryPointOutput) Location 0 + Decorate 209(g_sSamp2d) DescriptorSet 0 + Decorate 212(g_tTex1df4a) DescriptorSet 0 + Decorate 212(g_tTex1df4a) Binding 1 + Decorate 213(g_tTex1df4) DescriptorSet 0 + Decorate 213(g_tTex1df4) Binding 0 + Decorate 216(g_tTex1di4) DescriptorSet 0 + Decorate 219(g_tTex1du4) DescriptorSet 0 + Decorate 222(g_tTex3df4) DescriptorSet 0 + Decorate 225(g_tTex3di4) DescriptorSet 0 + Decorate 228(g_tTex3du4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -712,32 +717,33 @@ gl_FragCoord origin is upper left 199: 6(float) Constant 1065353216 200: 7(fvec4) ConstantComposite 199 199 199 199 202: TypePointer Function 6(float) - 204: TypePointer Output 196(PS_OUTPUT) -205(@entryPointOutput): 204(ptr) Variable Output - 208(g_sSamp2d): 15(ptr) Variable UniformConstant - 209: TypeImage 6(float) 1D sampled format:Unknown - 210: TypePointer UniformConstant 209 -211(g_tTex1df4a): 210(ptr) Variable UniformConstant - 212(g_tTex1df4): 210(ptr) Variable UniformConstant - 213: TypeImage 24(int) 1D sampled format:Unknown - 214: TypePointer UniformConstant 213 - 215(g_tTex1di4): 214(ptr) Variable UniformConstant - 216: TypeImage 39(int) 1D sampled format:Unknown - 217: TypePointer UniformConstant 216 - 218(g_tTex1du4): 217(ptr) Variable UniformConstant - 219: TypeImage 6(float) 3D sampled format:Unknown - 220: TypePointer UniformConstant 219 - 221(g_tTex3df4): 220(ptr) Variable UniformConstant - 222: TypeImage 24(int) 3D sampled format:Unknown - 223: TypePointer UniformConstant 222 - 224(g_tTex3di4): 223(ptr) Variable UniformConstant - 225: TypeImage 39(int) 3D sampled format:Unknown - 226: TypePointer UniformConstant 225 - 227(g_tTex3du4): 226(ptr) Variable UniformConstant - 228: TypePointer UniformConstant 6(float) - 229(c1): 228(ptr) Variable UniformConstant - 230: TypePointer UniformConstant 7(fvec4) - 231(c4): 230(ptr) Variable UniformConstant + 204(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 205: TypePointer Output 204(PS_OUTPUT) +206(@entryPointOutput): 205(ptr) Variable Output + 209(g_sSamp2d): 15(ptr) Variable UniformConstant + 210: TypeImage 6(float) 1D sampled format:Unknown + 211: TypePointer UniformConstant 210 +212(g_tTex1df4a): 211(ptr) Variable UniformConstant + 213(g_tTex1df4): 211(ptr) Variable UniformConstant + 214: TypeImage 24(int) 1D sampled format:Unknown + 215: TypePointer UniformConstant 214 + 216(g_tTex1di4): 215(ptr) Variable UniformConstant + 217: TypeImage 39(int) 1D sampled format:Unknown + 218: TypePointer UniformConstant 217 + 219(g_tTex1du4): 218(ptr) Variable UniformConstant + 220: TypeImage 6(float) 3D sampled format:Unknown + 221: TypePointer UniformConstant 220 + 222(g_tTex3df4): 221(ptr) Variable UniformConstant + 223: TypeImage 24(int) 3D sampled format:Unknown + 224: TypePointer UniformConstant 223 + 225(g_tTex3di4): 224(ptr) Variable UniformConstant + 226: TypeImage 39(int) 3D sampled format:Unknown + 227: TypePointer UniformConstant 226 + 228(g_tTex3du4): 227(ptr) Variable UniformConstant + 229: TypePointer UniformConstant 6(float) + 230(c1): 229(ptr) Variable UniformConstant + 231: TypePointer UniformConstant 7(fvec4) + 232(c4): 231(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval00): 8(ptr) Variable Function @@ -913,7 +919,7 @@ gl_FragCoord origin is upper left Store 201 200 203: 202(ptr) AccessChain 198(psout) 57 Store 203 199 - 206:196(PS_OUTPUT) Load 198(psout) - Store 205(@entryPointOutput) 206 + 207:196(PS_OUTPUT) Load 198(psout) + Store 206(@entryPointOutput) 207 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index 5df5248e..922d3493 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -336,7 +336,7 @@ gl_FragCoord origin is upper left 0:113 1.000000 0:115 Sequence 0:115 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 Branch: Return 0:? Linker Objects @@ -705,7 +705,7 @@ gl_FragCoord origin is upper left 0:113 1.000000 0:115 Sequence 0:115 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 Branch: Return 0:? Linker Objects @@ -735,14 +735,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 313 +// Id's are bound by 314 Capability Shader Capability ImageGatherExtended Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 267 + EntryPoint Fragment 4 "main" 268 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval001" @@ -779,43 +779,48 @@ gl_FragCoord origin is upper left MemberName 258(PS_OUTPUT) 0 "Color" MemberName 258(PS_OUTPUT) 1 "Depth" Name 260 "psout" - Name 267 "@entryPointOutput" - Name 270 "g_sSamp2d" - Name 273 "g_tTex1df4a" - Name 274 "g_tTex1df4" - Name 277 "g_tTex1di4" - Name 280 "g_tTex1du4" - Name 283 "g_tTex3df4" - Name 286 "g_tTex3di4" - Name 289 "g_tTex3du4" - Name 292 "g_tTexcdf4" - Name 295 "g_tTexcdi4" - Name 298 "g_tTexcdu4" - Name 300 "c1" - Name 303 "c3" - Name 305 "c4" - Name 307 "o1" - Name 310 "o3" - Name 312 "o4" + Name 266 "PS_OUTPUT" + MemberName 266(PS_OUTPUT) 0 "Color" + MemberName 266(PS_OUTPUT) 1 "Depth" + Name 268 "@entryPointOutput" + Name 271 "g_sSamp2d" + Name 274 "g_tTex1df4a" + Name 275 "g_tTex1df4" + Name 278 "g_tTex1di4" + Name 281 "g_tTex1du4" + Name 284 "g_tTex3df4" + Name 287 "g_tTex3di4" + Name 290 "g_tTex3du4" + Name 293 "g_tTexcdf4" + Name 296 "g_tTexcdi4" + Name 299 "g_tTexcdu4" + Name 301 "c1" + Name 304 "c3" + Name 306 "c4" + Name 308 "o1" + Name 311 "o3" + Name 313 "o4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 Decorate 36(g_tTex2di4) DescriptorSet 0 Decorate 50(g_tTex2du4) DescriptorSet 0 MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 270(g_sSamp2d) DescriptorSet 0 - Decorate 273(g_tTex1df4a) DescriptorSet 0 - Decorate 273(g_tTex1df4a) Binding 1 - Decorate 274(g_tTex1df4) DescriptorSet 0 - Decorate 274(g_tTex1df4) Binding 0 - Decorate 277(g_tTex1di4) DescriptorSet 0 - Decorate 280(g_tTex1du4) DescriptorSet 0 - Decorate 283(g_tTex3df4) DescriptorSet 0 - Decorate 286(g_tTex3di4) DescriptorSet 0 - Decorate 289(g_tTex3du4) DescriptorSet 0 - Decorate 292(g_tTexcdf4) DescriptorSet 0 - Decorate 295(g_tTexcdi4) DescriptorSet 0 - Decorate 298(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 266(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 268(@entryPointOutput) Location 0 + Decorate 271(g_sSamp2d) DescriptorSet 0 + Decorate 274(g_tTex1df4a) DescriptorSet 0 + Decorate 274(g_tTex1df4a) Binding 1 + Decorate 275(g_tTex1df4) DescriptorSet 0 + Decorate 275(g_tTex1df4) Binding 0 + Decorate 278(g_tTex1di4) DescriptorSet 0 + Decorate 281(g_tTex1du4) DescriptorSet 0 + Decorate 284(g_tTex3df4) DescriptorSet 0 + Decorate 287(g_tTex3di4) DescriptorSet 0 + Decorate 290(g_tTex3du4) DescriptorSet 0 + Decorate 293(g_tTexcdf4) DescriptorSet 0 + Decorate 296(g_tTexcdi4) DescriptorSet 0 + Decorate 299(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -859,51 +864,52 @@ gl_FragCoord origin is upper left 261: 6(float) Constant 1065353216 262: 7(fvec4) ConstantComposite 261 261 261 261 264: TypePointer Function 6(float) - 266: TypePointer Output 258(PS_OUTPUT) -267(@entryPointOutput): 266(ptr) Variable Output - 270(g_sSamp2d): 15(ptr) Variable UniformConstant - 271: TypeImage 6(float) 1D sampled format:Unknown - 272: TypePointer UniformConstant 271 -273(g_tTex1df4a): 272(ptr) Variable UniformConstant - 274(g_tTex1df4): 272(ptr) Variable UniformConstant - 275: TypeImage 24(int) 1D sampled format:Unknown - 276: TypePointer UniformConstant 275 - 277(g_tTex1di4): 276(ptr) Variable UniformConstant - 278: TypeImage 44(int) 1D sampled format:Unknown - 279: TypePointer UniformConstant 278 - 280(g_tTex1du4): 279(ptr) Variable UniformConstant - 281: TypeImage 6(float) 3D sampled format:Unknown - 282: TypePointer UniformConstant 281 - 283(g_tTex3df4): 282(ptr) Variable UniformConstant - 284: TypeImage 24(int) 3D sampled format:Unknown - 285: TypePointer UniformConstant 284 - 286(g_tTex3di4): 285(ptr) Variable UniformConstant - 287: TypeImage 44(int) 3D sampled format:Unknown - 288: TypePointer UniformConstant 287 - 289(g_tTex3du4): 288(ptr) Variable UniformConstant - 290: TypeImage 6(float) Cube sampled format:Unknown - 291: TypePointer UniformConstant 290 - 292(g_tTexcdf4): 291(ptr) Variable UniformConstant - 293: TypeImage 24(int) Cube sampled format:Unknown - 294: TypePointer UniformConstant 293 - 295(g_tTexcdi4): 294(ptr) Variable UniformConstant - 296: TypeImage 44(int) Cube sampled format:Unknown - 297: TypePointer UniformConstant 296 - 298(g_tTexcdu4): 297(ptr) Variable UniformConstant - 299: TypePointer UniformConstant 6(float) - 300(c1): 299(ptr) Variable UniformConstant - 301: TypeVector 6(float) 3 - 302: TypePointer UniformConstant 301(fvec3) - 303(c3): 302(ptr) Variable UniformConstant - 304: TypePointer UniformConstant 7(fvec4) - 305(c4): 304(ptr) Variable UniformConstant - 306: TypePointer UniformConstant 24(int) - 307(o1): 306(ptr) Variable UniformConstant - 308: TypeVector 24(int) 3 - 309: TypePointer UniformConstant 308(ivec3) - 310(o3): 309(ptr) Variable UniformConstant - 311: TypePointer UniformConstant 31(ivec4) - 312(o4): 311(ptr) Variable UniformConstant + 266(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 267: TypePointer Output 266(PS_OUTPUT) +268(@entryPointOutput): 267(ptr) Variable Output + 271(g_sSamp2d): 15(ptr) Variable UniformConstant + 272: TypeImage 6(float) 1D sampled format:Unknown + 273: TypePointer UniformConstant 272 +274(g_tTex1df4a): 273(ptr) Variable UniformConstant + 275(g_tTex1df4): 273(ptr) Variable UniformConstant + 276: TypeImage 24(int) 1D sampled format:Unknown + 277: TypePointer UniformConstant 276 + 278(g_tTex1di4): 277(ptr) Variable UniformConstant + 279: TypeImage 44(int) 1D sampled format:Unknown + 280: TypePointer UniformConstant 279 + 281(g_tTex1du4): 280(ptr) Variable UniformConstant + 282: TypeImage 6(float) 3D sampled format:Unknown + 283: TypePointer UniformConstant 282 + 284(g_tTex3df4): 283(ptr) Variable UniformConstant + 285: TypeImage 24(int) 3D sampled format:Unknown + 286: TypePointer UniformConstant 285 + 287(g_tTex3di4): 286(ptr) Variable UniformConstant + 288: TypeImage 44(int) 3D sampled format:Unknown + 289: TypePointer UniformConstant 288 + 290(g_tTex3du4): 289(ptr) Variable UniformConstant + 291: TypeImage 6(float) Cube sampled format:Unknown + 292: TypePointer UniformConstant 291 + 293(g_tTexcdf4): 292(ptr) Variable UniformConstant + 294: TypeImage 24(int) Cube sampled format:Unknown + 295: TypePointer UniformConstant 294 + 296(g_tTexcdi4): 295(ptr) Variable UniformConstant + 297: TypeImage 44(int) Cube sampled format:Unknown + 298: TypePointer UniformConstant 297 + 299(g_tTexcdu4): 298(ptr) Variable UniformConstant + 300: TypePointer UniformConstant 6(float) + 301(c1): 300(ptr) Variable UniformConstant + 302: TypeVector 6(float) 3 + 303: TypePointer UniformConstant 302(fvec3) + 304(c3): 303(ptr) Variable UniformConstant + 305: TypePointer UniformConstant 7(fvec4) + 306(c4): 305(ptr) Variable UniformConstant + 307: TypePointer UniformConstant 24(int) + 308(o1): 307(ptr) Variable UniformConstant + 309: TypeVector 24(int) 3 + 310: TypePointer UniformConstant 309(ivec3) + 311(o3): 310(ptr) Variable UniformConstant + 312: TypePointer UniformConstant 31(ivec4) + 313(o4): 312(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval001): 8(ptr) Variable Function @@ -1151,7 +1157,7 @@ gl_FragCoord origin is upper left Store 263 262 265: 264(ptr) AccessChain 260(psout) 99 Store 265 261 - 268:258(PS_OUTPUT) Load 260(psout) - Store 267(@entryPointOutput) 268 + 269:258(PS_OUTPUT) Load 260(psout) + Store 268(@entryPointOutput) 269 Return FunctionEnd diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 5838f08a..76546757 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -336,7 +336,7 @@ gl_FragCoord origin is upper left 0:107 1.000000 0:109 Sequence 0:109 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 Branch: Return 0:? Linker Objects @@ -701,7 +701,7 @@ gl_FragCoord origin is upper left 0:107 1.000000 0:109 Sequence 0:109 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 Branch: Return 0:? Linker Objects @@ -727,7 +727,7 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 303 +// Id's are bound by 304 Capability Shader Capability ImageGatherExtended @@ -735,7 +735,7 @@ gl_FragCoord origin is upper left Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 267 + EntryPoint Fragment 4 "main" 268 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval001" @@ -772,34 +772,39 @@ gl_FragCoord origin is upper left MemberName 258(PS_OUTPUT) 0 "Color" MemberName 258(PS_OUTPUT) 1 "Depth" Name 260 "psout" - Name 267 "@entryPointOutput" - Name 270 "g_sSamp2d" - Name 273 "g_tTex1df4a" - Name 276 "g_tTex1di4a" - Name 279 "g_tTex1du4a" - Name 282 "g_tTexcdf4a" - Name 285 "g_tTexcdi4a" - Name 288 "g_tTexcdu4a" - Name 290 "c1" - Name 293 "c2" - Name 295 "c4" - Name 297 "o1" - Name 300 "o3" - Name 302 "o4" + Name 266 "PS_OUTPUT" + MemberName 266(PS_OUTPUT) 0 "Color" + MemberName 266(PS_OUTPUT) 1 "Depth" + Name 268 "@entryPointOutput" + Name 271 "g_sSamp2d" + Name 274 "g_tTex1df4a" + Name 277 "g_tTex1di4a" + Name 280 "g_tTex1du4a" + Name 283 "g_tTexcdf4a" + Name 286 "g_tTexcdi4a" + Name 289 "g_tTexcdu4a" + Name 291 "c1" + Name 294 "c2" + Name 296 "c4" + Name 298 "o1" + Name 301 "o3" + Name 303 "o4" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 Decorate 36(g_tTex2di4a) DescriptorSet 0 Decorate 50(g_tTex2du4a) DescriptorSet 0 MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 270(g_sSamp2d) DescriptorSet 0 - Decorate 273(g_tTex1df4a) DescriptorSet 0 - Decorate 273(g_tTex1df4a) Binding 0 - Decorate 276(g_tTex1di4a) DescriptorSet 0 - Decorate 279(g_tTex1du4a) DescriptorSet 0 - Decorate 282(g_tTexcdf4a) DescriptorSet 0 - Decorate 285(g_tTexcdi4a) DescriptorSet 0 - Decorate 288(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 266(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 268(@entryPointOutput) Location 0 + Decorate 271(g_sSamp2d) DescriptorSet 0 + Decorate 274(g_tTex1df4a) DescriptorSet 0 + Decorate 274(g_tTex1df4a) Binding 0 + Decorate 277(g_tTex1di4a) DescriptorSet 0 + Decorate 280(g_tTex1du4a) DescriptorSet 0 + Decorate 283(g_tTexcdf4a) DescriptorSet 0 + Decorate 286(g_tTexcdi4a) DescriptorSet 0 + Decorate 289(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -843,41 +848,42 @@ gl_FragCoord origin is upper left 261: 6(float) Constant 1065353216 262: 7(fvec4) ConstantComposite 261 261 261 261 264: TypePointer Function 6(float) - 266: TypePointer Output 258(PS_OUTPUT) -267(@entryPointOutput): 266(ptr) Variable Output - 270(g_sSamp2d): 15(ptr) Variable UniformConstant - 271: TypeImage 6(float) 1D array sampled format:Unknown - 272: TypePointer UniformConstant 271 -273(g_tTex1df4a): 272(ptr) Variable UniformConstant - 274: TypeImage 24(int) 1D array sampled format:Unknown - 275: TypePointer UniformConstant 274 -276(g_tTex1di4a): 275(ptr) Variable UniformConstant - 277: TypeImage 44(int) 1D array sampled format:Unknown - 278: TypePointer UniformConstant 277 -279(g_tTex1du4a): 278(ptr) Variable UniformConstant - 280: TypeImage 6(float) Cube array sampled format:Unknown - 281: TypePointer UniformConstant 280 -282(g_tTexcdf4a): 281(ptr) Variable UniformConstant - 283: TypeImage 24(int) Cube array sampled format:Unknown - 284: TypePointer UniformConstant 283 -285(g_tTexcdi4a): 284(ptr) Variable UniformConstant - 286: TypeImage 44(int) Cube array sampled format:Unknown - 287: TypePointer UniformConstant 286 -288(g_tTexcdu4a): 287(ptr) Variable UniformConstant - 289: TypePointer UniformConstant 6(float) - 290(c1): 289(ptr) Variable UniformConstant - 291: TypeVector 6(float) 2 - 292: TypePointer UniformConstant 291(fvec2) - 293(c2): 292(ptr) Variable UniformConstant - 294: TypePointer UniformConstant 7(fvec4) - 295(c4): 294(ptr) Variable UniformConstant - 296: TypePointer UniformConstant 24(int) - 297(o1): 296(ptr) Variable UniformConstant - 298: TypeVector 24(int) 3 - 299: TypePointer UniformConstant 298(ivec3) - 300(o3): 299(ptr) Variable UniformConstant - 301: TypePointer UniformConstant 31(ivec4) - 302(o4): 301(ptr) Variable UniformConstant + 266(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 267: TypePointer Output 266(PS_OUTPUT) +268(@entryPointOutput): 267(ptr) Variable Output + 271(g_sSamp2d): 15(ptr) Variable UniformConstant + 272: TypeImage 6(float) 1D array sampled format:Unknown + 273: TypePointer UniformConstant 272 +274(g_tTex1df4a): 273(ptr) Variable UniformConstant + 275: TypeImage 24(int) 1D array sampled format:Unknown + 276: TypePointer UniformConstant 275 +277(g_tTex1di4a): 276(ptr) Variable UniformConstant + 278: TypeImage 44(int) 1D array sampled format:Unknown + 279: TypePointer UniformConstant 278 +280(g_tTex1du4a): 279(ptr) Variable UniformConstant + 281: TypeImage 6(float) Cube array sampled format:Unknown + 282: TypePointer UniformConstant 281 +283(g_tTexcdf4a): 282(ptr) Variable UniformConstant + 284: TypeImage 24(int) Cube array sampled format:Unknown + 285: TypePointer UniformConstant 284 +286(g_tTexcdi4a): 285(ptr) Variable UniformConstant + 287: TypeImage 44(int) Cube array sampled format:Unknown + 288: TypePointer UniformConstant 287 +289(g_tTexcdu4a): 288(ptr) Variable UniformConstant + 290: TypePointer UniformConstant 6(float) + 291(c1): 290(ptr) Variable UniformConstant + 292: TypeVector 6(float) 2 + 293: TypePointer UniformConstant 292(fvec2) + 294(c2): 293(ptr) Variable UniformConstant + 295: TypePointer UniformConstant 7(fvec4) + 296(c4): 295(ptr) Variable UniformConstant + 297: TypePointer UniformConstant 24(int) + 298(o1): 297(ptr) Variable UniformConstant + 299: TypeVector 24(int) 3 + 300: TypePointer UniformConstant 299(ivec3) + 301(o3): 300(ptr) Variable UniformConstant + 302: TypePointer UniformConstant 31(ivec4) + 303(o4): 302(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval001): 8(ptr) Variable Function @@ -1125,7 +1131,7 @@ gl_FragCoord origin is upper left Store 263 262 265: 264(ptr) AccessChain 260(psout) 99 Store 265 261 - 268:258(PS_OUTPUT) Load 260(psout) - Store 267(@entryPointOutput) 268 + 269:258(PS_OUTPUT) Load 260(psout) + Store 268(@entryPointOutput) 269 Return FunctionEnd diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index a3eba63c..1dd69fd0 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1062,7 +1062,7 @@ gl_FragCoord origin is upper left 0:277 1.000000 0:279 Sequence 0:279 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 Branch: Return 0:? Linker Objects @@ -2162,7 +2162,7 @@ gl_FragCoord origin is upper left 0:277 1.000000 0:279 Sequence 0:279 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 Branch: Return 0:? Linker Objects @@ -2197,7 +2197,7 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 540 +// Id's are bound by 541 Capability Shader Capability Sampled1D @@ -2206,7 +2206,7 @@ gl_FragCoord origin is upper left Capability ImageQuery 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 534 + EntryPoint Fragment 4 "main" 535 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "sizeQueryTemp" @@ -2294,8 +2294,11 @@ gl_FragCoord origin is upper left MemberName 522(PS_OUTPUT) 0 "Color" MemberName 522(PS_OUTPUT) 1 "Depth" Name 524 "psout" - Name 534 "@entryPointOutput" - Name 539 "g_sSamp" + Name 533 "PS_OUTPUT" + MemberName 533(PS_OUTPUT) 0 "Color" + MemberName 533(PS_OUTPUT) 1 "Depth" + Name 535 "@entryPointOutput" + Name 540 "g_sSamp" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 @@ -2325,8 +2328,10 @@ gl_FragCoord origin is upper left Decorate 496(g_tTex2dmsi4a) DescriptorSet 0 Decorate 510(g_tTex2dmsu4a) DescriptorSet 0 MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 539(g_sSamp) DescriptorSet 0 - Decorate 539(g_sSamp) Binding 0 + MemberDecorate 533(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 535(@entryPointOutput) Location 0 + Decorate 540(g_sSamp) DescriptorSet 0 + Decorate 540(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 @@ -2433,11 +2438,12 @@ gl_FragCoord origin is upper left 528: TypePointer Function 521(fvec4) 530: 14(int) Constant 1 531: TypePointer Function 9(float) - 533: TypePointer Output 522(PS_OUTPUT) -534(@entryPointOutput): 533(ptr) Variable Output - 537: TypeSampler - 538: TypePointer UniformConstant 537 - 539(g_sSamp): 538(ptr) Variable UniformConstant + 533(PS_OUTPUT): TypeStruct 521(fvec4) 9(float) + 534: TypePointer Output 533(PS_OUTPUT) +535(@entryPointOutput): 534(ptr) Variable Output + 538: TypeSampler + 539: TypePointer UniformConstant 538 + 540(g_sSamp): 539(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(sizeQueryTemp): 7(ptr) Variable Function @@ -3051,7 +3057,7 @@ gl_FragCoord origin is upper left Store 529 527 532: 531(ptr) AccessChain 524(psout) 530 Store 532 526 - 535:522(PS_OUTPUT) Load 524(psout) - Store 534(@entryPointOutput) 535 + 536:522(PS_OUTPUT) Load 524(psout) + Store 535(@entryPointOutput) 536 Return FunctionEnd diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index 6ea1852e..34f23ee8 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -38,7 +38,7 @@ Shader version: 450 0:? 0.000000 0:26 Sequence 0:26 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:26 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:26 Branch: Return 0:? Linker Objects @@ -88,7 +88,7 @@ Shader version: 450 0:? 0.000000 0:26 Sequence 0:26 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:26 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:26 Branch: Return 0:? Linker Objects @@ -97,14 +97,14 @@ Shader version: 450 // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 42 +// Id's are bound by 43 Capability Shader Capability Sampled1D Capability ImageQuery 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 36 + EntryPoint Vertex 4 "main" 37 Name 4 "main" Name 8 "sizeQueryTemp" Name 12 "g_tTex1df4" @@ -114,13 +114,17 @@ Shader version: 450 Name 27 "VS_OUTPUT" MemberName 27(VS_OUTPUT) 0 "Pos" Name 29 "vsout" - Name 36 "@entryPointOutput" - Name 41 "g_sSamp" + Name 35 "VS_OUTPUT" + MemberName 35(VS_OUTPUT) 0 "Pos" + Name 37 "@entryPointOutput" + Name 42 "g_sSamp" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 MemberDecorate 27(VS_OUTPUT) 0 BuiltIn Position - Decorate 41(g_sSamp) DescriptorSet 0 - Decorate 41(g_sSamp) Binding 0 + MemberDecorate 35(VS_OUTPUT) 0 BuiltIn Position + Decorate 37(@entryPointOutput) Location 0 + Decorate 42(g_sSamp) DescriptorSet 0 + Decorate 42(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 @@ -138,11 +142,12 @@ Shader version: 450 31: 9(float) Constant 0 32: 26(fvec4) ConstantComposite 31 31 31 31 33: TypePointer Function 26(fvec4) - 35: TypePointer Output 27(VS_OUTPUT) -36(@entryPointOutput): 35(ptr) Variable Output - 39: TypeSampler - 40: TypePointer UniformConstant 39 - 41(g_sSamp): 40(ptr) Variable UniformConstant + 35(VS_OUTPUT): TypeStruct 26(fvec4) + 36: TypePointer Output 35(VS_OUTPUT) +37(@entryPointOutput): 36(ptr) Variable Output + 40: TypeSampler + 41: TypePointer UniformConstant 40 + 42(g_sSamp): 41(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(sizeQueryTemp): 7(ptr) Variable Function @@ -165,7 +170,7 @@ Shader version: 450 Store 23(NumberOfLevelsU) 25 34: 33(ptr) AccessChain 29(vsout) 30 Store 34 32 - 37:27(VS_OUTPUT) Load 29(vsout) - Store 36(@entryPointOutput) 37 + 38:27(VS_OUTPUT) Load 29(vsout) + Store 37(@entryPointOutput) 38 Return FunctionEnd diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index d120c315..c138707f 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -45,7 +45,7 @@ ERROR: node is still EOpNull! 0:20 1.000000 0:22 Sequence 0:22 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 Branch: Return 0:? Linker Objects @@ -98,7 +98,7 @@ ERROR: node is still EOpNull! 0:20 1.000000 0:22 Sequence 0:22 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 Branch: Return 0:? Linker Objects diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out index 10a50035..5c8f2176 100755 --- a/Test/baseResults/hlsl.if.frag.out +++ b/Test/baseResults/hlsl.if.frag.out @@ -14,7 +14,7 @@ gl_FragCoord origin is upper left 0:3 true case 0:4 Sequence 0:4 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:4 'input' (layout(location=0 ) in 4-component vector of float) 0:4 Branch: Return 0:6 Test condition and select (temp void) @@ -25,13 +25,13 @@ gl_FragCoord origin is upper left 0:6 true case 0:7 Sequence 0:7 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 Branch: Return 0:6 false case 0:9 Sequence 0:9 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:9 Negate value (temp 4-component vector of float) 0:9 'input' (layout(location=0 ) in 4-component vector of float) 0:9 Branch: Return @@ -56,7 +56,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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:20 'input' (layout(location=0 ) in 4-component vector of float) 0:20 Branch: Return 0:23 Test condition and select (temp void) @@ -68,14 +68,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:24 Sequence 0:24 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:24 'input' (layout(location=0 ) in 4-component vector of float) 0:24 Branch: Return 0:23 false case 0:? Sequence 0:26 Sequence 0:26 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:26 Negate value (temp 4-component vector of float) 0:26 'input' (layout(location=0 ) in 4-component vector of float) 0:26 Branch: Return @@ -113,7 +113,7 @@ gl_FragCoord origin is upper left 0:3 true case 0:4 Sequence 0:4 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:4 'input' (layout(location=0 ) in 4-component vector of float) 0:4 Branch: Return 0:6 Test condition and select (temp void) @@ -124,13 +124,13 @@ gl_FragCoord origin is upper left 0:6 true case 0:7 Sequence 0:7 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 Branch: Return 0:6 false case 0:9 Sequence 0:9 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:9 Negate value (temp 4-component vector of float) 0:9 'input' (layout(location=0 ) in 4-component vector of float) 0:9 Branch: Return @@ -155,7 +155,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:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:20 'input' (layout(location=0 ) in 4-component vector of float) 0:20 Branch: Return 0:23 Test condition and select (temp void) @@ -167,14 +167,14 @@ gl_FragCoord origin is upper left 0:? Sequence 0:24 Sequence 0:24 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:24 'input' (layout(location=0 ) in 4-component vector of float) 0:24 Branch: Return 0:23 false case 0:? Sequence 0:26 Sequence 0:26 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:26 Negate value (temp 4-component vector of float) 0:26 'input' (layout(location=0 ) in 4-component vector of float) 0:26 Branch: Return @@ -208,6 +208,7 @@ gl_FragCoord origin is upper left Name 67 "ii" Name 80 "ii" Decorate 9(input) Location 0 + Decorate 19(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out index 1323a166..61a63a41 100755 --- a/Test/baseResults/hlsl.init.frag.out +++ b/Test/baseResults/hlsl.init.frag.out @@ -126,7 +126,7 @@ gl_FragCoord origin is upper left 0:33 'a5' (global float) 0:35 Sequence 0:35 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:35 component-wise multiply (temp 4-component vector of float) 0:35 'input' (layout(location=0 ) in 4-component vector of float) 0:35 'a1' (global 4-component vector of float) @@ -282,7 +282,7 @@ gl_FragCoord origin is upper left 0:33 'a5' (global float) 0:35 Sequence 0:35 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:35 component-wise multiply (temp 4-component vector of float) 0:35 'input' (layout(location=0 ) in 4-component vector of float) 0:35 'a1' (global 4-component vector of float) @@ -357,6 +357,7 @@ gl_FragCoord origin is upper left Name 90 "input" Name 95 "c4" Name 96 "b5" + Decorate 88(@entryPointOutput) Location 0 Decorate 90(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index 03ce8b5d..f56ca2c4 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -45,7 +45,7 @@ gl_FragCoord origin is upper left 0:30 1.000000 0:31 Sequence 0:31 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:31 'ps_output' (temp structure{temp 4-component vector of float color}) 0:31 Branch: Return 0:? Linker Objects @@ -100,19 +100,19 @@ gl_FragCoord origin is upper left 0:30 1.000000 0:31 Sequence 0:31 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:31 'ps_output' (temp structure{temp 4-component vector of float color}) 0:31 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 46 +// Id's are bound by 47 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 43 + EntryPoint Fragment 4 "main" 44 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 6 "Test1(" @@ -129,7 +129,10 @@ gl_FragCoord origin is upper left Name 34 "PS_OUTPUT" MemberName 34(PS_OUTPUT) 0 "color" Name 36 "ps_output" - Name 43 "@entryPointOutput" + Name 42 "PS_OUTPUT" + MemberName 42(PS_OUTPUT) 0 "color" + Name 44 "@entryPointOutput" + Decorate 44(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 8: TypeFloat 32 @@ -159,16 +162,17 @@ gl_FragCoord origin is upper left 38: 37(int) Constant 0 39: 33(fvec4) ConstantComposite 13 13 13 13 40: TypePointer Function 33(fvec4) - 42: TypePointer Output 34(PS_OUTPUT) -43(@entryPointOutput): 42(ptr) Variable Output + 42(PS_OUTPUT): TypeStruct 33(fvec4) + 43: TypePointer Output 42(PS_OUTPUT) +44(@entryPointOutput): 43(ptr) Variable Output 4(main): 2 Function None 3 5: Label 36(ps_output): 35(ptr) Variable Function 32: 2 FunctionCall 6(Test1() 41: 40(ptr) AccessChain 36(ps_output) 38 Store 41 39 - 44:34(PS_OUTPUT) Load 36(ps_output) - Store 43(@entryPointOutput) 44 + 45:34(PS_OUTPUT) Load 36(ps_output) + Store 44(@entryPointOutput) 45 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 044943da..6ba87928 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -57,7 +57,7 @@ gl_FragCoord origin is upper left 0:22 3 (const int) 0:24 Sequence 0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects @@ -124,19 +124,19 @@ gl_FragCoord origin is upper left 0:22 3 (const int) 0:24 Sequence 0:24 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 56 +// Id's are bound by 57 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 45 53 + EntryPoint Fragment 4 "main" 45 54 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 12 "MyFunc(f1;f1;f1;" @@ -154,10 +154,15 @@ gl_FragCoord origin is upper left MemberName 31(PS_OUTPUT) 1 "Depth" Name 33 "psout" Name 45 "inpos" - Name 53 "@entryPointOutput" + Name 52 "PS_OUTPUT" + MemberName 52(PS_OUTPUT) 0 "Color" + MemberName 52(PS_OUTPUT) 1 "Depth" + Name 54 "@entryPointOutput" MemberDecorate 31(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 45(inpos) NoPerspective Decorate 45(inpos) BuiltIn FragCoord + MemberDecorate 52(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 54(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -179,8 +184,9 @@ gl_FragCoord origin is upper left 46: TypeInt 32 0 47: 46(int) Constant 3 48: TypePointer Input 6(float) - 52: TypePointer Output 31(PS_OUTPUT) -53(@entryPointOutput): 52(ptr) Variable Output + 52(PS_OUTPUT): TypeStruct 30(fvec4) 6(float) + 53: TypePointer Output 52(PS_OUTPUT) +54(@entryPointOutput): 53(ptr) Variable Output 4(main): 2 Function None 3 5: Label 17(x): 7(ptr) Variable Function @@ -211,8 +217,8 @@ gl_FragCoord origin is upper left 50: 6(float) Load 49 51: 7(ptr) AccessChain 33(psout) 43 Store 51 50 - 54:31(PS_OUTPUT) Load 33(psout) - Store 53(@entryPointOutput) 54 + 55:31(PS_OUTPUT) Load 33(psout) + Store 54(@entryPointOutput) 55 Return FunctionEnd 12(MyFunc(f1;f1;f1;): 2 Function None 8 diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out index ab697685..9178ddcd 100644 --- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out +++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out @@ -13,7 +13,7 @@ local_size = (1, 1, 1) 0:9 WorkgroupMemoryBarrierWithGroupSync (global void) 0:11 Sequence 0:11 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:11 Constant: 0:11 0.000000 0:11 Branch: Return @@ -37,7 +37,7 @@ local_size = (1, 1, 1) 0:9 WorkgroupMemoryBarrierWithGroupSync (global void) 0:11 Sequence 0:11 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:11 Constant: 0:11 0.000000 0:11 Branch: Return @@ -54,6 +54,7 @@ local_size = (1, 1, 1) ExecutionMode 4 LocalSize 1 1 1 Name 4 "ComputeShaderFunction" Name 14 "@entryPointOutput" + Decorate 14(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 diff --git a/Test/baseResults/hlsl.intrinsics.comp.out b/Test/baseResults/hlsl.intrinsics.comp.out index fd31c426..fa1d8343 100644 --- a/Test/baseResults/hlsl.intrinsics.comp.out +++ b/Test/baseResults/hlsl.intrinsics.comp.out @@ -301,7 +301,7 @@ local_size = (1, 1, 1) 0:125 'gs_ub4' (global 4-component vector of uint) 0:128 Sequence 0:128 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -628,7 +628,7 @@ local_size = (1, 1, 1) 0:125 'gs_ub4' (global 4-component vector of uint) 0:128 Sequence 0:128 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -700,6 +700,7 @@ local_size = (1, 1, 1) Name 193 "gs_uc4" Name 215 "@entryPointOutput" Decorate 175(inF0) Location 0 + Decorate 215(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.intrinsics.double.frag.out b/Test/baseResults/hlsl.intrinsics.double.frag.out index 6b1fb385..07317af4 100644 --- a/Test/baseResults/hlsl.intrinsics.double.frag.out +++ b/Test/baseResults/hlsl.intrinsics.double.frag.out @@ -9,9 +9,9 @@ gl_FragCoord origin is upper left 0:5 'inDV1c' (layout(location=2 ) in double) 0:5 'inDV2' (layout(location=3 ) in 2-component vector of double) 0:5 'inDV3' (layout(location=4 ) in 3-component vector of double) -0:5 'inDV4' (layout(location=5 ) in 4-component vector of double) -0:5 'inU1a' (layout(location=6 ) in uint) -0:5 'inU1b' (layout(location=7 ) in uint) +0:5 'inDV4' (layout(location=6 ) in 4-component vector of double) +0:5 'inU1a' (layout(location=8 ) in uint) +0:5 'inU1b' (layout(location=9 ) in uint) 0:? Sequence 0:6 Sequence 0:6 move second child to first child (temp double) @@ -25,11 +25,11 @@ gl_FragCoord origin is upper left 0:7 'r01' (temp double) 0:7 uint64BitsToDouble (temp double) 0:7 Construct uvec2 (temp 2-component vector of uint) -0:7 'inU1a' (layout(location=6 ) in uint) -0:7 'inU1b' (layout(location=7 ) in uint) +0:7 'inU1a' (layout(location=8 ) in uint) +0:7 'inU1b' (layout(location=9 ) in uint) 0:9 Sequence 0:9 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:9 Constant: 0:9 0.000000 0:9 Branch: Return @@ -49,9 +49,9 @@ gl_FragCoord origin is upper left 0:5 'inDV1c' (layout(location=2 ) in double) 0:5 'inDV2' (layout(location=3 ) in 2-component vector of double) 0:5 'inDV3' (layout(location=4 ) in 3-component vector of double) -0:5 'inDV4' (layout(location=5 ) in 4-component vector of double) -0:5 'inU1a' (layout(location=6 ) in uint) -0:5 'inU1b' (layout(location=7 ) in uint) +0:5 'inDV4' (layout(location=6 ) in 4-component vector of double) +0:5 'inU1a' (layout(location=8 ) in uint) +0:5 'inU1b' (layout(location=9 ) in uint) 0:? Sequence 0:6 Sequence 0:6 move second child to first child (temp double) @@ -65,11 +65,11 @@ gl_FragCoord origin is upper left 0:7 'r01' (temp double) 0:7 uint64BitsToDouble (temp double) 0:7 Construct uvec2 (temp 2-component vector of uint) -0:7 'inU1a' (layout(location=6 ) in uint) -0:7 'inU1b' (layout(location=7 ) in uint) +0:7 'inU1a' (layout(location=8 ) in uint) +0:7 'inU1b' (layout(location=9 ) in uint) 0:9 Sequence 0:9 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:9 Constant: 0:9 0.000000 0:9 Branch: Return @@ -97,8 +97,9 @@ gl_FragCoord origin is upper left Decorate 10(inDV1a) Location 0 Decorate 12(inDV1b) Location 1 Decorate 14(inDV1c) Location 2 - Decorate 20(inU1a) Location 6 - Decorate 22(inU1b) Location 7 + Decorate 20(inU1a) Location 8 + Decorate 22(inU1b) Location 9 + Decorate 29(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 64 diff --git a/Test/baseResults/hlsl.intrinsics.f1632.frag.out b/Test/baseResults/hlsl.intrinsics.f1632.frag.out index 65db73ab..9eefd5ff 100644 --- a/Test/baseResults/hlsl.intrinsics.f1632.frag.out +++ b/Test/baseResults/hlsl.intrinsics.f1632.frag.out @@ -58,7 +58,7 @@ ERROR: node is still EOpNull! 0:30 'inF0' (layout(location=0 ) in 4-component vector of float) 0:32 Sequence 0:32 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -123,7 +123,7 @@ ERROR: node is still EOpNull! 0:30 'inF0' (layout(location=0 ) in 4-component vector of float) 0:32 Sequence 0:32 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 3f8cf120..8bf2e283 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -1554,7 +1554,7 @@ gl_FragCoord origin is upper left 0:334 'inF0' (layout(location=0 ) in 4-component vector of float) 0:337 Sequence 0:337 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -4335,7 +4335,7 @@ gl_FragCoord origin is upper left 0:334 'inF0' (layout(location=0 ) in 4-component vector of float) 0:337 Sequence 0:337 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -6091,6 +6091,7 @@ gl_FragCoord origin is upper left Decorate 837(inU0) Location 3 Decorate 845(inF1) Location 1 Decorate 854(inF2) Location 2 + Decorate 1060(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out index 9641513d..75f8d685 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.comp.out +++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out @@ -54,7 +54,7 @@ local_size = (1, 1, 1) 0:? Sequence 0:199 Sequence 0:199 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -122,7 +122,7 @@ local_size = (1, 1, 1) 0:? Sequence 0:199 Sequence 0:199 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -162,6 +162,7 @@ local_size = (1, 1, 1) Name 41 "inF2" Name 42 "inI0" Name 61 "@entryPointOutput" + Decorate 61(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.intrinsics.negative.frag.out b/Test/baseResults/hlsl.intrinsics.negative.frag.out index e6ab9472..95a30212 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.frag.out +++ b/Test/baseResults/hlsl.intrinsics.negative.frag.out @@ -269,7 +269,7 @@ ERROR: node is still EOpNull! 0:90 0.000000 0:92 Sequence 0:92 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -620,7 +620,7 @@ ERROR: node is still EOpNull! 0:90 0.000000 0:92 Sequence 0:92 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out index 1d6f21d3..c3165e74 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.vert.out +++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out @@ -53,7 +53,7 @@ Shader version: 450 0:? Sequence 0:217 Sequence 0:217 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -185,7 +185,7 @@ Shader version: 450 0:? Sequence 0:217 Sequence 0:217 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? Constant: 0:? 1.000000 0:? 2.000000 @@ -313,6 +313,7 @@ Shader version: 450 Name 118 "gs_ua4" Name 119 "gs_ub4" Name 120 "gs_uc4" + Decorate 85(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index bff38d8c..1b82811d 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -90,7 +90,7 @@ gl_FragCoord origin is upper left 0:52 1.000000 0:54 Sequence 0:54 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 Branch: Return 0:? Linker Objects @@ -205,7 +205,7 @@ gl_FragCoord origin is upper left 0:52 1.000000 0:54 Sequence 0:54 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 Branch: Return 0:? Linker Objects @@ -227,14 +227,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 105 +// Id's are bound by 106 Capability Shader Capability ImageGatherExtended Capability ImageMSArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 92 + EntryPoint Fragment 4 "main" 93 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex2dmsf4" @@ -250,13 +250,16 @@ gl_FragCoord origin is upper left MemberName 80(PS_OUTPUT) 0 "Color" MemberName 80(PS_OUTPUT) 1 "Depth" Name 82 "psout" - Name 92 "@entryPointOutput" - Name 97 "g_sSamp" - Name 99 "c1" - Name 101 "c4" - Name 102 "o1" - Name 103 "o3" - Name 104 "o4" + Name 91 "PS_OUTPUT" + MemberName 91(PS_OUTPUT) 0 "Color" + MemberName 91(PS_OUTPUT) 1 "Depth" + Name 93 "@entryPointOutput" + Name 98 "g_sSamp" + Name 100 "c1" + Name 102 "c4" + Name 103 "o1" + Name 104 "o3" + Name 105 "o4" Decorate 9(g_tTex2dmsf4) DescriptorSet 0 Decorate 21(g_tTex2dmsi4) DescriptorSet 0 Decorate 29(g_tTex2dmsu4) DescriptorSet 0 @@ -264,8 +267,10 @@ gl_FragCoord origin is upper left Decorate 58(g_tTex2dmsi4a) DescriptorSet 0 Decorate 64(g_tTex2dmsu4a) DescriptorSet 0 MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 97(g_sSamp) DescriptorSet 0 - Decorate 97(g_sSamp) Binding 0 + MemberDecorate 91(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 93(@entryPointOutput) Location 0 + Decorate 98(g_sSamp) DescriptorSet 0 + Decorate 98(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -308,18 +313,19 @@ gl_FragCoord origin is upper left 86: TypePointer Function 17(fvec4) 88: 11(int) Constant 1 89: TypePointer Function 6(float) - 91: TypePointer Output 80(PS_OUTPUT) -92(@entryPointOutput): 91(ptr) Variable Output - 95: TypeSampler - 96: TypePointer UniformConstant 95 - 97(g_sSamp): 96(ptr) Variable UniformConstant - 98: TypePointer UniformConstant 11(int) - 99(c1): 98(ptr) Variable UniformConstant - 100: TypePointer UniformConstant 24(ivec4) - 101(c4): 100(ptr) Variable UniformConstant - 102(o1): 98(ptr) Variable UniformConstant - 103(o3): 52(ptr) Variable UniformConstant - 104(o4): 100(ptr) Variable UniformConstant + 91(PS_OUTPUT): TypeStruct 17(fvec4) 6(float) + 92: TypePointer Output 91(PS_OUTPUT) +93(@entryPointOutput): 92(ptr) Variable Output + 96: TypeSampler + 97: TypePointer UniformConstant 96 + 98(g_sSamp): 97(ptr) Variable UniformConstant + 99: TypePointer UniformConstant 11(int) + 100(c1): 99(ptr) Variable UniformConstant + 101: TypePointer UniformConstant 24(ivec4) + 102(c4): 101(ptr) Variable UniformConstant + 103(o1): 99(ptr) Variable UniformConstant + 104(o3): 52(ptr) Variable UniformConstant + 105(o4): 101(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 82(psout): 81(ptr) Variable Function @@ -369,7 +375,7 @@ gl_FragCoord origin is upper left Store 87 85 90: 89(ptr) AccessChain 82(psout) 88 Store 90 84 - 93:80(PS_OUTPUT) Load 82(psout) - Store 92(@entryPointOutput) 93 + 94:80(PS_OUTPUT) Load 82(psout) + Store 93(@entryPointOutput) 94 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index b18bec5c..564bccbc 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -108,7 +108,7 @@ gl_FragCoord origin is upper left 0:68 1.000000 0:70 Sequence 0:70 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -256,7 +256,7 @@ gl_FragCoord origin is upper left 0:68 1.000000 0:70 Sequence 0:70 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -293,14 +293,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 145 +// Id's are bound by 146 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 87 + EntryPoint Fragment 4 "main" 88 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4a" @@ -315,29 +315,32 @@ gl_FragCoord origin is upper left MemberName 75(PS_OUTPUT) 0 "Color" MemberName 75(PS_OUTPUT) 1 "Depth" Name 77 "psout" - Name 87 "@entryPointOutput" - Name 92 "g_sSamp" - Name 95 "g_tTex1df4" - Name 98 "g_tTex1di4" - Name 101 "g_tTex1du4" - Name 104 "g_tTex2df4" - Name 107 "g_tTex2di4" - Name 110 "g_tTex2du4" - Name 113 "g_tTex3df4" - Name 116 "g_tTex3di4" - Name 119 "g_tTex3du4" - Name 122 "g_tTexcdf4" - Name 125 "g_tTexcdi4" - Name 128 "g_tTexcdu4" - Name 131 "g_tTexcdf4a" - Name 134 "g_tTexcdi4a" - Name 137 "g_tTexcdu4a" - Name 138 "c1" - Name 140 "c2" - Name 141 "o1" - Name 142 "o2" - Name 143 "o3" - Name 144 "o4" + Name 86 "PS_OUTPUT" + MemberName 86(PS_OUTPUT) 0 "Color" + MemberName 86(PS_OUTPUT) 1 "Depth" + Name 88 "@entryPointOutput" + Name 93 "g_sSamp" + Name 96 "g_tTex1df4" + Name 99 "g_tTex1di4" + Name 102 "g_tTex1du4" + Name 105 "g_tTex2df4" + Name 108 "g_tTex2di4" + Name 111 "g_tTex2du4" + Name 114 "g_tTex3df4" + Name 117 "g_tTex3di4" + Name 120 "g_tTex3du4" + Name 123 "g_tTexcdf4" + Name 126 "g_tTexcdi4" + Name 129 "g_tTexcdu4" + Name 132 "g_tTexcdf4a" + Name 135 "g_tTexcdi4a" + Name 138 "g_tTexcdu4a" + Name 139 "c1" + Name 141 "c2" + Name 142 "o1" + Name 143 "o2" + Name 144 "o3" + Name 145 "o4" Decorate 9(g_tTex1df4a) DescriptorSet 0 Decorate 27(g_tTex1di4a) DescriptorSet 0 Decorate 37(g_tTex1du4a) DescriptorSet 0 @@ -345,24 +348,26 @@ gl_FragCoord origin is upper left Decorate 59(g_tTex2di4a) DescriptorSet 0 Decorate 68(g_tTex2du4a) DescriptorSet 0 MemberDecorate 75(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 92(g_sSamp) DescriptorSet 0 - Decorate 92(g_sSamp) Binding 0 - Decorate 95(g_tTex1df4) DescriptorSet 0 - Decorate 95(g_tTex1df4) Binding 0 - Decorate 98(g_tTex1di4) DescriptorSet 0 - Decorate 101(g_tTex1du4) DescriptorSet 0 - Decorate 104(g_tTex2df4) DescriptorSet 0 - Decorate 107(g_tTex2di4) DescriptorSet 0 - Decorate 110(g_tTex2du4) DescriptorSet 0 - Decorate 113(g_tTex3df4) DescriptorSet 0 - Decorate 116(g_tTex3di4) DescriptorSet 0 - Decorate 119(g_tTex3du4) DescriptorSet 0 - Decorate 122(g_tTexcdf4) DescriptorSet 0 - Decorate 125(g_tTexcdi4) DescriptorSet 0 - Decorate 128(g_tTexcdu4) DescriptorSet 0 - Decorate 131(g_tTexcdf4a) DescriptorSet 0 - Decorate 134(g_tTexcdi4a) DescriptorSet 0 - Decorate 137(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 88(@entryPointOutput) Location 0 + Decorate 93(g_sSamp) DescriptorSet 0 + Decorate 93(g_sSamp) Binding 0 + Decorate 96(g_tTex1df4) DescriptorSet 0 + Decorate 96(g_tTex1df4) Binding 0 + Decorate 99(g_tTex1di4) DescriptorSet 0 + Decorate 102(g_tTex1du4) DescriptorSet 0 + Decorate 105(g_tTex2df4) DescriptorSet 0 + Decorate 108(g_tTex2di4) DescriptorSet 0 + Decorate 111(g_tTex2du4) DescriptorSet 0 + Decorate 114(g_tTex3df4) DescriptorSet 0 + Decorate 117(g_tTex3di4) DescriptorSet 0 + Decorate 120(g_tTex3du4) DescriptorSet 0 + Decorate 123(g_tTexcdf4) DescriptorSet 0 + Decorate 126(g_tTexcdi4) DescriptorSet 0 + Decorate 129(g_tTexcdu4) DescriptorSet 0 + Decorate 132(g_tTexcdf4a) DescriptorSet 0 + Decorate 135(g_tTexcdi4a) DescriptorSet 0 + Decorate 138(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -406,63 +411,64 @@ gl_FragCoord origin is upper left 81: TypePointer Function 23(fvec4) 83: 11(int) Constant 1 84: TypePointer Function 6(float) - 86: TypePointer Output 75(PS_OUTPUT) -87(@entryPointOutput): 86(ptr) Variable Output - 90: TypeSampler - 91: TypePointer UniformConstant 90 - 92(g_sSamp): 91(ptr) Variable UniformConstant - 93: TypeImage 6(float) 1D sampled format:Unknown - 94: TypePointer UniformConstant 93 - 95(g_tTex1df4): 94(ptr) Variable UniformConstant - 96: TypeImage 11(int) 1D sampled format:Unknown - 97: TypePointer UniformConstant 96 - 98(g_tTex1di4): 97(ptr) Variable UniformConstant - 99: TypeImage 18(int) 1D sampled format:Unknown - 100: TypePointer UniformConstant 99 - 101(g_tTex1du4): 100(ptr) Variable UniformConstant - 102: TypeImage 6(float) 2D sampled format:Unknown - 103: TypePointer UniformConstant 102 - 104(g_tTex2df4): 103(ptr) Variable UniformConstant - 105: TypeImage 11(int) 2D sampled format:Unknown - 106: TypePointer UniformConstant 105 - 107(g_tTex2di4): 106(ptr) Variable UniformConstant - 108: TypeImage 18(int) 2D sampled format:Unknown - 109: TypePointer UniformConstant 108 - 110(g_tTex2du4): 109(ptr) Variable UniformConstant - 111: TypeImage 6(float) 3D sampled format:Unknown - 112: TypePointer UniformConstant 111 - 113(g_tTex3df4): 112(ptr) Variable UniformConstant - 114: TypeImage 11(int) 3D sampled format:Unknown - 115: TypePointer UniformConstant 114 - 116(g_tTex3di4): 115(ptr) Variable UniformConstant - 117: TypeImage 18(int) 3D sampled format:Unknown - 118: TypePointer UniformConstant 117 - 119(g_tTex3du4): 118(ptr) Variable UniformConstant - 120: TypeImage 6(float) Cube sampled format:Unknown - 121: TypePointer UniformConstant 120 - 122(g_tTexcdf4): 121(ptr) Variable UniformConstant - 123: TypeImage 11(int) Cube sampled format:Unknown - 124: TypePointer UniformConstant 123 - 125(g_tTexcdi4): 124(ptr) Variable UniformConstant - 126: TypeImage 18(int) Cube sampled format:Unknown - 127: TypePointer UniformConstant 126 - 128(g_tTexcdu4): 127(ptr) Variable UniformConstant - 129: TypeImage 6(float) Cube array sampled format:Unknown - 130: TypePointer UniformConstant 129 -131(g_tTexcdf4a): 130(ptr) Variable UniformConstant - 132: TypeImage 11(int) Cube array sampled format:Unknown - 133: TypePointer UniformConstant 132 -134(g_tTexcdi4a): 133(ptr) Variable UniformConstant - 135: TypeImage 18(int) Cube array sampled format:Unknown - 136: TypePointer UniformConstant 135 -137(g_tTexcdu4a): 136(ptr) Variable UniformConstant - 138(c1): 20(ptr) Variable UniformConstant - 139: TypePointer UniformConstant 15(ivec2) - 140(c2): 139(ptr) Variable UniformConstant - 141(o1): 20(ptr) Variable UniformConstant - 142(o2): 139(ptr) Variable UniformConstant - 143(o3): 13(ptr) Variable UniformConstant - 144(o4): 49(ptr) Variable UniformConstant + 86(PS_OUTPUT): TypeStruct 23(fvec4) 6(float) + 87: TypePointer Output 86(PS_OUTPUT) +88(@entryPointOutput): 87(ptr) Variable Output + 91: TypeSampler + 92: TypePointer UniformConstant 91 + 93(g_sSamp): 92(ptr) Variable UniformConstant + 94: TypeImage 6(float) 1D sampled format:Unknown + 95: TypePointer UniformConstant 94 + 96(g_tTex1df4): 95(ptr) Variable UniformConstant + 97: TypeImage 11(int) 1D sampled format:Unknown + 98: TypePointer UniformConstant 97 + 99(g_tTex1di4): 98(ptr) Variable UniformConstant + 100: TypeImage 18(int) 1D sampled format:Unknown + 101: TypePointer UniformConstant 100 + 102(g_tTex1du4): 101(ptr) Variable UniformConstant + 103: TypeImage 6(float) 2D sampled format:Unknown + 104: TypePointer UniformConstant 103 + 105(g_tTex2df4): 104(ptr) Variable UniformConstant + 106: TypeImage 11(int) 2D sampled format:Unknown + 107: TypePointer UniformConstant 106 + 108(g_tTex2di4): 107(ptr) Variable UniformConstant + 109: TypeImage 18(int) 2D sampled format:Unknown + 110: TypePointer UniformConstant 109 + 111(g_tTex2du4): 110(ptr) Variable UniformConstant + 112: TypeImage 6(float) 3D sampled format:Unknown + 113: TypePointer UniformConstant 112 + 114(g_tTex3df4): 113(ptr) Variable UniformConstant + 115: TypeImage 11(int) 3D sampled format:Unknown + 116: TypePointer UniformConstant 115 + 117(g_tTex3di4): 116(ptr) Variable UniformConstant + 118: TypeImage 18(int) 3D sampled format:Unknown + 119: TypePointer UniformConstant 118 + 120(g_tTex3du4): 119(ptr) Variable UniformConstant + 121: TypeImage 6(float) Cube sampled format:Unknown + 122: TypePointer UniformConstant 121 + 123(g_tTexcdf4): 122(ptr) Variable UniformConstant + 124: TypeImage 11(int) Cube sampled format:Unknown + 125: TypePointer UniformConstant 124 + 126(g_tTexcdi4): 125(ptr) Variable UniformConstant + 127: TypeImage 18(int) Cube sampled format:Unknown + 128: TypePointer UniformConstant 127 + 129(g_tTexcdu4): 128(ptr) Variable UniformConstant + 130: TypeImage 6(float) Cube array sampled format:Unknown + 131: TypePointer UniformConstant 130 +132(g_tTexcdf4a): 131(ptr) Variable UniformConstant + 133: TypeImage 11(int) Cube array sampled format:Unknown + 134: TypePointer UniformConstant 133 +135(g_tTexcdi4a): 134(ptr) Variable UniformConstant + 136: TypeImage 18(int) Cube array sampled format:Unknown + 137: TypePointer UniformConstant 136 +138(g_tTexcdu4a): 137(ptr) Variable UniformConstant + 139(c1): 20(ptr) Variable UniformConstant + 140: TypePointer UniformConstant 15(ivec2) + 141(c2): 140(ptr) Variable UniformConstant + 142(o1): 20(ptr) Variable UniformConstant + 143(o2): 140(ptr) Variable UniformConstant + 144(o3): 13(ptr) Variable UniformConstant + 145(o4): 49(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 77(psout): 76(ptr) Variable Function @@ -506,7 +512,7 @@ gl_FragCoord origin is upper left Store 82 80 85: 84(ptr) AccessChain 77(psout) 83 Store 85 79 - 88:75(PS_OUTPUT) Load 77(psout) - Store 87(@entryPointOutput) 88 + 89:75(PS_OUTPUT) Load 77(psout) + Store 88(@entryPointOutput) 89 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 1016ba49..cc2ca4a9 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:73 1.000000 0:75 Sequence 0:75 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -322,7 +322,7 @@ gl_FragCoord origin is upper left 0:73 1.000000 0:75 Sequence 0:75 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -359,14 +359,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 165 +// Id's are bound by 166 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 118 + EntryPoint Fragment 4 "main" 119 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4" @@ -385,25 +385,28 @@ gl_FragCoord origin is upper left MemberName 106(PS_OUTPUT) 0 "Color" MemberName 106(PS_OUTPUT) 1 "Depth" Name 108 "psout" - Name 118 "@entryPointOutput" - Name 123 "g_sSamp" - Name 126 "g_tTexcdf4" - Name 129 "g_tTexcdi4" - Name 132 "g_tTexcdu4" - Name 135 "g_tTex1df4a" - Name 138 "g_tTex1di4a" - Name 141 "g_tTex1du4a" - Name 144 "g_tTex2df4a" - Name 147 "g_tTex2di4a" - Name 150 "g_tTex2du4a" - Name 153 "g_tTexcdf4a" - Name 156 "g_tTexcdi4a" - Name 159 "g_tTexcdu4a" - Name 160 "c1" - Name 161 "o1" - Name 162 "o2" - Name 163 "o3" - Name 164 "o4" + Name 117 "PS_OUTPUT" + MemberName 117(PS_OUTPUT) 0 "Color" + MemberName 117(PS_OUTPUT) 1 "Depth" + Name 119 "@entryPointOutput" + Name 124 "g_sSamp" + Name 127 "g_tTexcdf4" + Name 130 "g_tTexcdi4" + Name 133 "g_tTexcdu4" + Name 136 "g_tTex1df4a" + Name 139 "g_tTex1di4a" + Name 142 "g_tTex1du4a" + Name 145 "g_tTex2df4a" + Name 148 "g_tTex2di4a" + Name 151 "g_tTex2du4a" + Name 154 "g_tTexcdf4a" + Name 157 "g_tTexcdi4a" + Name 160 "g_tTexcdu4a" + Name 161 "c1" + Name 162 "o1" + Name 163 "o2" + Name 164 "o3" + Name 165 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 Decorate 9(g_tTex1df4) Binding 0 Decorate 27(g_tTex1di4) DescriptorSet 0 @@ -415,20 +418,22 @@ gl_FragCoord origin is upper left Decorate 90(g_tTex3di4) DescriptorSet 0 Decorate 99(g_tTex3du4) DescriptorSet 0 MemberDecorate 106(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 123(g_sSamp) DescriptorSet 0 - Decorate 123(g_sSamp) Binding 0 - Decorate 126(g_tTexcdf4) DescriptorSet 0 - Decorate 129(g_tTexcdi4) DescriptorSet 0 - Decorate 132(g_tTexcdu4) DescriptorSet 0 - Decorate 135(g_tTex1df4a) DescriptorSet 0 - Decorate 138(g_tTex1di4a) DescriptorSet 0 - Decorate 141(g_tTex1du4a) DescriptorSet 0 - Decorate 144(g_tTex2df4a) DescriptorSet 0 - Decorate 147(g_tTex2di4a) DescriptorSet 0 - Decorate 150(g_tTex2du4a) DescriptorSet 0 - Decorate 153(g_tTexcdf4a) DescriptorSet 0 - Decorate 156(g_tTexcdi4a) DescriptorSet 0 - Decorate 159(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 117(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 119(@entryPointOutput) Location 0 + Decorate 124(g_sSamp) DescriptorSet 0 + Decorate 124(g_sSamp) Binding 0 + Decorate 127(g_tTexcdf4) DescriptorSet 0 + Decorate 130(g_tTexcdi4) DescriptorSet 0 + Decorate 133(g_tTexcdu4) DescriptorSet 0 + Decorate 136(g_tTex1df4a) DescriptorSet 0 + Decorate 139(g_tTex1di4a) DescriptorSet 0 + Decorate 142(g_tTex1du4a) DescriptorSet 0 + Decorate 145(g_tTex2df4a) DescriptorSet 0 + Decorate 148(g_tTex2di4a) DescriptorSet 0 + Decorate 151(g_tTex2du4a) DescriptorSet 0 + Decorate 154(g_tTexcdf4a) DescriptorSet 0 + Decorate 157(g_tTexcdi4a) DescriptorSet 0 + Decorate 160(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -485,52 +490,53 @@ gl_FragCoord origin is upper left 112: TypePointer Function 23(fvec4) 114: 11(int) Constant 1 115: TypePointer Function 6(float) - 117: TypePointer Output 106(PS_OUTPUT) -118(@entryPointOutput): 117(ptr) Variable Output - 121: TypeSampler - 122: TypePointer UniformConstant 121 - 123(g_sSamp): 122(ptr) Variable UniformConstant - 124: TypeImage 6(float) Cube sampled format:Unknown - 125: TypePointer UniformConstant 124 - 126(g_tTexcdf4): 125(ptr) Variable UniformConstant - 127: TypeImage 11(int) Cube sampled format:Unknown - 128: TypePointer UniformConstant 127 - 129(g_tTexcdi4): 128(ptr) Variable UniformConstant - 130: TypeImage 15(int) Cube sampled format:Unknown - 131: TypePointer UniformConstant 130 - 132(g_tTexcdu4): 131(ptr) Variable UniformConstant - 133: TypeImage 6(float) 1D array sampled format:Unknown - 134: TypePointer UniformConstant 133 -135(g_tTex1df4a): 134(ptr) Variable UniformConstant - 136: TypeImage 11(int) 1D array sampled format:Unknown - 137: TypePointer UniformConstant 136 -138(g_tTex1di4a): 137(ptr) Variable UniformConstant - 139: TypeImage 15(int) 1D array sampled format:Unknown - 140: TypePointer UniformConstant 139 -141(g_tTex1du4a): 140(ptr) Variable UniformConstant - 142: TypeImage 6(float) 2D array sampled format:Unknown - 143: TypePointer UniformConstant 142 -144(g_tTex2df4a): 143(ptr) Variable UniformConstant - 145: TypeImage 11(int) 2D array sampled format:Unknown - 146: TypePointer UniformConstant 145 -147(g_tTex2di4a): 146(ptr) Variable UniformConstant - 148: TypeImage 15(int) 2D array sampled format:Unknown - 149: TypePointer UniformConstant 148 -150(g_tTex2du4a): 149(ptr) Variable UniformConstant - 151: TypeImage 6(float) Cube array sampled format:Unknown - 152: TypePointer UniformConstant 151 -153(g_tTexcdf4a): 152(ptr) Variable UniformConstant - 154: TypeImage 11(int) Cube array sampled format:Unknown - 155: TypePointer UniformConstant 154 -156(g_tTexcdi4a): 155(ptr) Variable UniformConstant - 157: TypeImage 15(int) Cube array sampled format:Unknown - 158: TypePointer UniformConstant 157 -159(g_tTexcdu4a): 158(ptr) Variable UniformConstant - 160(c1): 17(ptr) Variable UniformConstant - 161(o1): 17(ptr) Variable UniformConstant - 162(o2): 13(ptr) Variable UniformConstant - 163(o3): 50(ptr) Variable UniformConstant - 164(o4): 80(ptr) Variable UniformConstant + 117(PS_OUTPUT): TypeStruct 23(fvec4) 6(float) + 118: TypePointer Output 117(PS_OUTPUT) +119(@entryPointOutput): 118(ptr) Variable Output + 122: TypeSampler + 123: TypePointer UniformConstant 122 + 124(g_sSamp): 123(ptr) Variable UniformConstant + 125: TypeImage 6(float) Cube sampled format:Unknown + 126: TypePointer UniformConstant 125 + 127(g_tTexcdf4): 126(ptr) Variable UniformConstant + 128: TypeImage 11(int) Cube sampled format:Unknown + 129: TypePointer UniformConstant 128 + 130(g_tTexcdi4): 129(ptr) Variable UniformConstant + 131: TypeImage 15(int) Cube sampled format:Unknown + 132: TypePointer UniformConstant 131 + 133(g_tTexcdu4): 132(ptr) Variable UniformConstant + 134: TypeImage 6(float) 1D array sampled format:Unknown + 135: TypePointer UniformConstant 134 +136(g_tTex1df4a): 135(ptr) Variable UniformConstant + 137: TypeImage 11(int) 1D array sampled format:Unknown + 138: TypePointer UniformConstant 137 +139(g_tTex1di4a): 138(ptr) Variable UniformConstant + 140: TypeImage 15(int) 1D array sampled format:Unknown + 141: TypePointer UniformConstant 140 +142(g_tTex1du4a): 141(ptr) Variable UniformConstant + 143: TypeImage 6(float) 2D array sampled format:Unknown + 144: TypePointer UniformConstant 143 +145(g_tTex2df4a): 144(ptr) Variable UniformConstant + 146: TypeImage 11(int) 2D array sampled format:Unknown + 147: TypePointer UniformConstant 146 +148(g_tTex2di4a): 147(ptr) Variable UniformConstant + 149: TypeImage 15(int) 2D array sampled format:Unknown + 150: TypePointer UniformConstant 149 +151(g_tTex2du4a): 150(ptr) Variable UniformConstant + 152: TypeImage 6(float) Cube array sampled format:Unknown + 153: TypePointer UniformConstant 152 +154(g_tTexcdf4a): 153(ptr) Variable UniformConstant + 155: TypeImage 11(int) Cube array sampled format:Unknown + 156: TypePointer UniformConstant 155 +157(g_tTexcdi4a): 156(ptr) Variable UniformConstant + 158: TypeImage 15(int) Cube array sampled format:Unknown + 159: TypePointer UniformConstant 158 +160(g_tTexcdu4a): 159(ptr) Variable UniformConstant + 161(c1): 17(ptr) Variable UniformConstant + 162(o1): 17(ptr) Variable UniformConstant + 163(o2): 13(ptr) Variable UniformConstant + 164(o3): 50(ptr) Variable UniformConstant + 165(o4): 80(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 108(psout): 107(ptr) Variable Function @@ -592,7 +598,7 @@ gl_FragCoord origin is upper left Store 113 111 116: 115(ptr) AccessChain 108(psout) 114 Store 116 110 - 119:106(PS_OUTPUT) Load 108(psout) - Store 118(@entryPointOutput) 119 + 120:106(PS_OUTPUT) Load 108(psout) + Store 119(@entryPointOutput) 120 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index f0311ba3..da91781a 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -133,7 +133,7 @@ Shader version: 450 0:? 0.000000 0:69 Sequence 0:69 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:69 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:69 Branch: Return 0:? Linker Objects @@ -306,7 +306,7 @@ Shader version: 450 0:? 0.000000 0:69 Sequence 0:69 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:69 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:69 Branch: Return 0:? Linker Objects @@ -343,14 +343,14 @@ Shader version: 450 // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 162 +// Id's are bound by 163 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 115 + EntryPoint Vertex 4 "main" 116 Name 4 "main" Name 9 "g_tTex1df4" Name 14 "c2" @@ -367,25 +367,27 @@ Shader version: 450 Name 106 "VS_OUTPUT" MemberName 106(VS_OUTPUT) 0 "Pos" Name 108 "vsout" - Name 115 "@entryPointOutput" - Name 120 "g_sSamp" - Name 123 "g_tTexcdf4" - Name 126 "g_tTexcdi4" - Name 129 "g_tTexcdu4" - Name 132 "g_tTex1df4a" - Name 135 "g_tTex1di4a" - Name 138 "g_tTex1du4a" - Name 141 "g_tTex2df4a" - Name 144 "g_tTex2di4a" - Name 147 "g_tTex2du4a" - Name 150 "g_tTexcdf4a" - Name 153 "g_tTexcdi4a" - Name 156 "g_tTexcdu4a" - Name 157 "c1" - Name 158 "o1" - Name 159 "o2" - Name 160 "o3" - Name 161 "o4" + Name 114 "VS_OUTPUT" + MemberName 114(VS_OUTPUT) 0 "Pos" + Name 116 "@entryPointOutput" + Name 121 "g_sSamp" + Name 124 "g_tTexcdf4" + Name 127 "g_tTexcdi4" + Name 130 "g_tTexcdu4" + Name 133 "g_tTex1df4a" + Name 136 "g_tTex1di4a" + Name 139 "g_tTex1du4a" + Name 142 "g_tTex2df4a" + Name 145 "g_tTex2di4a" + Name 148 "g_tTex2du4a" + Name 151 "g_tTexcdf4a" + Name 154 "g_tTexcdi4a" + Name 157 "g_tTexcdu4a" + Name 158 "c1" + Name 159 "o1" + Name 160 "o2" + Name 161 "o3" + Name 162 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 Decorate 9(g_tTex1df4) Binding 0 Decorate 27(g_tTex1di4) DescriptorSet 0 @@ -397,20 +399,22 @@ Shader version: 450 Decorate 90(g_tTex3di4) DescriptorSet 0 Decorate 99(g_tTex3du4) DescriptorSet 0 MemberDecorate 106(VS_OUTPUT) 0 BuiltIn Position - Decorate 120(g_sSamp) DescriptorSet 0 - Decorate 120(g_sSamp) Binding 0 - Decorate 123(g_tTexcdf4) DescriptorSet 0 - Decorate 126(g_tTexcdi4) DescriptorSet 0 - Decorate 129(g_tTexcdu4) DescriptorSet 0 - Decorate 132(g_tTex1df4a) DescriptorSet 0 - Decorate 135(g_tTex1di4a) DescriptorSet 0 - Decorate 138(g_tTex1du4a) DescriptorSet 0 - Decorate 141(g_tTex2df4a) DescriptorSet 0 - Decorate 144(g_tTex2di4a) DescriptorSet 0 - Decorate 147(g_tTex2du4a) DescriptorSet 0 - Decorate 150(g_tTexcdf4a) DescriptorSet 0 - Decorate 153(g_tTexcdi4a) DescriptorSet 0 - Decorate 156(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 114(VS_OUTPUT) 0 BuiltIn Position + Decorate 116(@entryPointOutput) Location 0 + Decorate 121(g_sSamp) DescriptorSet 0 + Decorate 121(g_sSamp) Binding 0 + Decorate 124(g_tTexcdf4) DescriptorSet 0 + Decorate 127(g_tTexcdi4) DescriptorSet 0 + Decorate 130(g_tTexcdu4) DescriptorSet 0 + Decorate 133(g_tTex1df4a) DescriptorSet 0 + Decorate 136(g_tTex1di4a) DescriptorSet 0 + Decorate 139(g_tTex1du4a) DescriptorSet 0 + Decorate 142(g_tTex2df4a) DescriptorSet 0 + Decorate 145(g_tTex2di4a) DescriptorSet 0 + Decorate 148(g_tTex2du4a) DescriptorSet 0 + Decorate 151(g_tTexcdf4a) DescriptorSet 0 + Decorate 154(g_tTexcdi4a) DescriptorSet 0 + Decorate 157(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -465,52 +469,53 @@ Shader version: 450 110: 6(float) Constant 0 111: 23(fvec4) ConstantComposite 110 110 110 110 112: TypePointer Function 23(fvec4) - 114: TypePointer Output 106(VS_OUTPUT) -115(@entryPointOutput): 114(ptr) Variable Output - 118: TypeSampler - 119: TypePointer UniformConstant 118 - 120(g_sSamp): 119(ptr) Variable UniformConstant - 121: TypeImage 6(float) Cube sampled format:Unknown - 122: TypePointer UniformConstant 121 - 123(g_tTexcdf4): 122(ptr) Variable UniformConstant - 124: TypeImage 11(int) Cube sampled format:Unknown - 125: TypePointer UniformConstant 124 - 126(g_tTexcdi4): 125(ptr) Variable UniformConstant - 127: TypeImage 15(int) Cube sampled format:Unknown - 128: TypePointer UniformConstant 127 - 129(g_tTexcdu4): 128(ptr) Variable UniformConstant - 130: TypeImage 6(float) 1D array sampled format:Unknown - 131: TypePointer UniformConstant 130 -132(g_tTex1df4a): 131(ptr) Variable UniformConstant - 133: TypeImage 11(int) 1D array sampled format:Unknown - 134: TypePointer UniformConstant 133 -135(g_tTex1di4a): 134(ptr) Variable UniformConstant - 136: TypeImage 15(int) 1D array sampled format:Unknown - 137: TypePointer UniformConstant 136 -138(g_tTex1du4a): 137(ptr) Variable UniformConstant - 139: TypeImage 6(float) 2D array sampled format:Unknown - 140: TypePointer UniformConstant 139 -141(g_tTex2df4a): 140(ptr) Variable UniformConstant - 142: TypeImage 11(int) 2D array sampled format:Unknown - 143: TypePointer UniformConstant 142 -144(g_tTex2di4a): 143(ptr) Variable UniformConstant - 145: TypeImage 15(int) 2D array sampled format:Unknown - 146: TypePointer UniformConstant 145 -147(g_tTex2du4a): 146(ptr) Variable UniformConstant - 148: TypeImage 6(float) Cube array sampled format:Unknown - 149: TypePointer UniformConstant 148 -150(g_tTexcdf4a): 149(ptr) Variable UniformConstant - 151: TypeImage 11(int) Cube array sampled format:Unknown - 152: TypePointer UniformConstant 151 -153(g_tTexcdi4a): 152(ptr) Variable UniformConstant - 154: TypeImage 15(int) Cube array sampled format:Unknown - 155: TypePointer UniformConstant 154 -156(g_tTexcdu4a): 155(ptr) Variable UniformConstant - 157(c1): 17(ptr) Variable UniformConstant - 158(o1): 17(ptr) Variable UniformConstant - 159(o2): 13(ptr) Variable UniformConstant - 160(o3): 50(ptr) Variable UniformConstant - 161(o4): 80(ptr) Variable UniformConstant + 114(VS_OUTPUT): TypeStruct 23(fvec4) + 115: TypePointer Output 114(VS_OUTPUT) +116(@entryPointOutput): 115(ptr) Variable Output + 119: TypeSampler + 120: TypePointer UniformConstant 119 + 121(g_sSamp): 120(ptr) Variable UniformConstant + 122: TypeImage 6(float) Cube sampled format:Unknown + 123: TypePointer UniformConstant 122 + 124(g_tTexcdf4): 123(ptr) Variable UniformConstant + 125: TypeImage 11(int) Cube sampled format:Unknown + 126: TypePointer UniformConstant 125 + 127(g_tTexcdi4): 126(ptr) Variable UniformConstant + 128: TypeImage 15(int) Cube sampled format:Unknown + 129: TypePointer UniformConstant 128 + 130(g_tTexcdu4): 129(ptr) Variable UniformConstant + 131: TypeImage 6(float) 1D array sampled format:Unknown + 132: TypePointer UniformConstant 131 +133(g_tTex1df4a): 132(ptr) Variable UniformConstant + 134: TypeImage 11(int) 1D array sampled format:Unknown + 135: TypePointer UniformConstant 134 +136(g_tTex1di4a): 135(ptr) Variable UniformConstant + 137: TypeImage 15(int) 1D array sampled format:Unknown + 138: TypePointer UniformConstant 137 +139(g_tTex1du4a): 138(ptr) Variable UniformConstant + 140: TypeImage 6(float) 2D array sampled format:Unknown + 141: TypePointer UniformConstant 140 +142(g_tTex2df4a): 141(ptr) Variable UniformConstant + 143: TypeImage 11(int) 2D array sampled format:Unknown + 144: TypePointer UniformConstant 143 +145(g_tTex2di4a): 144(ptr) Variable UniformConstant + 146: TypeImage 15(int) 2D array sampled format:Unknown + 147: TypePointer UniformConstant 146 +148(g_tTex2du4a): 147(ptr) Variable UniformConstant + 149: TypeImage 6(float) Cube array sampled format:Unknown + 150: TypePointer UniformConstant 149 +151(g_tTexcdf4a): 150(ptr) Variable UniformConstant + 152: TypeImage 11(int) Cube array sampled format:Unknown + 153: TypePointer UniformConstant 152 +154(g_tTexcdi4a): 153(ptr) Variable UniformConstant + 155: TypeImage 15(int) Cube array sampled format:Unknown + 156: TypePointer UniformConstant 155 +157(g_tTexcdu4a): 156(ptr) Variable UniformConstant + 158(c1): 17(ptr) Variable UniformConstant + 159(o1): 17(ptr) Variable UniformConstant + 160(o2): 13(ptr) Variable UniformConstant + 161(o3): 50(ptr) Variable UniformConstant + 162(o4): 80(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 108(vsout): 107(ptr) Variable Function @@ -570,7 +575,7 @@ Shader version: 450 105: 43(ivec4) ImageFetch 100 102 Lod 104 113: 112(ptr) AccessChain 108(vsout) 109 Store 113 111 - 116:106(VS_OUTPUT) Load 108(vsout) - Store 115(@entryPointOutput) 116 + 117:106(VS_OUTPUT) Load 108(vsout) + Store 116(@entryPointOutput) 117 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index 16e5187d..319347c5 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -42,7 +42,7 @@ gl_FragCoord origin is upper left 0:35 1.000000 0:37 Sequence 0:37 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 Branch: Return 0:? Linker Objects @@ -106,7 +106,7 @@ gl_FragCoord origin is upper left 0:35 1.000000 0:37 Sequence 0:37 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 Branch: Return 0:? Linker Objects @@ -125,13 +125,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 71 +// Id's are bound by 72 Capability Shader Capability SampledBuffer 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 55 + EntryPoint Fragment 4 "main" 56 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "r00" @@ -145,21 +145,26 @@ gl_FragCoord origin is upper left MemberName 44(PS_OUTPUT) 0 "Color" MemberName 44(PS_OUTPUT) 1 "Depth" Name 46 "psout" - Name 55 "@entryPointOutput" - Name 58 "g_tTexbf4_test" - Name 61 "c2" - Name 64 "c3" - Name 66 "c4" - Name 67 "o1" - Name 68 "o2" - Name 69 "o3" - Name 70 "o4" + Name 54 "PS_OUTPUT" + MemberName 54(PS_OUTPUT) 0 "Color" + MemberName 54(PS_OUTPUT) 1 "Depth" + Name 56 "@entryPointOutput" + Name 59 "g_tTexbf4_test" + Name 62 "c2" + Name 65 "c3" + Name 67 "c4" + Name 68 "o1" + Name 69 "o2" + Name 70 "o3" + Name 71 "o4" Decorate 13(g_tTexbf4) DescriptorSet 0 Decorate 27(g_tTexbi4) DescriptorSet 0 Decorate 39(g_tTexbu4) DescriptorSet 0 MemberDecorate 44(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 58(g_tTexbf4_test) DescriptorSet 0 - Decorate 58(g_tTexbf4_test) Binding 0 + MemberDecorate 54(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 56(@entryPointOutput) Location 0 + Decorate 59(g_tTexbf4_test) DescriptorSet 0 + Decorate 59(g_tTexbf4_test) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -192,21 +197,22 @@ gl_FragCoord origin is upper left 49: 7(fvec4) ConstantComposite 48 48 48 48 51: 15(int) Constant 1 52: TypePointer Function 6(float) - 54: TypePointer Output 44(PS_OUTPUT) -55(@entryPointOutput): 54(ptr) Variable Output -58(g_tTexbf4_test): 12(ptr) Variable UniformConstant - 59: TypeVector 15(int) 2 - 60: TypePointer UniformConstant 59(ivec2) - 61(c2): 60(ptr) Variable UniformConstant - 62: TypeVector 15(int) 3 - 63: TypePointer UniformConstant 62(ivec3) - 64(c3): 63(ptr) Variable UniformConstant - 65: TypePointer UniformConstant 21(ivec4) - 66(c4): 65(ptr) Variable UniformConstant - 67(o1): 16(ptr) Variable UniformConstant - 68(o2): 60(ptr) Variable UniformConstant - 69(o3): 63(ptr) Variable UniformConstant - 70(o4): 65(ptr) Variable UniformConstant + 54(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 55: TypePointer Output 54(PS_OUTPUT) +56(@entryPointOutput): 55(ptr) Variable Output +59(g_tTexbf4_test): 12(ptr) Variable UniformConstant + 60: TypeVector 15(int) 2 + 61: TypePointer UniformConstant 60(ivec2) + 62(c2): 61(ptr) Variable UniformConstant + 63: TypeVector 15(int) 3 + 64: TypePointer UniformConstant 63(ivec3) + 65(c3): 64(ptr) Variable UniformConstant + 66: TypePointer UniformConstant 21(ivec4) + 67(c4): 66(ptr) Variable UniformConstant + 68(o1): 16(ptr) Variable UniformConstant + 69(o2): 61(ptr) Variable UniformConstant + 70(o3): 64(ptr) Variable UniformConstant + 71(o4): 66(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(r00): 8(ptr) Variable Function @@ -232,7 +238,7 @@ gl_FragCoord origin is upper left Store 50 49 53: 52(ptr) AccessChain 46(psout) 51 Store 53 48 - 56:44(PS_OUTPUT) Load 46(psout) - Store 55(@entryPointOutput) 56 + 57:44(PS_OUTPUT) Load 46(psout) + Store 56(@entryPointOutput) 57 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index acb97a4a..f641fe40 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:73 1.000000 0:75 Sequence 0:75 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -340,7 +340,7 @@ gl_FragCoord origin is upper left 0:73 1.000000 0:75 Sequence 0:75 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -377,7 +377,7 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 174 +// Id's are bound by 175 Capability Shader Capability ImageGatherExtended @@ -385,7 +385,7 @@ gl_FragCoord origin is upper left Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 130 + EntryPoint Fragment 4 "main" 131 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4" @@ -407,22 +407,25 @@ gl_FragCoord origin is upper left MemberName 118(PS_OUTPUT) 0 "Color" MemberName 118(PS_OUTPUT) 1 "Depth" Name 120 "psout" - Name 130 "@entryPointOutput" - Name 135 "g_sSamp" - Name 138 "g_tTexcdf4" - Name 141 "g_tTexcdi4" - Name 144 "g_tTexcdu4" - Name 147 "g_tTex1df4a" - Name 150 "g_tTex1di4a" - Name 153 "g_tTex1du4a" - Name 156 "g_tTex2df4a" - Name 159 "g_tTex2di4a" - Name 162 "g_tTex2du4a" - Name 165 "g_tTexcdf4a" - Name 168 "g_tTexcdi4a" - Name 171 "g_tTexcdu4a" - Name 172 "c1" - Name 173 "o4" + Name 129 "PS_OUTPUT" + MemberName 129(PS_OUTPUT) 0 "Color" + MemberName 129(PS_OUTPUT) 1 "Depth" + Name 131 "@entryPointOutput" + Name 136 "g_sSamp" + Name 139 "g_tTexcdf4" + Name 142 "g_tTexcdi4" + Name 145 "g_tTexcdu4" + Name 148 "g_tTex1df4a" + Name 151 "g_tTex1di4a" + Name 154 "g_tTex1du4a" + Name 157 "g_tTex2df4a" + Name 160 "g_tTex2di4a" + Name 163 "g_tTex2du4a" + Name 166 "g_tTexcdf4a" + Name 169 "g_tTexcdi4a" + Name 172 "g_tTexcdu4a" + Name 173 "c1" + Name 174 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 Decorate 9(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 @@ -434,20 +437,22 @@ gl_FragCoord origin is upper left Decorate 100(g_tTex3di4) DescriptorSet 0 Decorate 110(g_tTex3du4) DescriptorSet 0 MemberDecorate 118(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 135(g_sSamp) DescriptorSet 0 - Decorate 135(g_sSamp) Binding 0 - Decorate 138(g_tTexcdf4) DescriptorSet 0 - Decorate 141(g_tTexcdi4) DescriptorSet 0 - Decorate 144(g_tTexcdu4) DescriptorSet 0 - Decorate 147(g_tTex1df4a) DescriptorSet 0 - Decorate 150(g_tTex1di4a) DescriptorSet 0 - Decorate 153(g_tTex1du4a) DescriptorSet 0 - Decorate 156(g_tTex2df4a) DescriptorSet 0 - Decorate 159(g_tTex2di4a) DescriptorSet 0 - Decorate 162(g_tTex2du4a) DescriptorSet 0 - Decorate 165(g_tTexcdf4a) DescriptorSet 0 - Decorate 168(g_tTexcdi4a) DescriptorSet 0 - Decorate 171(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 131(@entryPointOutput) Location 0 + Decorate 136(g_sSamp) DescriptorSet 0 + Decorate 136(g_sSamp) Binding 0 + Decorate 139(g_tTexcdf4) DescriptorSet 0 + Decorate 142(g_tTexcdi4) DescriptorSet 0 + Decorate 145(g_tTexcdu4) DescriptorSet 0 + Decorate 148(g_tTex1df4a) DescriptorSet 0 + Decorate 151(g_tTex1di4a) DescriptorSet 0 + Decorate 154(g_tTex1du4a) DescriptorSet 0 + Decorate 157(g_tTex2df4a) DescriptorSet 0 + Decorate 160(g_tTex2di4a) DescriptorSet 0 + Decorate 163(g_tTex2du4a) DescriptorSet 0 + Decorate 166(g_tTexcdf4a) DescriptorSet 0 + Decorate 169(g_tTexcdi4a) DescriptorSet 0 + Decorate 172(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -507,49 +512,50 @@ gl_FragCoord origin is upper left 124: TypePointer Function 25(fvec4) 126: 11(int) Constant 1 127: TypePointer Function 6(float) - 129: TypePointer Output 118(PS_OUTPUT) -130(@entryPointOutput): 129(ptr) Variable Output - 133: TypeSampler - 134: TypePointer UniformConstant 133 - 135(g_sSamp): 134(ptr) Variable UniformConstant - 136: TypeImage 6(float) Cube sampled format:Unknown - 137: TypePointer UniformConstant 136 - 138(g_tTexcdf4): 137(ptr) Variable UniformConstant - 139: TypeImage 11(int) Cube sampled format:Unknown - 140: TypePointer UniformConstant 139 - 141(g_tTexcdi4): 140(ptr) Variable UniformConstant - 142: TypeImage 15(int) Cube sampled format:Unknown - 143: TypePointer UniformConstant 142 - 144(g_tTexcdu4): 143(ptr) Variable UniformConstant - 145: TypeImage 6(float) 1D array sampled format:Unknown - 146: TypePointer UniformConstant 145 -147(g_tTex1df4a): 146(ptr) Variable UniformConstant - 148: TypeImage 11(int) 1D array sampled format:Unknown - 149: TypePointer UniformConstant 148 -150(g_tTex1di4a): 149(ptr) Variable UniformConstant - 151: TypeImage 15(int) 1D array sampled format:Unknown - 152: TypePointer UniformConstant 151 -153(g_tTex1du4a): 152(ptr) Variable UniformConstant - 154: TypeImage 6(float) 2D array sampled format:Unknown - 155: TypePointer UniformConstant 154 -156(g_tTex2df4a): 155(ptr) Variable UniformConstant - 157: TypeImage 11(int) 2D array sampled format:Unknown - 158: TypePointer UniformConstant 157 -159(g_tTex2di4a): 158(ptr) Variable UniformConstant - 160: TypeImage 15(int) 2D array sampled format:Unknown - 161: TypePointer UniformConstant 160 -162(g_tTex2du4a): 161(ptr) Variable UniformConstant - 163: TypeImage 6(float) Cube array sampled format:Unknown - 164: TypePointer UniformConstant 163 -165(g_tTexcdf4a): 164(ptr) Variable UniformConstant - 166: TypeImage 11(int) Cube array sampled format:Unknown - 167: TypePointer UniformConstant 166 -168(g_tTexcdi4a): 167(ptr) Variable UniformConstant - 169: TypeImage 15(int) Cube array sampled format:Unknown - 170: TypePointer UniformConstant 169 -171(g_tTexcdu4a): 170(ptr) Variable UniformConstant - 172(c1): 17(ptr) Variable UniformConstant - 173(o4): 88(ptr) Variable UniformConstant + 129(PS_OUTPUT): TypeStruct 25(fvec4) 6(float) + 130: TypePointer Output 129(PS_OUTPUT) +131(@entryPointOutput): 130(ptr) Variable Output + 134: TypeSampler + 135: TypePointer UniformConstant 134 + 136(g_sSamp): 135(ptr) Variable UniformConstant + 137: TypeImage 6(float) Cube sampled format:Unknown + 138: TypePointer UniformConstant 137 + 139(g_tTexcdf4): 138(ptr) Variable UniformConstant + 140: TypeImage 11(int) Cube sampled format:Unknown + 141: TypePointer UniformConstant 140 + 142(g_tTexcdi4): 141(ptr) Variable UniformConstant + 143: TypeImage 15(int) Cube sampled format:Unknown + 144: TypePointer UniformConstant 143 + 145(g_tTexcdu4): 144(ptr) Variable UniformConstant + 146: TypeImage 6(float) 1D array sampled format:Unknown + 147: TypePointer UniformConstant 146 +148(g_tTex1df4a): 147(ptr) Variable UniformConstant + 149: TypeImage 11(int) 1D array sampled format:Unknown + 150: TypePointer UniformConstant 149 +151(g_tTex1di4a): 150(ptr) Variable UniformConstant + 152: TypeImage 15(int) 1D array sampled format:Unknown + 153: TypePointer UniformConstant 152 +154(g_tTex1du4a): 153(ptr) Variable UniformConstant + 155: TypeImage 6(float) 2D array sampled format:Unknown + 156: TypePointer UniformConstant 155 +157(g_tTex2df4a): 156(ptr) Variable UniformConstant + 158: TypeImage 11(int) 2D array sampled format:Unknown + 159: TypePointer UniformConstant 158 +160(g_tTex2di4a): 159(ptr) Variable UniformConstant + 161: TypeImage 15(int) 2D array sampled format:Unknown + 162: TypePointer UniformConstant 161 +163(g_tTex2du4a): 162(ptr) Variable UniformConstant + 164: TypeImage 6(float) Cube array sampled format:Unknown + 165: TypePointer UniformConstant 164 +166(g_tTexcdf4a): 165(ptr) Variable UniformConstant + 167: TypeImage 11(int) Cube array sampled format:Unknown + 168: TypePointer UniformConstant 167 +169(g_tTexcdi4a): 168(ptr) Variable UniformConstant + 170: TypeImage 15(int) Cube array sampled format:Unknown + 171: TypePointer UniformConstant 170 +172(g_tTexcdu4a): 171(ptr) Variable UniformConstant + 173(c1): 17(ptr) Variable UniformConstant + 174(o4): 88(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 120(psout): 119(ptr) Variable Function @@ -620,7 +626,7 @@ gl_FragCoord origin is upper left Store 125 123 128: 127(ptr) AccessChain 120(psout) 126 Store 128 122 - 131:118(PS_OUTPUT) Load 120(psout) - Store 130(@entryPointOutput) 131 + 132:118(PS_OUTPUT) Load 120(psout) + Store 131(@entryPointOutput) 132 Return FunctionEnd diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 1751db8c..e2e3c601 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:66 1.000000 0:68 Sequence 0:68 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 Branch: Return 0:? Linker Objects @@ -268,7 +268,7 @@ gl_FragCoord origin is upper left 0:66 1.000000 0:68 Sequence 0:68 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 Branch: Return 0:? Linker Objects @@ -305,7 +305,7 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 151 +// Id's are bound by 152 Capability Shader Capability ImageGatherExtended @@ -313,7 +313,7 @@ gl_FragCoord origin is upper left Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 96 + EntryPoint Fragment 4 "main" 97 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4a" @@ -330,27 +330,30 @@ gl_FragCoord origin is upper left MemberName 84(PS_OUTPUT) 0 "Color" MemberName 84(PS_OUTPUT) 1 "Depth" Name 86 "psout" - Name 96 "@entryPointOutput" - Name 101 "g_sSamp" - Name 104 "g_tTex1df4" - Name 107 "g_tTex1di4" - Name 110 "g_tTex1du4" - Name 113 "g_tTex2df4" - Name 116 "g_tTex2di4" - Name 119 "g_tTex2du4" - Name 122 "g_tTex3df4" - Name 125 "g_tTex3di4" - Name 128 "g_tTex3du4" - Name 131 "g_tTexcdf4" - Name 134 "g_tTexcdi4" - Name 137 "g_tTexcdu4" - Name 140 "g_tTexcdf4a" - Name 143 "g_tTexcdi4a" - Name 146 "g_tTexcdu4a" - Name 147 "c1" - Name 148 "c2" - Name 149 "o3" - Name 150 "o4" + Name 95 "PS_OUTPUT" + MemberName 95(PS_OUTPUT) 0 "Color" + MemberName 95(PS_OUTPUT) 1 "Depth" + Name 97 "@entryPointOutput" + Name 102 "g_sSamp" + Name 105 "g_tTex1df4" + Name 108 "g_tTex1di4" + Name 111 "g_tTex1du4" + Name 114 "g_tTex2df4" + Name 117 "g_tTex2di4" + Name 120 "g_tTex2du4" + Name 123 "g_tTex3df4" + Name 126 "g_tTex3di4" + Name 129 "g_tTex3du4" + Name 132 "g_tTexcdf4" + Name 135 "g_tTexcdi4" + Name 138 "g_tTexcdu4" + Name 141 "g_tTexcdf4a" + Name 144 "g_tTexcdi4a" + Name 147 "g_tTexcdu4a" + Name 148 "c1" + Name 149 "c2" + Name 150 "o3" + Name 151 "o4" Decorate 9(g_tTex1df4a) DescriptorSet 0 Decorate 29(g_tTex1di4a) DescriptorSet 0 Decorate 40(g_tTex1du4a) DescriptorSet 0 @@ -358,24 +361,26 @@ gl_FragCoord origin is upper left Decorate 66(g_tTex2di4a) DescriptorSet 0 Decorate 76(g_tTex2du4a) DescriptorSet 0 MemberDecorate 84(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 101(g_sSamp) DescriptorSet 0 - Decorate 101(g_sSamp) Binding 0 - Decorate 104(g_tTex1df4) DescriptorSet 0 - Decorate 104(g_tTex1df4) Binding 0 - Decorate 107(g_tTex1di4) DescriptorSet 0 - Decorate 110(g_tTex1du4) DescriptorSet 0 - Decorate 113(g_tTex2df4) DescriptorSet 0 - Decorate 116(g_tTex2di4) DescriptorSet 0 - Decorate 119(g_tTex2du4) DescriptorSet 0 - Decorate 122(g_tTex3df4) DescriptorSet 0 - Decorate 125(g_tTex3di4) DescriptorSet 0 - Decorate 128(g_tTex3du4) DescriptorSet 0 - Decorate 131(g_tTexcdf4) DescriptorSet 0 - Decorate 134(g_tTexcdi4) DescriptorSet 0 - Decorate 137(g_tTexcdu4) DescriptorSet 0 - Decorate 140(g_tTexcdf4a) DescriptorSet 0 - Decorate 143(g_tTexcdi4a) DescriptorSet 0 - Decorate 146(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 95(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 97(@entryPointOutput) Location 0 + Decorate 102(g_sSamp) DescriptorSet 0 + Decorate 102(g_sSamp) Binding 0 + Decorate 105(g_tTex1df4) DescriptorSet 0 + Decorate 105(g_tTex1df4) Binding 0 + Decorate 108(g_tTex1di4) DescriptorSet 0 + Decorate 111(g_tTex1du4) DescriptorSet 0 + Decorate 114(g_tTex2df4) DescriptorSet 0 + Decorate 117(g_tTex2di4) DescriptorSet 0 + Decorate 120(g_tTex2du4) DescriptorSet 0 + Decorate 123(g_tTex3df4) DescriptorSet 0 + Decorate 126(g_tTex3di4) DescriptorSet 0 + Decorate 129(g_tTex3du4) DescriptorSet 0 + Decorate 132(g_tTexcdf4) DescriptorSet 0 + Decorate 135(g_tTexcdi4) DescriptorSet 0 + Decorate 138(g_tTexcdu4) DescriptorSet 0 + Decorate 141(g_tTexcdf4a) DescriptorSet 0 + Decorate 144(g_tTexcdi4a) DescriptorSet 0 + Decorate 147(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -422,60 +427,61 @@ gl_FragCoord origin is upper left 90: TypePointer Function 25(fvec4) 92: 11(int) Constant 1 93: TypePointer Function 6(float) - 95: TypePointer Output 84(PS_OUTPUT) -96(@entryPointOutput): 95(ptr) Variable Output - 99: TypeSampler - 100: TypePointer UniformConstant 99 - 101(g_sSamp): 100(ptr) Variable UniformConstant - 102: TypeImage 6(float) 1D sampled format:Unknown - 103: TypePointer UniformConstant 102 - 104(g_tTex1df4): 103(ptr) Variable UniformConstant - 105: TypeImage 11(int) 1D sampled format:Unknown - 106: TypePointer UniformConstant 105 - 107(g_tTex1di4): 106(ptr) Variable UniformConstant - 108: TypeImage 18(int) 1D sampled format:Unknown - 109: TypePointer UniformConstant 108 - 110(g_tTex1du4): 109(ptr) Variable UniformConstant - 111: TypeImage 6(float) 2D sampled format:Unknown - 112: TypePointer UniformConstant 111 - 113(g_tTex2df4): 112(ptr) Variable UniformConstant - 114: TypeImage 11(int) 2D sampled format:Unknown - 115: TypePointer UniformConstant 114 - 116(g_tTex2di4): 115(ptr) Variable UniformConstant - 117: TypeImage 18(int) 2D sampled format:Unknown - 118: TypePointer UniformConstant 117 - 119(g_tTex2du4): 118(ptr) Variable UniformConstant - 120: TypeImage 6(float) 3D sampled format:Unknown - 121: TypePointer UniformConstant 120 - 122(g_tTex3df4): 121(ptr) Variable UniformConstant - 123: TypeImage 11(int) 3D sampled format:Unknown - 124: TypePointer UniformConstant 123 - 125(g_tTex3di4): 124(ptr) Variable UniformConstant - 126: TypeImage 18(int) 3D sampled format:Unknown - 127: TypePointer UniformConstant 126 - 128(g_tTex3du4): 127(ptr) Variable UniformConstant - 129: TypeImage 6(float) Cube sampled format:Unknown - 130: TypePointer UniformConstant 129 - 131(g_tTexcdf4): 130(ptr) Variable UniformConstant - 132: TypeImage 11(int) Cube sampled format:Unknown - 133: TypePointer UniformConstant 132 - 134(g_tTexcdi4): 133(ptr) Variable UniformConstant - 135: TypeImage 18(int) Cube sampled format:Unknown - 136: TypePointer UniformConstant 135 - 137(g_tTexcdu4): 136(ptr) Variable UniformConstant - 138: TypeImage 6(float) Cube array sampled format:Unknown - 139: TypePointer UniformConstant 138 -140(g_tTexcdf4a): 139(ptr) Variable UniformConstant - 141: TypeImage 11(int) Cube array sampled format:Unknown - 142: TypePointer UniformConstant 141 -143(g_tTexcdi4a): 142(ptr) Variable UniformConstant - 144: TypeImage 18(int) Cube array sampled format:Unknown - 145: TypePointer UniformConstant 144 -146(g_tTexcdu4a): 145(ptr) Variable UniformConstant - 147(c1): 20(ptr) Variable UniformConstant - 148(c2): 60(ptr) Variable UniformConstant - 149(o3): 13(ptr) Variable UniformConstant - 150(o4): 53(ptr) Variable UniformConstant + 95(PS_OUTPUT): TypeStruct 25(fvec4) 6(float) + 96: TypePointer Output 95(PS_OUTPUT) +97(@entryPointOutput): 96(ptr) Variable Output + 100: TypeSampler + 101: TypePointer UniformConstant 100 + 102(g_sSamp): 101(ptr) Variable UniformConstant + 103: TypeImage 6(float) 1D sampled format:Unknown + 104: TypePointer UniformConstant 103 + 105(g_tTex1df4): 104(ptr) Variable UniformConstant + 106: TypeImage 11(int) 1D sampled format:Unknown + 107: TypePointer UniformConstant 106 + 108(g_tTex1di4): 107(ptr) Variable UniformConstant + 109: TypeImage 18(int) 1D sampled format:Unknown + 110: TypePointer UniformConstant 109 + 111(g_tTex1du4): 110(ptr) Variable UniformConstant + 112: TypeImage 6(float) 2D sampled format:Unknown + 113: TypePointer UniformConstant 112 + 114(g_tTex2df4): 113(ptr) Variable UniformConstant + 115: TypeImage 11(int) 2D sampled format:Unknown + 116: TypePointer UniformConstant 115 + 117(g_tTex2di4): 116(ptr) Variable UniformConstant + 118: TypeImage 18(int) 2D sampled format:Unknown + 119: TypePointer UniformConstant 118 + 120(g_tTex2du4): 119(ptr) Variable UniformConstant + 121: TypeImage 6(float) 3D sampled format:Unknown + 122: TypePointer UniformConstant 121 + 123(g_tTex3df4): 122(ptr) Variable UniformConstant + 124: TypeImage 11(int) 3D sampled format:Unknown + 125: TypePointer UniformConstant 124 + 126(g_tTex3di4): 125(ptr) Variable UniformConstant + 127: TypeImage 18(int) 3D sampled format:Unknown + 128: TypePointer UniformConstant 127 + 129(g_tTex3du4): 128(ptr) Variable UniformConstant + 130: TypeImage 6(float) Cube sampled format:Unknown + 131: TypePointer UniformConstant 130 + 132(g_tTexcdf4): 131(ptr) Variable UniformConstant + 133: TypeImage 11(int) Cube sampled format:Unknown + 134: TypePointer UniformConstant 133 + 135(g_tTexcdi4): 134(ptr) Variable UniformConstant + 136: TypeImage 18(int) Cube sampled format:Unknown + 137: TypePointer UniformConstant 136 + 138(g_tTexcdu4): 137(ptr) Variable UniformConstant + 139: TypeImage 6(float) Cube array sampled format:Unknown + 140: TypePointer UniformConstant 139 +141(g_tTexcdf4a): 140(ptr) Variable UniformConstant + 142: TypeImage 11(int) Cube array sampled format:Unknown + 143: TypePointer UniformConstant 142 +144(g_tTexcdi4a): 143(ptr) Variable UniformConstant + 145: TypeImage 18(int) Cube array sampled format:Unknown + 146: TypePointer UniformConstant 145 +147(g_tTexcdu4a): 146(ptr) Variable UniformConstant + 148(c1): 20(ptr) Variable UniformConstant + 149(c2): 60(ptr) Variable UniformConstant + 150(o3): 13(ptr) Variable UniformConstant + 151(o4): 53(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 86(psout): 85(ptr) Variable Function @@ -525,7 +531,7 @@ gl_FragCoord origin is upper left Store 91 89 94: 93(ptr) AccessChain 86(psout) 92 Store 94 88 - 97:84(PS_OUTPUT) Load 86(psout) - Store 96(@entryPointOutput) 97 + 98:84(PS_OUTPUT) Load 86(psout) + Store 97(@entryPointOutput) 98 Return FunctionEnd diff --git a/Test/baseResults/hlsl.max.frag.out b/Test/baseResults/hlsl.max.frag.out index 57390695..2fe397a6 100755 --- a/Test/baseResults/hlsl.max.frag.out +++ b/Test/baseResults/hlsl.max.frag.out @@ -9,7 +9,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 max (global 4-component vector of float) 0:3 'input1' (layout(location=0 ) in 4-component vector of float) 0:3 'input2' (layout(location=1 ) in 4-component vector of float) @@ -30,7 +30,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 max (global 4-component vector of float) 0:3 'input1' (layout(location=0 ) in 4-component vector of float) 0:3 'input2' (layout(location=1 ) in 4-component vector of float) @@ -50,6 +50,7 @@ gl_FragCoord origin is upper left Name 9 "@entryPointOutput" Name 11 "input1" Name 13 "input2" + Decorate 9(@entryPointOutput) Location 0 Decorate 11(input1) Location 0 Decorate 13(input2) Location 1 2: TypeVoid diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index 721b0d33..18c16b8f 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left 0:18 'r07' (temp int) 0:19 Sequence 0:19 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:19 'ps_output' (temp structure{temp 4-component vector of float color}) 0:19 Branch: Return 0:? Linker Objects @@ -130,19 +130,19 @@ gl_FragCoord origin is upper left 0:18 'r07' (temp int) 0:19 Sequence 0:19 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:19 'ps_output' (temp structure{temp 4-component vector of float color}) 0:19 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 43 +// Id's are bound by 44 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 40 + EntryPoint Fragment 4 "main" 41 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -157,7 +157,10 @@ gl_FragCoord origin is upper left Name 30 "PS_OUTPUT" MemberName 30(PS_OUTPUT) 0 "color" Name 32 "ps_output" - Name 40 "@entryPointOutput" + Name 39 "PS_OUTPUT" + MemberName 39(PS_OUTPUT) 0 "color" + Name 41 "@entryPointOutput" + Decorate 41(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -179,8 +182,9 @@ gl_FragCoord origin is upper left 31: TypePointer Function 30(PS_OUTPUT) 33: 19(int) Constant 0 37: TypePointer Function 29(fvec4) - 39: TypePointer Output 30(PS_OUTPUT) -40(@entryPointOutput): 39(ptr) Variable Output + 39(PS_OUTPUT): TypeStruct 29(fvec4) + 40: TypePointer Output 39(PS_OUTPUT) +41(@entryPointOutput): 40(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function @@ -207,7 +211,7 @@ gl_FragCoord origin is upper left 36: 29(fvec4) CompositeConstruct 35 35 35 35 38: 37(ptr) AccessChain 32(ps_output) 33 Store 38 36 - 41:30(PS_OUTPUT) Load 32(ps_output) - Store 40(@entryPointOutput) 41 + 42:30(PS_OUTPUT) Load 32(ps_output) + Store 41(@entryPointOutput) 42 Return FunctionEnd diff --git a/Test/baseResults/hlsl.overload.frag.out b/Test/baseResults/hlsl.overload.frag.out index 7863ed22..15123182 100755 --- a/Test/baseResults/hlsl.overload.frag.out +++ b/Test/baseResults/hlsl.overload.frag.out @@ -350,7 +350,7 @@ gl_FragCoord origin is upper left 0:139 'b' (temp bool) 0:141 Sequence 0:141 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects @@ -710,7 +710,7 @@ gl_FragCoord origin is upper left 0:139 'b' (temp bool) 0:141 Sequence 0:141 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects @@ -909,6 +909,7 @@ gl_FragCoord origin is upper left Name 500 "param" Name 504 "@entryPointOutput" Name 506 "input" + Decorate 504(@entryPointOutput) Location 0 Decorate 506(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 4c70ea82..41fc3400 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:127 1.000000 0:129 Sequence 0:129 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects @@ -76,19 +76,19 @@ gl_FragCoord origin is upper left 0:127 1.000000 0:129 Sequence 0:129 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 30 +// Id's are bound by 31 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 27 + EntryPoint Fragment 4 "main" 28 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "thisLineIs" @@ -96,8 +96,13 @@ gl_FragCoord origin is upper left MemberName 12(PS_OUTPUT) 0 "Color" MemberName 12(PS_OUTPUT) 1 "Depth" Name 14 "psout" - Name 27 "@entryPointOutput" + Name 26 "PS_OUTPUT" + MemberName 26(PS_OUTPUT) 0 "Color" + MemberName 26(PS_OUTPUT) 1 "Depth" + Name 28 "@entryPointOutput" MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth + MemberDecorate 26(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 28(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -113,8 +118,9 @@ gl_FragCoord origin is upper left 21: TypePointer Function 11(fvec4) 23: 6(int) Constant 1 24: TypePointer Function 10(float) - 26: TypePointer Output 12(PS_OUTPUT) -27(@entryPointOutput): 26(ptr) Variable Output + 26(PS_OUTPUT): TypeStruct 11(fvec4) 10(float) + 27: TypePointer Output 26(PS_OUTPUT) +28(@entryPointOutput): 27(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(thisLineIs): 7(ptr) Variable Function @@ -127,7 +133,7 @@ gl_FragCoord origin is upper left Store 22 20 25: 24(ptr) AccessChain 14(psout) 23 Store 25 19 - 28:12(PS_OUTPUT) Load 14(psout) - Store 27(@entryPointOutput) 28 + 29:12(PS_OUTPUT) Load 14(psout) + Store 28(@entryPointOutput) 29 Return FunctionEnd diff --git a/Test/baseResults/hlsl.precedence.frag.out b/Test/baseResults/hlsl.precedence.frag.out index e6982c65..5144f9df 100755 --- a/Test/baseResults/hlsl.precedence.frag.out +++ b/Test/baseResults/hlsl.precedence.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence 0:8 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:8 add (temp 4-component vector of float) 0:8 add (temp 4-component vector of float) 0:8 add (temp 4-component vector of float) @@ -63,7 +63,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence 0:8 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:8 add (temp 4-component vector of float) 0:8 add (temp 4-component vector of float) 0:8 add (temp 4-component vector of float) @@ -114,6 +114,7 @@ gl_FragCoord origin is upper left Name 13 "a2" Name 15 "a3" Name 19 "a4" + Decorate 9(@entryPointOutput) Location 0 Decorate 11(a1) Location 0 Decorate 13(a2) Location 1 Decorate 15(a3) Location 2 diff --git a/Test/baseResults/hlsl.precedence2.frag.out b/Test/baseResults/hlsl.precedence2.frag.out index c1feb6de..57fab462 100755 --- a/Test/baseResults/hlsl.precedence2.frag.out +++ b/Test/baseResults/hlsl.precedence2.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence 0:8 move second child to first child (temp int) -0:? '@entryPointOutput' (out int) +0:? '@entryPointOutput' (layout(location=0 ) out int) 0:8 add (temp int) 0:8 left-shift (temp int) 0:8 add (temp int) @@ -46,7 +46,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:8 Sequence 0:8 move second child to first child (temp int) -0:? '@entryPointOutput' (out int) +0:? '@entryPointOutput' (layout(location=0 ) out int) 0:8 add (temp int) 0:8 left-shift (temp int) 0:8 add (temp int) @@ -80,6 +80,7 @@ gl_FragCoord origin is upper left Name 12 "a2" Name 15 "a3" Name 18 "a4" + Decorate 8(@entryPointOutput) Location 0 Decorate 10(a1) Location 0 Decorate 12(a2) Location 1 Decorate 15(a3) Location 2 diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index e2577c7a..51788101 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -21,7 +21,7 @@ gl_FragCoord origin is upper left 0:11 1.000000 0:12 Sequence 0:12 move second child to first child (temp structure{noContraction temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{noContraction temp 4-component vector of float color}) 0:12 'ps_output' (temp structure{noContraction temp 4-component vector of float color}) 0:12 Branch: Return 0:? Linker Objects @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:11 1.000000 0:12 Sequence 0:12 move second child to first child (temp structure{noContraction temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{noContraction temp 4-component vector of float color}) 0:12 'ps_output' (temp structure{noContraction temp 4-component vector of float color}) 0:12 Branch: Return 0:? Linker Objects @@ -61,12 +61,12 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 31 +// Id's are bound by 32 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 26 + EntryPoint Fragment 4 "main" 27 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 13 "MyFunction(f1;vf3;" @@ -75,8 +75,11 @@ gl_FragCoord origin is upper left Name 16 "PS_OUTPUT" MemberName 16(PS_OUTPUT) 0 "color" Name 18 "ps_output" - Name 26 "@entryPointOutput" - Name 30 "precisefloat" + Name 25 "PS_OUTPUT" + MemberName 25(PS_OUTPUT) 0 "color" + Name 27 "@entryPointOutput" + Name 31 "precisefloat" + Decorate 27(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -92,17 +95,18 @@ gl_FragCoord origin is upper left 21: 6(float) Constant 1065353216 22: 15(fvec4) ConstantComposite 21 21 21 21 23: TypePointer Function 15(fvec4) - 25: TypePointer Output 16(PS_OUTPUT) -26(@entryPointOutput): 25(ptr) Variable Output - 29: TypePointer Private 6(float) -30(precisefloat): 29(ptr) Variable Private + 25(PS_OUTPUT): TypeStruct 15(fvec4) + 26: TypePointer Output 25(PS_OUTPUT) +27(@entryPointOutput): 26(ptr) Variable Output + 30: TypePointer Private 6(float) +31(precisefloat): 30(ptr) Variable Private 4(main): 2 Function None 3 5: Label 18(ps_output): 17(ptr) Variable Function 24: 23(ptr) AccessChain 18(ps_output) 20 Store 24 22 - 27:16(PS_OUTPUT) Load 18(ps_output) - Store 26(@entryPointOutput) 27 + 28:16(PS_OUTPUT) Load 18(ps_output) + Store 27(@entryPointOutput) 28 Return FunctionEnd 13(MyFunction(f1;vf3;): 2 Function None 10 diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index 413a4f0f..b8c68e74 100644 --- a/Test/baseResults/hlsl.promotions.frag.out +++ b/Test/baseResults/hlsl.promotions.frag.out @@ -498,7 +498,7 @@ gl_FragCoord origin is upper left 0:199 'outval' (temp 4-component vector of float) 0:200 Sequence 0:200 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) 0:200 'psout' (temp structure{temp 4-component vector of float Color}) 0:200 Branch: Return 0:? Linker Objects @@ -1016,7 +1016,7 @@ gl_FragCoord origin is upper left 0:199 'outval' (temp 4-component vector of float) 0:200 Sequence 0:200 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) 0:200 'psout' (temp structure{temp 4-component vector of float Color}) 0:200 Branch: Return 0:? Linker Objects @@ -1033,13 +1033,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 480 +// Id's are bound by 481 Capability Shader Capability Float64 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 477 + EntryPoint Fragment 4 "main" 478 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 11 "Fn_F3(vf3;" @@ -1128,7 +1128,10 @@ gl_FragCoord origin is upper left Name 471 "PS_OUTPUT" MemberName 471(PS_OUTPUT) 0 "Color" Name 473 "psout" - Name 477 "@entryPointOutput" + Name 476 "PS_OUTPUT" + MemberName 476(PS_OUTPUT) 0 "Color" + Name 478 "@entryPointOutput" + Decorate 478(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -1199,8 +1202,9 @@ gl_FragCoord origin is upper left 465: 6(float) Constant 1080452710 471(PS_OUTPUT): TypeStruct 462(fvec4) 472: TypePointer Function 471(PS_OUTPUT) - 476: TypePointer Output 471(PS_OUTPUT) -477(@entryPointOutput): 476(ptr) Variable Output + 476(PS_OUTPUT): TypeStruct 462(fvec4) + 477: TypePointer Output 476(PS_OUTPUT) +478(@entryPointOutput): 477(ptr) Variable Output 4(main): 2 Function None 3 5: Label 252(r00): 8(ptr) Variable Function @@ -1466,8 +1470,8 @@ gl_FragCoord origin is upper left 474: 462(fvec4) Load 464(outval) 475: 463(ptr) AccessChain 473(psout) 149 Store 475 474 - 478:471(PS_OUTPUT) Load 473(psout) - Store 477(@entryPointOutput) 478 + 479:471(PS_OUTPUT) Load 473(psout) + Store 478(@entryPointOutput) 479 Return FunctionEnd 11(Fn_F3(vf3;): 2 Function None 9 diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 5413a6f5..48c5343a 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -123,7 +123,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -267,7 +267,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -285,14 +285,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 134 +// Id's are bound by 135 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 130 + EntryPoint Fragment 4 "main" 131 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -318,8 +318,11 @@ gl_FragCoord origin is upper left MemberName 120(PS_OUTPUT) 0 "Color" MemberName 120(PS_OUTPUT) 1 "Depth" Name 122 "psout" - Name 130 "@entryPointOutput" - Name 133 "g_tTex1df4a" + Name 129 "PS_OUTPUT" + MemberName 129(PS_OUTPUT) 0 "Color" + MemberName 129(PS_OUTPUT) 1 "Depth" + Name 131 "@entryPointOutput" + Name 134 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -333,8 +336,10 @@ gl_FragCoord origin is upper left Decorate 100(g_tTexcdi4) DescriptorSet 0 Decorate 110(g_tTexcdu4) DescriptorSet 0 MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 133(g_tTex1df4a) DescriptorSet 0 - Decorate 133(g_tTex1df4a) Binding 1 + MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 131(@entryPointOutput) Location 0 + Decorate 134(g_tTex1df4a) DescriptorSet 0 + Decorate 134(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -412,9 +417,10 @@ gl_FragCoord origin is upper left 124: 7(fvec4) ConstantComposite 117 117 117 117 126: 25(int) Constant 1 127: TypePointer Function 6(float) - 129: TypePointer Output 120(PS_OUTPUT) -130(@entryPointOutput): 129(ptr) Variable Output -133(g_tTex1df4a): 11(ptr) Variable UniformConstant + 129(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 130: TypePointer Output 129(PS_OUTPUT) +131(@entryPointOutput): 130(ptr) Variable Output +134(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -476,7 +482,7 @@ gl_FragCoord origin is upper left Store 125 124 128: 127(ptr) AccessChain 122(psout) 126 Store 128 117 - 131:120(PS_OUTPUT) Load 122(psout) - Store 130(@entryPointOutput) 131 + 132:120(PS_OUTPUT) Load 122(psout) + Store 131(@entryPointOutput) 132 Return FunctionEnd diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 9cd4ebd0..ee209ec8 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -233,7 +233,7 @@ gl_FragCoord origin is upper left 0:87 1.000000 0:89 Sequence 0:89 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 Branch: Return 0:? Linker Objects @@ -490,7 +490,7 @@ gl_FragCoord origin is upper left 0:87 1.000000 0:89 Sequence 0:89 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 Branch: Return 0:? Linker Objects @@ -513,13 +513,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 186 +// Id's are bound by 187 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 181 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 7 "MemberTest" @@ -565,10 +565,13 @@ gl_FragCoord origin is upper left MemberName 171(PS_OUTPUT) 0 "Color" MemberName 171(PS_OUTPUT) 1 "Depth" Name 173 "psout" - Name 180 "@entryPointOutput" - Name 183 "g_sSamp2d" - Name 184 "g_sSamp2D_b" - Name 185 "g_tTex1df4a" + Name 179 "PS_OUTPUT" + MemberName 179(PS_OUTPUT) 0 "Color" + MemberName 179(PS_OUTPUT) 1 "Depth" + Name 181 "@entryPointOutput" + Name 184 "g_sSamp2d" + Name 185 "g_sSamp2D_b" + Name 186 "g_tTex1df4a" Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) Binding 0 Decorate 45(g_sSamp) DescriptorSet 0 @@ -585,10 +588,12 @@ gl_FragCoord origin is upper left Decorate 156(g_tTexcdi4) DescriptorSet 0 Decorate 165(g_tTexcdu4) DescriptorSet 0 MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 183(g_sSamp2d) DescriptorSet 0 - Decorate 184(g_sSamp2D_b) DescriptorSet 0 - Decorate 185(g_tTex1df4a) DescriptorSet 0 - Decorate 185(g_tTex1df4a) Binding 1 + MemberDecorate 179(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 181(@entryPointOutput) Location 0 + Decorate 184(g_sSamp2d) DescriptorSet 0 + Decorate 185(g_sSamp2D_b) DescriptorSet 0 + Decorate 186(g_tTex1df4a) DescriptorSet 0 + Decorate 186(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -688,11 +693,12 @@ gl_FragCoord origin is upper left 174: 35(float) Constant 1065353216 175: 36(fvec4) ConstantComposite 174 174 174 174 177: TypePointer Function 35(float) - 179: TypePointer Output 171(PS_OUTPUT) -180(@entryPointOutput): 179(ptr) Variable Output - 183(g_sSamp2d): 44(ptr) Variable UniformConstant -184(g_sSamp2D_b): 44(ptr) Variable UniformConstant -185(g_tTex1df4a): 40(ptr) Variable UniformConstant + 179(PS_OUTPUT): TypeStruct 36(fvec4) 35(float) + 180: TypePointer Output 179(PS_OUTPUT) +181(@entryPointOutput): 180(ptr) Variable Output + 184(g_sSamp2d): 44(ptr) Variable UniformConstant +185(g_sSamp2D_b): 44(ptr) Variable UniformConstant +186(g_tTex1df4a): 40(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(mtest): 8(ptr) Variable Function @@ -797,7 +803,7 @@ gl_FragCoord origin is upper left Store 176 175 178: 177(ptr) AccessChain 173(psout) 10 Store 178 174 - 181:171(PS_OUTPUT) Load 173(psout) - Store 180(@entryPointOutput) 181 + 182:171(PS_OUTPUT) Load 173(psout) + Store 181(@entryPointOutput) 182 Return FunctionEnd diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index d11d16f5..62aaa6f0 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -306,7 +306,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -327,13 +327,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 149 +// Id's are bound by 150 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 136 + EntryPoint Fragment 4 "main" 137 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -359,11 +359,14 @@ gl_FragCoord origin is upper left MemberName 127(PS_OUTPUT) 0 "Color" MemberName 127(PS_OUTPUT) 1 "Depth" Name 129 "psout" - Name 136 "@entryPointOutput" - Name 139 "g_tTex1df4a" - Name 142 "g_tTexcdf4" - Name 145 "g_tTexcdi4" - Name 148 "g_tTexcdu4" + Name 135 "PS_OUTPUT" + MemberName 135(PS_OUTPUT) 0 "Color" + MemberName 135(PS_OUTPUT) 1 "Depth" + Name 137 "@entryPointOutput" + Name 140 "g_tTex1df4a" + Name 143 "g_tTexcdf4" + Name 146 "g_tTexcdi4" + Name 149 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -377,11 +380,13 @@ gl_FragCoord origin is upper left Decorate 105(g_tTex3di4) DescriptorSet 0 Decorate 116(g_tTex3du4) DescriptorSet 0 MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 139(g_tTex1df4a) DescriptorSet 0 - Decorate 139(g_tTex1df4a) Binding 1 - Decorate 142(g_tTexcdf4) DescriptorSet 0 - Decorate 145(g_tTexcdi4) DescriptorSet 0 - Decorate 148(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 137(@entryPointOutput) Location 0 + Decorate 140(g_tTex1df4a) DescriptorSet 0 + Decorate 140(g_tTex1df4a) Binding 1 + Decorate 143(g_tTexcdf4) DescriptorSet 0 + Decorate 146(g_tTexcdi4) DescriptorSet 0 + Decorate 149(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -465,18 +470,19 @@ gl_FragCoord origin is upper left 130: 6(float) Constant 1065353216 131: 7(fvec4) ConstantComposite 130 130 130 130 133: TypePointer Function 6(float) - 135: TypePointer Output 127(PS_OUTPUT) -136(@entryPointOutput): 135(ptr) Variable Output -139(g_tTex1df4a): 11(ptr) Variable UniformConstant - 140: TypeImage 6(float) Cube sampled format:Unknown - 141: TypePointer UniformConstant 140 - 142(g_tTexcdf4): 141(ptr) Variable UniformConstant - 143: TypeImage 21(int) Cube sampled format:Unknown - 144: TypePointer UniformConstant 143 - 145(g_tTexcdi4): 144(ptr) Variable UniformConstant - 146: TypeImage 36(int) Cube sampled format:Unknown - 147: TypePointer UniformConstant 146 - 148(g_tTexcdu4): 147(ptr) Variable UniformConstant + 135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 136: TypePointer Output 135(PS_OUTPUT) +137(@entryPointOutput): 136(ptr) Variable Output +140(g_tTex1df4a): 11(ptr) Variable UniformConstant + 141: TypeImage 6(float) Cube sampled format:Unknown + 142: TypePointer UniformConstant 141 + 143(g_tTexcdf4): 142(ptr) Variable UniformConstant + 144: TypeImage 21(int) Cube sampled format:Unknown + 145: TypePointer UniformConstant 144 + 146(g_tTexcdi4): 145(ptr) Variable UniformConstant + 147: TypeImage 36(int) Cube sampled format:Unknown + 148: TypePointer UniformConstant 147 + 149(g_tTexcdu4): 148(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -538,7 +544,7 @@ gl_FragCoord origin is upper left Store 132 131 134: 133(ptr) AccessChain 129(psout) 22 Store 134 130 - 137:127(PS_OUTPUT) Load 129(psout) - Store 136(@entryPointOutput) 137 + 138:127(PS_OUTPUT) Load 129(psout) + Store 137(@entryPointOutput) 138 Return FunctionEnd diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index 76315296..2d031eb8 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -102,7 +102,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -222,7 +222,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -237,13 +237,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 106 +// Id's are bound by 107 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 102 + EntryPoint Fragment 4 "main" 103 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -263,8 +263,11 @@ gl_FragCoord origin is upper left MemberName 93(PS_OUTPUT) 0 "Color" MemberName 93(PS_OUTPUT) 1 "Depth" Name 95 "psout" - Name 102 "@entryPointOutput" - Name 105 "g_tTex1df4a" + Name 101 "PS_OUTPUT" + MemberName 101(PS_OUTPUT) 0 "Color" + MemberName 101(PS_OUTPUT) 1 "Depth" + Name 103 "@entryPointOutput" + Name 106 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -275,8 +278,10 @@ gl_FragCoord origin is upper left Decorate 72(g_tTex2di4) DescriptorSet 0 Decorate 83(g_tTex2du4) DescriptorSet 0 MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 105(g_tTex1df4a) DescriptorSet 0 - Decorate 105(g_tTex1df4a) Binding 1 + MemberDecorate 101(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 103(@entryPointOutput) Location 0 + Decorate 106(g_tTex1df4a) DescriptorSet 0 + Decorate 106(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -341,9 +346,10 @@ gl_FragCoord origin is upper left 96: 6(float) Constant 1065353216 97: 7(fvec4) ConstantComposite 96 96 96 96 99: TypePointer Function 6(float) - 101: TypePointer Output 93(PS_OUTPUT) -102(@entryPointOutput): 101(ptr) Variable Output -105(g_tTex1df4a): 11(ptr) Variable UniformConstant + 101(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 102: TypePointer Output 101(PS_OUTPUT) +103(@entryPointOutput): 102(ptr) Variable Output +106(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -387,7 +393,7 @@ gl_FragCoord origin is upper left Store 98 97 100: 99(ptr) AccessChain 95(psout) 39 Store 100 96 - 103:93(PS_OUTPUT) Load 95(psout) - Store 102(@entryPointOutput) 103 + 104:93(PS_OUTPUT) Load 95(psout) + Store 103(@entryPointOutput) 104 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index e735d34d..a33dd9e8 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -303,7 +303,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -321,14 +321,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 134 +// Id's are bound by 135 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 130 + EntryPoint Fragment 4 "main" 131 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -354,8 +354,11 @@ gl_FragCoord origin is upper left MemberName 120(PS_OUTPUT) 0 "Color" MemberName 120(PS_OUTPUT) 1 "Depth" Name 122 "psout" - Name 130 "@entryPointOutput" - Name 133 "g_tTex1df4a" + Name 129 "PS_OUTPUT" + MemberName 129(PS_OUTPUT) 0 "Color" + MemberName 129(PS_OUTPUT) 1 "Depth" + Name 131 "@entryPointOutput" + Name 134 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -369,8 +372,10 @@ gl_FragCoord origin is upper left Decorate 100(g_tTexcdi4) DescriptorSet 0 Decorate 110(g_tTexcdu4) DescriptorSet 0 MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 133(g_tTex1df4a) DescriptorSet 0 - Decorate 133(g_tTex1df4a) Binding 1 + MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 131(@entryPointOutput) Location 0 + Decorate 134(g_tTex1df4a) DescriptorSet 0 + Decorate 134(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -448,9 +453,10 @@ gl_FragCoord origin is upper left 124: 7(fvec4) ConstantComposite 117 117 117 117 126: 26(int) Constant 1 127: TypePointer Function 6(float) - 129: TypePointer Output 120(PS_OUTPUT) -130(@entryPointOutput): 129(ptr) Variable Output -133(g_tTex1df4a): 11(ptr) Variable UniformConstant + 129(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 130: TypePointer Output 129(PS_OUTPUT) +131(@entryPointOutput): 130(ptr) Variable Output +134(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -512,7 +518,7 @@ gl_FragCoord origin is upper left Store 125 124 128: 127(ptr) AccessChain 122(psout) 126 Store 128 117 - 131:120(PS_OUTPUT) Load 122(psout) - Store 130(@entryPointOutput) 131 + 132:120(PS_OUTPUT) Load 122(psout) + Store 131(@entryPointOutput) 132 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index d61eda9d..076bfff3 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -171,7 +171,7 @@ gl_FragCoord origin is upper left 0:48 1.000000 0:50 Sequence 0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -366,7 +366,7 @@ gl_FragCoord origin is upper left 0:48 1.000000 0:50 Sequence 0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -387,13 +387,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 158 +// Id's are bound by 159 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 154 + EntryPoint Fragment 4 "main" 155 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -425,8 +425,11 @@ gl_FragCoord origin is upper left MemberName 143(PS_OUTPUT) 0 "Color" MemberName 143(PS_OUTPUT) 1 "Depth" Name 145 "psout" - Name 154 "@entryPointOutput" - Name 157 "g_tTex1df4a" + Name 153 "PS_OUTPUT" + MemberName 153(PS_OUTPUT) 0 "Color" + MemberName 153(PS_OUTPUT) 1 "Depth" + Name 155 "@entryPointOutput" + Name 158 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -443,8 +446,10 @@ gl_FragCoord origin is upper left Decorate 128(g_tTexcdi4) DescriptorSet 0 Decorate 137(g_tTexcdu4) DescriptorSet 0 MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 157(g_tTex1df4a) DescriptorSet 0 - Decorate 157(g_tTex1df4a) Binding 1 + MemberDecorate 153(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 155(@entryPointOutput) Location 0 + Decorate 158(g_tTex1df4a) DescriptorSet 0 + Decorate 158(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -531,9 +536,10 @@ gl_FragCoord origin is upper left 148: 7(fvec4) ConstantComposite 147 147 147 147 150: 23(int) Constant 1 151: TypePointer Function 6(float) - 153: TypePointer Output 143(PS_OUTPUT) -154(@entryPointOutput): 153(ptr) Variable Output -157(g_tTex1df4a): 11(ptr) Variable UniformConstant + 153(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 154: TypePointer Output 153(PS_OUTPUT) +155(@entryPointOutput): 154(ptr) Variable Output +158(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -613,7 +619,7 @@ gl_FragCoord origin is upper left Store 149 148 152: 151(ptr) AccessChain 145(psout) 150 Store 152 147 - 155:143(PS_OUTPUT) Load 145(psout) - Store 154(@entryPointOutput) 155 + 156:143(PS_OUTPUT) Load 145(psout) + Store 155(@entryPointOutput) 156 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index b2e77efc..10281a86 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -159,7 +159,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -342,7 +342,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -363,13 +363,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 149 +// Id's are bound by 150 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 136 + EntryPoint Fragment 4 "main" 137 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -395,11 +395,14 @@ gl_FragCoord origin is upper left MemberName 127(PS_OUTPUT) 0 "Color" MemberName 127(PS_OUTPUT) 1 "Depth" Name 129 "psout" - Name 136 "@entryPointOutput" - Name 139 "g_tTex1df4a" - Name 142 "g_tTexcdf4" - Name 145 "g_tTexcdi4" - Name 148 "g_tTexcdu4" + Name 135 "PS_OUTPUT" + MemberName 135(PS_OUTPUT) 0 "Color" + MemberName 135(PS_OUTPUT) 1 "Depth" + Name 137 "@entryPointOutput" + Name 140 "g_tTex1df4a" + Name 143 "g_tTexcdf4" + Name 146 "g_tTexcdi4" + Name 149 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -413,11 +416,13 @@ gl_FragCoord origin is upper left Decorate 105(g_tTex3di4) DescriptorSet 0 Decorate 116(g_tTex3du4) DescriptorSet 0 MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 139(g_tTex1df4a) DescriptorSet 0 - Decorate 139(g_tTex1df4a) Binding 1 - Decorate 142(g_tTexcdf4) DescriptorSet 0 - Decorate 145(g_tTexcdi4) DescriptorSet 0 - Decorate 148(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 137(@entryPointOutput) Location 0 + Decorate 140(g_tTex1df4a) DescriptorSet 0 + Decorate 140(g_tTex1df4a) Binding 1 + Decorate 143(g_tTexcdf4) DescriptorSet 0 + Decorate 146(g_tTexcdi4) DescriptorSet 0 + Decorate 149(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -501,18 +506,19 @@ gl_FragCoord origin is upper left 130: 6(float) Constant 1065353216 131: 7(fvec4) ConstantComposite 130 130 130 130 133: TypePointer Function 6(float) - 135: TypePointer Output 127(PS_OUTPUT) -136(@entryPointOutput): 135(ptr) Variable Output -139(g_tTex1df4a): 11(ptr) Variable UniformConstant - 140: TypeImage 6(float) Cube sampled format:Unknown - 141: TypePointer UniformConstant 140 - 142(g_tTexcdf4): 141(ptr) Variable UniformConstant - 143: TypeImage 22(int) Cube sampled format:Unknown - 144: TypePointer UniformConstant 143 - 145(g_tTexcdi4): 144(ptr) Variable UniformConstant - 146: TypeImage 37(int) Cube sampled format:Unknown - 147: TypePointer UniformConstant 146 - 148(g_tTexcdu4): 147(ptr) Variable UniformConstant + 135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 136: TypePointer Output 135(PS_OUTPUT) +137(@entryPointOutput): 136(ptr) Variable Output +140(g_tTex1df4a): 11(ptr) Variable UniformConstant + 141: TypeImage 6(float) Cube sampled format:Unknown + 142: TypePointer UniformConstant 141 + 143(g_tTexcdf4): 142(ptr) Variable UniformConstant + 144: TypeImage 22(int) Cube sampled format:Unknown + 145: TypePointer UniformConstant 144 + 146(g_tTexcdi4): 145(ptr) Variable UniformConstant + 147: TypeImage 37(int) Cube sampled format:Unknown + 148: TypePointer UniformConstant 147 + 149(g_tTexcdu4): 148(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -574,7 +580,7 @@ gl_FragCoord origin is upper left Store 132 131 134: 133(ptr) AccessChain 129(psout) 23 Store 134 130 - 137:127(PS_OUTPUT) Load 129(psout) - Store 136(@entryPointOutput) 137 + 138:127(PS_OUTPUT) Load 129(psout) + Store 137(@entryPointOutput) 138 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 52263c49..c33e8dc4 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -246,7 +246,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -261,13 +261,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 106 +// Id's are bound by 107 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 102 + EntryPoint Fragment 4 "main" 103 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -287,8 +287,11 @@ gl_FragCoord origin is upper left MemberName 93(PS_OUTPUT) 0 "Color" MemberName 93(PS_OUTPUT) 1 "Depth" Name 95 "psout" - Name 102 "@entryPointOutput" - Name 105 "g_tTex1df4a" + Name 101 "PS_OUTPUT" + MemberName 101(PS_OUTPUT) 0 "Color" + MemberName 101(PS_OUTPUT) 1 "Depth" + Name 103 "@entryPointOutput" + Name 106 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -299,8 +302,10 @@ gl_FragCoord origin is upper left Decorate 73(g_tTex2di4) DescriptorSet 0 Decorate 83(g_tTex2du4) DescriptorSet 0 MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 105(g_tTex1df4a) DescriptorSet 0 - Decorate 105(g_tTex1df4a) Binding 1 + MemberDecorate 101(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 103(@entryPointOutput) Location 0 + Decorate 106(g_tTex1df4a) DescriptorSet 0 + Decorate 106(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -365,9 +370,10 @@ gl_FragCoord origin is upper left 96: 6(float) Constant 1065353216 97: 7(fvec4) ConstantComposite 96 96 96 96 99: TypePointer Function 6(float) - 101: TypePointer Output 93(PS_OUTPUT) -102(@entryPointOutput): 101(ptr) Variable Output -105(g_tTex1df4a): 11(ptr) Variable UniformConstant + 101(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 102: TypePointer Output 101(PS_OUTPUT) +103(@entryPointOutput): 102(ptr) Variable Output +106(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -411,7 +417,7 @@ gl_FragCoord origin is upper left Store 98 97 100: 99(ptr) AccessChain 95(psout) 40 Store 100 96 - 103:93(PS_OUTPUT) Load 95(psout) - Store 102(@entryPointOutput) 103 + 104:93(PS_OUTPUT) Load 95(psout) + Store 103(@entryPointOutput) 104 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index a61aa29b..c3c15f01 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:57 1.000000 0:59 Sequence 0:59 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -332,7 +332,7 @@ gl_FragCoord origin is upper left 0:57 1.000000 0:59 Sequence 0:59 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -361,14 +361,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 179 +// Id's are bound by 180 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 140 + EntryPoint Fragment 4 "main" 141 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r10" @@ -394,19 +394,22 @@ gl_FragCoord origin is upper left MemberName 129(PS_OUTPUT) 0 "Color" MemberName 129(PS_OUTPUT) 1 "Depth" Name 131 "psout" - Name 140 "@entryPointOutput" - Name 145 "g_tTex1df4" - Name 148 "g_tTex1di4" - Name 151 "g_tTex1du4" - Name 154 "g_tTex2df4" - Name 157 "g_tTex2di4" - Name 160 "g_tTex2du4" - Name 163 "g_tTex3df4" - Name 166 "g_tTex3di4" - Name 169 "g_tTex3du4" - Name 172 "g_tTexcdf4" - Name 175 "g_tTexcdi4" - Name 178 "g_tTexcdu4" + Name 139 "PS_OUTPUT" + MemberName 139(PS_OUTPUT) 0 "Color" + MemberName 139(PS_OUTPUT) 1 "Depth" + Name 141 "@entryPointOutput" + Name 146 "g_tTex1df4" + Name 149 "g_tTex1di4" + Name 152 "g_tTex1du4" + Name 155 "g_tTex2df4" + Name 158 "g_tTex2di4" + Name 161 "g_tTex2du4" + Name 164 "g_tTex3df4" + Name 167 "g_tTex3di4" + Name 170 "g_tTex3du4" + Name 173 "g_tTexcdf4" + Name 176 "g_tTexcdi4" + Name 179 "g_tTexcdu4" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -419,19 +422,21 @@ gl_FragCoord origin is upper left Decorate 110(g_tTexcdi4a) DescriptorSet 0 Decorate 121(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 145(g_tTex1df4) DescriptorSet 0 - Decorate 145(g_tTex1df4) Binding 0 - Decorate 148(g_tTex1di4) DescriptorSet 0 - Decorate 151(g_tTex1du4) DescriptorSet 0 - Decorate 154(g_tTex2df4) DescriptorSet 0 - Decorate 157(g_tTex2di4) DescriptorSet 0 - Decorate 160(g_tTex2du4) DescriptorSet 0 - Decorate 163(g_tTex3df4) DescriptorSet 0 - Decorate 166(g_tTex3di4) DescriptorSet 0 - Decorate 169(g_tTex3du4) DescriptorSet 0 - Decorate 172(g_tTexcdf4) DescriptorSet 0 - Decorate 175(g_tTexcdi4) DescriptorSet 0 - Decorate 178(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 139(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 141(@entryPointOutput) Location 0 + Decorate 146(g_tTex1df4) DescriptorSet 0 + Decorate 146(g_tTex1df4) Binding 0 + Decorate 149(g_tTex1di4) DescriptorSet 0 + Decorate 152(g_tTex1du4) DescriptorSet 0 + Decorate 155(g_tTex2df4) DescriptorSet 0 + Decorate 158(g_tTex2di4) DescriptorSet 0 + Decorate 161(g_tTex2du4) DescriptorSet 0 + Decorate 164(g_tTex3df4) DescriptorSet 0 + Decorate 167(g_tTex3di4) DescriptorSet 0 + Decorate 170(g_tTex3du4) DescriptorSet 0 + Decorate 173(g_tTexcdf4) DescriptorSet 0 + Decorate 176(g_tTexcdi4) DescriptorSet 0 + Decorate 179(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -504,44 +509,45 @@ gl_FragCoord origin is upper left 134: 102(fvec4) ConstantComposite 133 133 133 133 135: TypePointer Function 102(fvec4) 137: 29(int) Constant 1 - 139: TypePointer Output 129(PS_OUTPUT) -140(@entryPointOutput): 139(ptr) Variable Output - 143: TypeImage 6(float) 1D sampled format:Unknown - 144: TypePointer UniformConstant 143 - 145(g_tTex1df4): 144(ptr) Variable UniformConstant - 146: TypeImage 29(int) 1D sampled format:Unknown - 147: TypePointer UniformConstant 146 - 148(g_tTex1di4): 147(ptr) Variable UniformConstant - 149: TypeImage 42(int) 1D sampled format:Unknown - 150: TypePointer UniformConstant 149 - 151(g_tTex1du4): 150(ptr) Variable UniformConstant - 152: TypeImage 6(float) 2D sampled format:Unknown - 153: TypePointer UniformConstant 152 - 154(g_tTex2df4): 153(ptr) Variable UniformConstant - 155: TypeImage 29(int) 2D sampled format:Unknown - 156: TypePointer UniformConstant 155 - 157(g_tTex2di4): 156(ptr) Variable UniformConstant - 158: TypeImage 42(int) 2D sampled format:Unknown - 159: TypePointer UniformConstant 158 - 160(g_tTex2du4): 159(ptr) Variable UniformConstant - 161: TypeImage 6(float) 3D sampled format:Unknown - 162: TypePointer UniformConstant 161 - 163(g_tTex3df4): 162(ptr) Variable UniformConstant - 164: TypeImage 29(int) 3D sampled format:Unknown - 165: TypePointer UniformConstant 164 - 166(g_tTex3di4): 165(ptr) Variable UniformConstant - 167: TypeImage 42(int) 3D sampled format:Unknown - 168: TypePointer UniformConstant 167 - 169(g_tTex3du4): 168(ptr) Variable UniformConstant - 170: TypeImage 6(float) Cube sampled format:Unknown - 171: TypePointer UniformConstant 170 - 172(g_tTexcdf4): 171(ptr) Variable UniformConstant - 173: TypeImage 29(int) Cube sampled format:Unknown - 174: TypePointer UniformConstant 173 - 175(g_tTexcdi4): 174(ptr) Variable UniformConstant - 176: TypeImage 42(int) Cube sampled format:Unknown - 177: TypePointer UniformConstant 176 - 178(g_tTexcdu4): 177(ptr) Variable UniformConstant + 139(PS_OUTPUT): TypeStruct 102(fvec4) 6(float) + 140: TypePointer Output 139(PS_OUTPUT) +141(@entryPointOutput): 140(ptr) Variable Output + 144: TypeImage 6(float) 1D sampled format:Unknown + 145: TypePointer UniformConstant 144 + 146(g_tTex1df4): 145(ptr) Variable UniformConstant + 147: TypeImage 29(int) 1D sampled format:Unknown + 148: TypePointer UniformConstant 147 + 149(g_tTex1di4): 148(ptr) Variable UniformConstant + 150: TypeImage 42(int) 1D sampled format:Unknown + 151: TypePointer UniformConstant 150 + 152(g_tTex1du4): 151(ptr) Variable UniformConstant + 153: TypeImage 6(float) 2D sampled format:Unknown + 154: TypePointer UniformConstant 153 + 155(g_tTex2df4): 154(ptr) Variable UniformConstant + 156: TypeImage 29(int) 2D sampled format:Unknown + 157: TypePointer UniformConstant 156 + 158(g_tTex2di4): 157(ptr) Variable UniformConstant + 159: TypeImage 42(int) 2D sampled format:Unknown + 160: TypePointer UniformConstant 159 + 161(g_tTex2du4): 160(ptr) Variable UniformConstant + 162: TypeImage 6(float) 3D sampled format:Unknown + 163: TypePointer UniformConstant 162 + 164(g_tTex3df4): 163(ptr) Variable UniformConstant + 165: TypeImage 29(int) 3D sampled format:Unknown + 166: TypePointer UniformConstant 165 + 167(g_tTex3di4): 166(ptr) Variable UniformConstant + 168: TypeImage 42(int) 3D sampled format:Unknown + 169: TypePointer UniformConstant 168 + 170(g_tTex3du4): 169(ptr) Variable UniformConstant + 171: TypeImage 6(float) Cube sampled format:Unknown + 172: TypePointer UniformConstant 171 + 173(g_tTexcdf4): 172(ptr) Variable UniformConstant + 174: TypeImage 29(int) Cube sampled format:Unknown + 175: TypePointer UniformConstant 174 + 176(g_tTexcdi4): 175(ptr) Variable UniformConstant + 177: TypeImage 42(int) Cube sampled format:Unknown + 178: TypePointer UniformConstant 177 + 179(g_tTexcdu4): 178(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r10): 7(ptr) Variable Function @@ -618,7 +624,7 @@ gl_FragCoord origin is upper left Store 136 134 138: 7(ptr) AccessChain 131(psout) 137 Store 138 133 - 141:129(PS_OUTPUT) Load 131(psout) - Store 140(@entryPointOutput) 141 + 142:129(PS_OUTPUT) Load 131(psout) + Store 141(@entryPointOutput) 142 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index 93fe73cf..4cab81cc 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:58 1.000000 0:60 Sequence 0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -314,7 +314,7 @@ gl_FragCoord origin is upper left 0:58 1.000000 0:60 Sequence 0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -343,14 +343,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 177 +// Id's are bound by 178 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 138 + EntryPoint Fragment 4 "main" 139 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -376,19 +376,22 @@ gl_FragCoord origin is upper left MemberName 127(PS_OUTPUT) 0 "Color" MemberName 127(PS_OUTPUT) 1 "Depth" Name 129 "psout" - Name 138 "@entryPointOutput" - Name 143 "g_tTex3df4" - Name 146 "g_tTex3di4" - Name 149 "g_tTex3du4" - Name 152 "g_tTex1df4a" - Name 155 "g_tTex1di4a" - Name 158 "g_tTex1du4a" - Name 161 "g_tTex2df4a" - Name 164 "g_tTex2di4a" - Name 167 "g_tTex2du4a" - Name 170 "g_tTexcdf4a" - Name 173 "g_tTexcdi4a" - Name 176 "g_tTexcdu4a" + Name 137 "PS_OUTPUT" + MemberName 137(PS_OUTPUT) 0 "Color" + MemberName 137(PS_OUTPUT) 1 "Depth" + Name 139 "@entryPointOutput" + Name 144 "g_tTex3df4" + Name 147 "g_tTex3di4" + Name 150 "g_tTex3du4" + Name 153 "g_tTex1df4a" + Name 156 "g_tTex1di4a" + Name 159 "g_tTex1du4a" + Name 162 "g_tTex2df4a" + Name 165 "g_tTex2di4a" + Name 168 "g_tTex2du4a" + Name 171 "g_tTexcdf4a" + Name 174 "g_tTexcdi4a" + Name 177 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -402,18 +405,20 @@ gl_FragCoord origin is upper left Decorate 105(g_tTexcdi4) DescriptorSet 0 Decorate 117(g_tTexcdu4) DescriptorSet 0 MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 143(g_tTex3df4) DescriptorSet 0 - Decorate 146(g_tTex3di4) DescriptorSet 0 - Decorate 149(g_tTex3du4) DescriptorSet 0 - Decorate 152(g_tTex1df4a) DescriptorSet 0 - Decorate 155(g_tTex1di4a) DescriptorSet 0 - Decorate 158(g_tTex1du4a) DescriptorSet 0 - Decorate 161(g_tTex2df4a) DescriptorSet 0 - Decorate 164(g_tTex2di4a) DescriptorSet 0 - Decorate 167(g_tTex2du4a) DescriptorSet 0 - Decorate 170(g_tTexcdf4a) DescriptorSet 0 - Decorate 173(g_tTexcdi4a) DescriptorSet 0 - Decorate 176(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 137(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 139(@entryPointOutput) Location 0 + Decorate 144(g_tTex3df4) DescriptorSet 0 + Decorate 147(g_tTex3di4) DescriptorSet 0 + Decorate 150(g_tTex3du4) DescriptorSet 0 + Decorate 153(g_tTex1df4a) DescriptorSet 0 + Decorate 156(g_tTex1di4a) DescriptorSet 0 + Decorate 159(g_tTex1du4a) DescriptorSet 0 + Decorate 162(g_tTex2df4a) DescriptorSet 0 + Decorate 165(g_tTex2di4a) DescriptorSet 0 + Decorate 168(g_tTex2du4a) DescriptorSet 0 + Decorate 171(g_tTexcdf4a) DescriptorSet 0 + Decorate 174(g_tTexcdi4a) DescriptorSet 0 + Decorate 177(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -484,44 +489,45 @@ gl_FragCoord origin is upper left 132: 126(fvec4) ConstantComposite 131 131 131 131 133: TypePointer Function 126(fvec4) 135: 25(int) Constant 1 - 137: TypePointer Output 127(PS_OUTPUT) -138(@entryPointOutput): 137(ptr) Variable Output - 141: TypeImage 6(float) 3D sampled format:Unknown - 142: TypePointer UniformConstant 141 - 143(g_tTex3df4): 142(ptr) Variable UniformConstant - 144: TypeImage 25(int) 3D sampled format:Unknown - 145: TypePointer UniformConstant 144 - 146(g_tTex3di4): 145(ptr) Variable UniformConstant - 147: TypeImage 37(int) 3D sampled format:Unknown - 148: TypePointer UniformConstant 147 - 149(g_tTex3du4): 148(ptr) Variable UniformConstant - 150: TypeImage 6(float) 1D array sampled format:Unknown - 151: TypePointer UniformConstant 150 -152(g_tTex1df4a): 151(ptr) Variable UniformConstant - 153: TypeImage 25(int) 1D array sampled format:Unknown - 154: TypePointer UniformConstant 153 -155(g_tTex1di4a): 154(ptr) Variable UniformConstant - 156: TypeImage 37(int) 1D array sampled format:Unknown - 157: TypePointer UniformConstant 156 -158(g_tTex1du4a): 157(ptr) Variable UniformConstant - 159: TypeImage 6(float) 2D array sampled format:Unknown - 160: TypePointer UniformConstant 159 -161(g_tTex2df4a): 160(ptr) Variable UniformConstant - 162: TypeImage 25(int) 2D array sampled format:Unknown - 163: TypePointer UniformConstant 162 -164(g_tTex2di4a): 163(ptr) Variable UniformConstant - 165: TypeImage 37(int) 2D array sampled format:Unknown - 166: TypePointer UniformConstant 165 -167(g_tTex2du4a): 166(ptr) Variable UniformConstant - 168: TypeImage 6(float) Cube array sampled format:Unknown - 169: TypePointer UniformConstant 168 -170(g_tTexcdf4a): 169(ptr) Variable UniformConstant - 171: TypeImage 25(int) Cube array sampled format:Unknown - 172: TypePointer UniformConstant 171 -173(g_tTexcdi4a): 172(ptr) Variable UniformConstant - 174: TypeImage 37(int) Cube array sampled format:Unknown - 175: TypePointer UniformConstant 174 -176(g_tTexcdu4a): 175(ptr) Variable UniformConstant + 137(PS_OUTPUT): TypeStruct 126(fvec4) 6(float) + 138: TypePointer Output 137(PS_OUTPUT) +139(@entryPointOutput): 138(ptr) Variable Output + 142: TypeImage 6(float) 3D sampled format:Unknown + 143: TypePointer UniformConstant 142 + 144(g_tTex3df4): 143(ptr) Variable UniformConstant + 145: TypeImage 25(int) 3D sampled format:Unknown + 146: TypePointer UniformConstant 145 + 147(g_tTex3di4): 146(ptr) Variable UniformConstant + 148: TypeImage 37(int) 3D sampled format:Unknown + 149: TypePointer UniformConstant 148 + 150(g_tTex3du4): 149(ptr) Variable UniformConstant + 151: TypeImage 6(float) 1D array sampled format:Unknown + 152: TypePointer UniformConstant 151 +153(g_tTex1df4a): 152(ptr) Variable UniformConstant + 154: TypeImage 25(int) 1D array sampled format:Unknown + 155: TypePointer UniformConstant 154 +156(g_tTex1di4a): 155(ptr) Variable UniformConstant + 157: TypeImage 37(int) 1D array sampled format:Unknown + 158: TypePointer UniformConstant 157 +159(g_tTex1du4a): 158(ptr) Variable UniformConstant + 160: TypeImage 6(float) 2D array sampled format:Unknown + 161: TypePointer UniformConstant 160 +162(g_tTex2df4a): 161(ptr) Variable UniformConstant + 163: TypeImage 25(int) 2D array sampled format:Unknown + 164: TypePointer UniformConstant 163 +165(g_tTex2di4a): 164(ptr) Variable UniformConstant + 166: TypeImage 37(int) 2D array sampled format:Unknown + 167: TypePointer UniformConstant 166 +168(g_tTex2du4a): 167(ptr) Variable UniformConstant + 169: TypeImage 6(float) Cube array sampled format:Unknown + 170: TypePointer UniformConstant 169 +171(g_tTexcdf4a): 170(ptr) Variable UniformConstant + 172: TypeImage 25(int) Cube array sampled format:Unknown + 173: TypePointer UniformConstant 172 +174(g_tTexcdi4a): 173(ptr) Variable UniformConstant + 175: TypeImage 37(int) Cube array sampled format:Unknown + 176: TypePointer UniformConstant 175 +177(g_tTexcdu4a): 176(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function @@ -598,7 +604,7 @@ gl_FragCoord origin is upper left Store 134 132 136: 7(ptr) AccessChain 129(psout) 135 Store 136 131 - 139:127(PS_OUTPUT) Load 129(psout) - Store 138(@entryPointOutput) 139 + 140:127(PS_OUTPUT) Load 129(psout) + Store 139(@entryPointOutput) 140 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index 71eb5206..0ebe3e5f 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:63 1.000000 0:65 Sequence 0:65 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:63 1.000000 0:65 Sequence 0:65 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -289,14 +289,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 151 +// Id's are bound by 152 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 103 + EntryPoint Fragment 4 "main" 104 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r01" @@ -316,22 +316,25 @@ gl_FragCoord origin is upper left MemberName 92(PS_OUTPUT) 0 "Color" MemberName 92(PS_OUTPUT) 1 "Depth" Name 94 "psout" - Name 103 "@entryPointOutput" - Name 108 "g_tTex3df4" - Name 111 "g_tTex3di4" - Name 114 "g_tTex3du4" - Name 117 "g_tTexcdf4" - Name 120 "g_tTexcdi4" - Name 123 "g_tTexcdu4" - Name 126 "g_tTex1df4a" - Name 129 "g_tTex1di4a" - Name 132 "g_tTex1du4a" - Name 135 "g_tTex2df4a" - Name 138 "g_tTex2di4a" - Name 141 "g_tTex2du4a" - Name 144 "g_tTexcdf4a" - Name 147 "g_tTexcdi4a" - Name 150 "g_tTexcdu4a" + Name 102 "PS_OUTPUT" + MemberName 102(PS_OUTPUT) 0 "Color" + MemberName 102(PS_OUTPUT) 1 "Depth" + Name 104 "@entryPointOutput" + Name 109 "g_tTex3df4" + Name 112 "g_tTex3di4" + Name 115 "g_tTex3du4" + Name 118 "g_tTexcdf4" + Name 121 "g_tTexcdi4" + Name 124 "g_tTexcdu4" + Name 127 "g_tTex1df4a" + Name 130 "g_tTex1di4a" + Name 133 "g_tTex1du4a" + Name 136 "g_tTex2df4a" + Name 139 "g_tTex2di4a" + Name 142 "g_tTex2du4a" + Name 145 "g_tTexcdf4a" + Name 148 "g_tTexcdi4a" + Name 151 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -342,21 +345,23 @@ gl_FragCoord origin is upper left Decorate 70(g_tTex2di4) DescriptorSet 0 Decorate 82(g_tTex2du4) DescriptorSet 0 MemberDecorate 92(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 108(g_tTex3df4) DescriptorSet 0 - Decorate 111(g_tTex3di4) DescriptorSet 0 - Decorate 114(g_tTex3du4) DescriptorSet 0 - Decorate 117(g_tTexcdf4) DescriptorSet 0 - Decorate 120(g_tTexcdi4) DescriptorSet 0 - Decorate 123(g_tTexcdu4) DescriptorSet 0 - Decorate 126(g_tTex1df4a) DescriptorSet 0 - Decorate 129(g_tTex1di4a) DescriptorSet 0 - Decorate 132(g_tTex1du4a) DescriptorSet 0 - Decorate 135(g_tTex2df4a) DescriptorSet 0 - Decorate 138(g_tTex2di4a) DescriptorSet 0 - Decorate 141(g_tTex2du4a) DescriptorSet 0 - Decorate 144(g_tTexcdf4a) DescriptorSet 0 - Decorate 147(g_tTexcdi4a) DescriptorSet 0 - Decorate 150(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 102(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 104(@entryPointOutput) Location 0 + Decorate 109(g_tTex3df4) DescriptorSet 0 + Decorate 112(g_tTex3di4) DescriptorSet 0 + Decorate 115(g_tTex3du4) DescriptorSet 0 + Decorate 118(g_tTexcdf4) DescriptorSet 0 + Decorate 121(g_tTexcdi4) DescriptorSet 0 + Decorate 124(g_tTexcdu4) DescriptorSet 0 + Decorate 127(g_tTex1df4a) DescriptorSet 0 + Decorate 130(g_tTex1di4a) DescriptorSet 0 + Decorate 133(g_tTex1du4a) DescriptorSet 0 + Decorate 136(g_tTex2df4a) DescriptorSet 0 + Decorate 139(g_tTex2di4a) DescriptorSet 0 + Decorate 142(g_tTex2du4a) DescriptorSet 0 + Decorate 145(g_tTexcdf4a) DescriptorSet 0 + Decorate 148(g_tTexcdi4a) DescriptorSet 0 + Decorate 151(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -413,53 +418,54 @@ gl_FragCoord origin is upper left 97: 91(fvec4) ConstantComposite 96 96 96 96 98: TypePointer Function 91(fvec4) 100: 22(int) Constant 1 - 102: TypePointer Output 92(PS_OUTPUT) -103(@entryPointOutput): 102(ptr) Variable Output - 106: TypeImage 6(float) 3D sampled format:Unknown - 107: TypePointer UniformConstant 106 - 108(g_tTex3df4): 107(ptr) Variable UniformConstant - 109: TypeImage 22(int) 3D sampled format:Unknown - 110: TypePointer UniformConstant 109 - 111(g_tTex3di4): 110(ptr) Variable UniformConstant - 112: TypeImage 38(int) 3D sampled format:Unknown - 113: TypePointer UniformConstant 112 - 114(g_tTex3du4): 113(ptr) Variable UniformConstant - 115: TypeImage 6(float) Cube sampled format:Unknown - 116: TypePointer UniformConstant 115 - 117(g_tTexcdf4): 116(ptr) Variable UniformConstant - 118: TypeImage 22(int) Cube sampled format:Unknown - 119: TypePointer UniformConstant 118 - 120(g_tTexcdi4): 119(ptr) Variable UniformConstant - 121: TypeImage 38(int) Cube sampled format:Unknown - 122: TypePointer UniformConstant 121 - 123(g_tTexcdu4): 122(ptr) Variable UniformConstant - 124: TypeImage 6(float) 1D array sampled format:Unknown - 125: TypePointer UniformConstant 124 -126(g_tTex1df4a): 125(ptr) Variable UniformConstant - 127: TypeImage 22(int) 1D array sampled format:Unknown - 128: TypePointer UniformConstant 127 -129(g_tTex1di4a): 128(ptr) Variable UniformConstant - 130: TypeImage 38(int) 1D array sampled format:Unknown - 131: TypePointer UniformConstant 130 -132(g_tTex1du4a): 131(ptr) Variable UniformConstant - 133: TypeImage 6(float) 2D array sampled format:Unknown - 134: TypePointer UniformConstant 133 -135(g_tTex2df4a): 134(ptr) Variable UniformConstant - 136: TypeImage 22(int) 2D array sampled format:Unknown - 137: TypePointer UniformConstant 136 -138(g_tTex2di4a): 137(ptr) Variable UniformConstant - 139: TypeImage 38(int) 2D array sampled format:Unknown - 140: TypePointer UniformConstant 139 -141(g_tTex2du4a): 140(ptr) Variable UniformConstant - 142: TypeImage 6(float) Cube array sampled format:Unknown - 143: TypePointer UniformConstant 142 -144(g_tTexcdf4a): 143(ptr) Variable UniformConstant - 145: TypeImage 22(int) Cube array sampled format:Unknown - 146: TypePointer UniformConstant 145 -147(g_tTexcdi4a): 146(ptr) Variable UniformConstant - 148: TypeImage 38(int) Cube array sampled format:Unknown - 149: TypePointer UniformConstant 148 -150(g_tTexcdu4a): 149(ptr) Variable UniformConstant + 102(PS_OUTPUT): TypeStruct 91(fvec4) 6(float) + 103: TypePointer Output 102(PS_OUTPUT) +104(@entryPointOutput): 103(ptr) Variable Output + 107: TypeImage 6(float) 3D sampled format:Unknown + 108: TypePointer UniformConstant 107 + 109(g_tTex3df4): 108(ptr) Variable UniformConstant + 110: TypeImage 22(int) 3D sampled format:Unknown + 111: TypePointer UniformConstant 110 + 112(g_tTex3di4): 111(ptr) Variable UniformConstant + 113: TypeImage 38(int) 3D sampled format:Unknown + 114: TypePointer UniformConstant 113 + 115(g_tTex3du4): 114(ptr) Variable UniformConstant + 116: TypeImage 6(float) Cube sampled format:Unknown + 117: TypePointer UniformConstant 116 + 118(g_tTexcdf4): 117(ptr) Variable UniformConstant + 119: TypeImage 22(int) Cube sampled format:Unknown + 120: TypePointer UniformConstant 119 + 121(g_tTexcdi4): 120(ptr) Variable UniformConstant + 122: TypeImage 38(int) Cube sampled format:Unknown + 123: TypePointer UniformConstant 122 + 124(g_tTexcdu4): 123(ptr) Variable UniformConstant + 125: TypeImage 6(float) 1D array sampled format:Unknown + 126: TypePointer UniformConstant 125 +127(g_tTex1df4a): 126(ptr) Variable UniformConstant + 128: TypeImage 22(int) 1D array sampled format:Unknown + 129: TypePointer UniformConstant 128 +130(g_tTex1di4a): 129(ptr) Variable UniformConstant + 131: TypeImage 38(int) 1D array sampled format:Unknown + 132: TypePointer UniformConstant 131 +133(g_tTex1du4a): 132(ptr) Variable UniformConstant + 134: TypeImage 6(float) 2D array sampled format:Unknown + 135: TypePointer UniformConstant 134 +136(g_tTex2df4a): 135(ptr) Variable UniformConstant + 137: TypeImage 22(int) 2D array sampled format:Unknown + 138: TypePointer UniformConstant 137 +139(g_tTex2di4a): 138(ptr) Variable UniformConstant + 140: TypeImage 38(int) 2D array sampled format:Unknown + 141: TypePointer UniformConstant 140 +142(g_tTex2du4a): 141(ptr) Variable UniformConstant + 143: TypeImage 6(float) Cube array sampled format:Unknown + 144: TypePointer UniformConstant 143 +145(g_tTexcdf4a): 144(ptr) Variable UniformConstant + 146: TypeImage 22(int) Cube array sampled format:Unknown + 147: TypePointer UniformConstant 146 +148(g_tTexcdi4a): 147(ptr) Variable UniformConstant + 149: TypeImage 38(int) Cube array sampled format:Unknown + 150: TypePointer UniformConstant 149 +151(g_tTexcdu4a): 150(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r01): 7(ptr) Variable Function @@ -512,7 +518,7 @@ gl_FragCoord origin is upper left Store 99 97 101: 7(ptr) AccessChain 94(psout) 100 Store 101 96 - 104:92(PS_OUTPUT) Load 94(psout) - Store 103(@entryPointOutput) 104 + 105:92(PS_OUTPUT) Load 94(psout) + Store 104(@entryPointOutput) 105 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index c2cdb4d6..63b74a38 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -120,7 +120,7 @@ gl_FragCoord origin is upper left 0:64 1.000000 0:66 Sequence 0:66 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -272,7 +272,7 @@ gl_FragCoord origin is upper left 0:64 1.000000 0:66 Sequence 0:66 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -301,14 +301,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 157 +// Id's are bound by 158 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 109 + EntryPoint Fragment 4 "main" 110 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r11" @@ -328,22 +328,25 @@ gl_FragCoord origin is upper left MemberName 98(PS_OUTPUT) 0 "Color" MemberName 98(PS_OUTPUT) 1 "Depth" Name 100 "psout" - Name 109 "@entryPointOutput" - Name 114 "g_tTex1df4" - Name 117 "g_tTex1di4" - Name 120 "g_tTex1du4" - Name 123 "g_tTex2df4" - Name 126 "g_tTex2di4" - Name 129 "g_tTex2du4" - Name 132 "g_tTex3df4" - Name 135 "g_tTex3di4" - Name 138 "g_tTex3du4" - Name 141 "g_tTexcdf4" - Name 144 "g_tTexcdi4" - Name 147 "g_tTexcdu4" - Name 150 "g_tTexcdf4a" - Name 153 "g_tTexcdi4a" - Name 156 "g_tTexcdu4a" + Name 108 "PS_OUTPUT" + MemberName 108(PS_OUTPUT) 0 "Color" + MemberName 108(PS_OUTPUT) 1 "Depth" + Name 110 "@entryPointOutput" + Name 115 "g_tTex1df4" + Name 118 "g_tTex1di4" + Name 121 "g_tTex1du4" + Name 124 "g_tTex2df4" + Name 127 "g_tTex2di4" + Name 130 "g_tTex2du4" + Name 133 "g_tTex3df4" + Name 136 "g_tTex3di4" + Name 139 "g_tTex3du4" + Name 142 "g_tTexcdf4" + Name 145 "g_tTexcdi4" + Name 148 "g_tTexcdu4" + Name 151 "g_tTexcdf4a" + Name 154 "g_tTexcdi4a" + Name 157 "g_tTexcdu4a" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -353,22 +356,24 @@ gl_FragCoord origin is upper left Decorate 76(g_tTex2di4a) DescriptorSet 0 Decorate 88(g_tTex2du4a) DescriptorSet 0 MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 114(g_tTex1df4) DescriptorSet 0 - Decorate 114(g_tTex1df4) Binding 0 - Decorate 117(g_tTex1di4) DescriptorSet 0 - Decorate 120(g_tTex1du4) DescriptorSet 0 - Decorate 123(g_tTex2df4) DescriptorSet 0 - Decorate 126(g_tTex2di4) DescriptorSet 0 - Decorate 129(g_tTex2du4) DescriptorSet 0 - Decorate 132(g_tTex3df4) DescriptorSet 0 - Decorate 135(g_tTex3di4) DescriptorSet 0 - Decorate 138(g_tTex3du4) DescriptorSet 0 - Decorate 141(g_tTexcdf4) DescriptorSet 0 - Decorate 144(g_tTexcdi4) DescriptorSet 0 - Decorate 147(g_tTexcdu4) DescriptorSet 0 - Decorate 150(g_tTexcdf4a) DescriptorSet 0 - Decorate 153(g_tTexcdi4a) DescriptorSet 0 - Decorate 156(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 108(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 110(@entryPointOutput) Location 0 + Decorate 115(g_tTex1df4) DescriptorSet 0 + Decorate 115(g_tTex1df4) Binding 0 + Decorate 118(g_tTex1di4) DescriptorSet 0 + Decorate 121(g_tTex1du4) DescriptorSet 0 + Decorate 124(g_tTex2df4) DescriptorSet 0 + Decorate 127(g_tTex2di4) DescriptorSet 0 + Decorate 130(g_tTex2du4) DescriptorSet 0 + Decorate 133(g_tTex3df4) DescriptorSet 0 + Decorate 136(g_tTex3di4) DescriptorSet 0 + Decorate 139(g_tTex3du4) DescriptorSet 0 + Decorate 142(g_tTexcdf4) DescriptorSet 0 + Decorate 145(g_tTexcdi4) DescriptorSet 0 + Decorate 148(g_tTexcdu4) DescriptorSet 0 + Decorate 151(g_tTexcdf4a) DescriptorSet 0 + Decorate 154(g_tTexcdi4a) DescriptorSet 0 + Decorate 157(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -428,53 +433,54 @@ gl_FragCoord origin is upper left 103: 97(fvec4) ConstantComposite 102 102 102 102 104: TypePointer Function 97(fvec4) 106: 26(int) Constant 1 - 108: TypePointer Output 98(PS_OUTPUT) -109(@entryPointOutput): 108(ptr) Variable Output - 112: TypeImage 6(float) 1D sampled format:Unknown - 113: TypePointer UniformConstant 112 - 114(g_tTex1df4): 113(ptr) Variable UniformConstant - 115: TypeImage 26(int) 1D sampled format:Unknown - 116: TypePointer UniformConstant 115 - 117(g_tTex1di4): 116(ptr) Variable UniformConstant - 118: TypeImage 43(int) 1D sampled format:Unknown - 119: TypePointer UniformConstant 118 - 120(g_tTex1du4): 119(ptr) Variable UniformConstant - 121: TypeImage 6(float) 2D sampled format:Unknown - 122: TypePointer UniformConstant 121 - 123(g_tTex2df4): 122(ptr) Variable UniformConstant - 124: TypeImage 26(int) 2D sampled format:Unknown - 125: TypePointer UniformConstant 124 - 126(g_tTex2di4): 125(ptr) Variable UniformConstant - 127: TypeImage 43(int) 2D sampled format:Unknown - 128: TypePointer UniformConstant 127 - 129(g_tTex2du4): 128(ptr) Variable UniformConstant - 130: TypeImage 6(float) 3D sampled format:Unknown - 131: TypePointer UniformConstant 130 - 132(g_tTex3df4): 131(ptr) Variable UniformConstant - 133: TypeImage 26(int) 3D sampled format:Unknown - 134: TypePointer UniformConstant 133 - 135(g_tTex3di4): 134(ptr) Variable UniformConstant - 136: TypeImage 43(int) 3D sampled format:Unknown - 137: TypePointer UniformConstant 136 - 138(g_tTex3du4): 137(ptr) Variable UniformConstant - 139: TypeImage 6(float) Cube sampled format:Unknown - 140: TypePointer UniformConstant 139 - 141(g_tTexcdf4): 140(ptr) Variable UniformConstant - 142: TypeImage 26(int) Cube sampled format:Unknown - 143: TypePointer UniformConstant 142 - 144(g_tTexcdi4): 143(ptr) Variable UniformConstant - 145: TypeImage 43(int) Cube sampled format:Unknown - 146: TypePointer UniformConstant 145 - 147(g_tTexcdu4): 146(ptr) Variable UniformConstant - 148: TypeImage 6(float) Cube array sampled format:Unknown - 149: TypePointer UniformConstant 148 -150(g_tTexcdf4a): 149(ptr) Variable UniformConstant - 151: TypeImage 26(int) Cube array sampled format:Unknown - 152: TypePointer UniformConstant 151 -153(g_tTexcdi4a): 152(ptr) Variable UniformConstant - 154: TypeImage 43(int) Cube array sampled format:Unknown - 155: TypePointer UniformConstant 154 -156(g_tTexcdu4a): 155(ptr) Variable UniformConstant + 108(PS_OUTPUT): TypeStruct 97(fvec4) 6(float) + 109: TypePointer Output 108(PS_OUTPUT) +110(@entryPointOutput): 109(ptr) Variable Output + 113: TypeImage 6(float) 1D sampled format:Unknown + 114: TypePointer UniformConstant 113 + 115(g_tTex1df4): 114(ptr) Variable UniformConstant + 116: TypeImage 26(int) 1D sampled format:Unknown + 117: TypePointer UniformConstant 116 + 118(g_tTex1di4): 117(ptr) Variable UniformConstant + 119: TypeImage 43(int) 1D sampled format:Unknown + 120: TypePointer UniformConstant 119 + 121(g_tTex1du4): 120(ptr) Variable UniformConstant + 122: TypeImage 6(float) 2D sampled format:Unknown + 123: TypePointer UniformConstant 122 + 124(g_tTex2df4): 123(ptr) Variable UniformConstant + 125: TypeImage 26(int) 2D sampled format:Unknown + 126: TypePointer UniformConstant 125 + 127(g_tTex2di4): 126(ptr) Variable UniformConstant + 128: TypeImage 43(int) 2D sampled format:Unknown + 129: TypePointer UniformConstant 128 + 130(g_tTex2du4): 129(ptr) Variable UniformConstant + 131: TypeImage 6(float) 3D sampled format:Unknown + 132: TypePointer UniformConstant 131 + 133(g_tTex3df4): 132(ptr) Variable UniformConstant + 134: TypeImage 26(int) 3D sampled format:Unknown + 135: TypePointer UniformConstant 134 + 136(g_tTex3di4): 135(ptr) Variable UniformConstant + 137: TypeImage 43(int) 3D sampled format:Unknown + 138: TypePointer UniformConstant 137 + 139(g_tTex3du4): 138(ptr) Variable UniformConstant + 140: TypeImage 6(float) Cube sampled format:Unknown + 141: TypePointer UniformConstant 140 + 142(g_tTexcdf4): 141(ptr) Variable UniformConstant + 143: TypeImage 26(int) Cube sampled format:Unknown + 144: TypePointer UniformConstant 143 + 145(g_tTexcdi4): 144(ptr) Variable UniformConstant + 146: TypeImage 43(int) Cube sampled format:Unknown + 147: TypePointer UniformConstant 146 + 148(g_tTexcdu4): 147(ptr) Variable UniformConstant + 149: TypeImage 6(float) Cube array sampled format:Unknown + 150: TypePointer UniformConstant 149 +151(g_tTexcdf4a): 150(ptr) Variable UniformConstant + 152: TypeImage 26(int) Cube array sampled format:Unknown + 153: TypePointer UniformConstant 152 +154(g_tTexcdi4a): 153(ptr) Variable UniformConstant + 155: TypeImage 43(int) Cube array sampled format:Unknown + 156: TypePointer UniformConstant 155 +157(g_tTexcdu4a): 156(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r11): 7(ptr) Variable Function @@ -530,7 +536,7 @@ gl_FragCoord origin is upper left Store 105 103 107: 7(ptr) AccessChain 100(psout) 106 Store 107 102 - 110:98(PS_OUTPUT) Load 100(psout) - Store 109(@entryPointOutput) 110 + 111:98(PS_OUTPUT) Load 100(psout) + Store 110(@entryPointOutput) 111 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index 5a7b7409..b0f13a4e 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -168,7 +168,7 @@ gl_FragCoord origin is upper left 0:57 1.000000 0:59 Sequence 0:59 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -368,7 +368,7 @@ gl_FragCoord origin is upper left 0:57 1.000000 0:59 Sequence 0:59 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -397,14 +397,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 180 +// Id's are bound by 181 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 141 + EntryPoint Fragment 4 "main" 142 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r10" @@ -430,19 +430,22 @@ gl_FragCoord origin is upper left MemberName 130(PS_OUTPUT) 0 "Color" MemberName 130(PS_OUTPUT) 1 "Depth" Name 132 "psout" - Name 141 "@entryPointOutput" - Name 146 "g_tTex1df4" - Name 149 "g_tTex1di4" - Name 152 "g_tTex1du4" - Name 155 "g_tTex2df4" - Name 158 "g_tTex2di4" - Name 161 "g_tTex2du4" - Name 164 "g_tTex3df4" - Name 167 "g_tTex3di4" - Name 170 "g_tTex3du4" - Name 173 "g_tTexcdf4" - Name 176 "g_tTexcdi4" - Name 179 "g_tTexcdu4" + Name 140 "PS_OUTPUT" + MemberName 140(PS_OUTPUT) 0 "Color" + MemberName 140(PS_OUTPUT) 1 "Depth" + Name 142 "@entryPointOutput" + Name 147 "g_tTex1df4" + Name 150 "g_tTex1di4" + Name 153 "g_tTex1du4" + Name 156 "g_tTex2df4" + Name 159 "g_tTex2di4" + Name 162 "g_tTex2du4" + Name 165 "g_tTex3df4" + Name 168 "g_tTex3di4" + Name 171 "g_tTex3du4" + Name 174 "g_tTexcdf4" + Name 177 "g_tTexcdi4" + Name 180 "g_tTexcdu4" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -455,19 +458,21 @@ gl_FragCoord origin is upper left Decorate 111(g_tTexcdi4a) DescriptorSet 0 Decorate 122(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 146(g_tTex1df4) DescriptorSet 0 - Decorate 146(g_tTex1df4) Binding 0 - Decorate 149(g_tTex1di4) DescriptorSet 0 - Decorate 152(g_tTex1du4) DescriptorSet 0 - Decorate 155(g_tTex2df4) DescriptorSet 0 - Decorate 158(g_tTex2di4) DescriptorSet 0 - Decorate 161(g_tTex2du4) DescriptorSet 0 - Decorate 164(g_tTex3df4) DescriptorSet 0 - Decorate 167(g_tTex3di4) DescriptorSet 0 - Decorate 170(g_tTex3du4) DescriptorSet 0 - Decorate 173(g_tTexcdf4) DescriptorSet 0 - Decorate 176(g_tTexcdi4) DescriptorSet 0 - Decorate 179(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 142(@entryPointOutput) Location 0 + Decorate 147(g_tTex1df4) DescriptorSet 0 + Decorate 147(g_tTex1df4) Binding 0 + Decorate 150(g_tTex1di4) DescriptorSet 0 + Decorate 153(g_tTex1du4) DescriptorSet 0 + Decorate 156(g_tTex2df4) DescriptorSet 0 + Decorate 159(g_tTex2di4) DescriptorSet 0 + Decorate 162(g_tTex2du4) DescriptorSet 0 + Decorate 165(g_tTex3df4) DescriptorSet 0 + Decorate 168(g_tTex3di4) DescriptorSet 0 + Decorate 171(g_tTex3du4) DescriptorSet 0 + Decorate 174(g_tTexcdf4) DescriptorSet 0 + Decorate 177(g_tTexcdi4) DescriptorSet 0 + Decorate 180(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -541,44 +546,45 @@ gl_FragCoord origin is upper left 135: 103(fvec4) ConstantComposite 134 134 134 134 136: TypePointer Function 103(fvec4) 138: 30(int) Constant 1 - 140: TypePointer Output 130(PS_OUTPUT) -141(@entryPointOutput): 140(ptr) Variable Output - 144: TypeImage 6(float) 1D sampled format:Unknown - 145: TypePointer UniformConstant 144 - 146(g_tTex1df4): 145(ptr) Variable UniformConstant - 147: TypeImage 30(int) 1D sampled format:Unknown - 148: TypePointer UniformConstant 147 - 149(g_tTex1di4): 148(ptr) Variable UniformConstant - 150: TypeImage 43(int) 1D sampled format:Unknown - 151: TypePointer UniformConstant 150 - 152(g_tTex1du4): 151(ptr) Variable UniformConstant - 153: TypeImage 6(float) 2D sampled format:Unknown - 154: TypePointer UniformConstant 153 - 155(g_tTex2df4): 154(ptr) Variable UniformConstant - 156: TypeImage 30(int) 2D sampled format:Unknown - 157: TypePointer UniformConstant 156 - 158(g_tTex2di4): 157(ptr) Variable UniformConstant - 159: TypeImage 43(int) 2D sampled format:Unknown - 160: TypePointer UniformConstant 159 - 161(g_tTex2du4): 160(ptr) Variable UniformConstant - 162: TypeImage 6(float) 3D sampled format:Unknown - 163: TypePointer UniformConstant 162 - 164(g_tTex3df4): 163(ptr) Variable UniformConstant - 165: TypeImage 30(int) 3D sampled format:Unknown - 166: TypePointer UniformConstant 165 - 167(g_tTex3di4): 166(ptr) Variable UniformConstant - 168: TypeImage 43(int) 3D sampled format:Unknown - 169: TypePointer UniformConstant 168 - 170(g_tTex3du4): 169(ptr) Variable UniformConstant - 171: TypeImage 6(float) Cube sampled format:Unknown - 172: TypePointer UniformConstant 171 - 173(g_tTexcdf4): 172(ptr) Variable UniformConstant - 174: TypeImage 30(int) Cube sampled format:Unknown - 175: TypePointer UniformConstant 174 - 176(g_tTexcdi4): 175(ptr) Variable UniformConstant - 177: TypeImage 43(int) Cube sampled format:Unknown - 178: TypePointer UniformConstant 177 - 179(g_tTexcdu4): 178(ptr) Variable UniformConstant + 140(PS_OUTPUT): TypeStruct 103(fvec4) 6(float) + 141: TypePointer Output 140(PS_OUTPUT) +142(@entryPointOutput): 141(ptr) Variable Output + 145: TypeImage 6(float) 1D sampled format:Unknown + 146: TypePointer UniformConstant 145 + 147(g_tTex1df4): 146(ptr) Variable UniformConstant + 148: TypeImage 30(int) 1D sampled format:Unknown + 149: TypePointer UniformConstant 148 + 150(g_tTex1di4): 149(ptr) Variable UniformConstant + 151: TypeImage 43(int) 1D sampled format:Unknown + 152: TypePointer UniformConstant 151 + 153(g_tTex1du4): 152(ptr) Variable UniformConstant + 154: TypeImage 6(float) 2D sampled format:Unknown + 155: TypePointer UniformConstant 154 + 156(g_tTex2df4): 155(ptr) Variable UniformConstant + 157: TypeImage 30(int) 2D sampled format:Unknown + 158: TypePointer UniformConstant 157 + 159(g_tTex2di4): 158(ptr) Variable UniformConstant + 160: TypeImage 43(int) 2D sampled format:Unknown + 161: TypePointer UniformConstant 160 + 162(g_tTex2du4): 161(ptr) Variable UniformConstant + 163: TypeImage 6(float) 3D sampled format:Unknown + 164: TypePointer UniformConstant 163 + 165(g_tTex3df4): 164(ptr) Variable UniformConstant + 166: TypeImage 30(int) 3D sampled format:Unknown + 167: TypePointer UniformConstant 166 + 168(g_tTex3di4): 167(ptr) Variable UniformConstant + 169: TypeImage 43(int) 3D sampled format:Unknown + 170: TypePointer UniformConstant 169 + 171(g_tTex3du4): 170(ptr) Variable UniformConstant + 172: TypeImage 6(float) Cube sampled format:Unknown + 173: TypePointer UniformConstant 172 + 174(g_tTexcdf4): 173(ptr) Variable UniformConstant + 175: TypeImage 30(int) Cube sampled format:Unknown + 176: TypePointer UniformConstant 175 + 177(g_tTexcdi4): 176(ptr) Variable UniformConstant + 178: TypeImage 43(int) Cube sampled format:Unknown + 179: TypePointer UniformConstant 178 + 180(g_tTexcdu4): 179(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r10): 7(ptr) Variable Function @@ -655,7 +661,7 @@ gl_FragCoord origin is upper left Store 137 135 139: 7(ptr) AccessChain 132(psout) 138 Store 139 134 - 142:130(PS_OUTPUT) Load 132(psout) - Store 141(@entryPointOutput) 142 + 143:130(PS_OUTPUT) Load 132(psout) + Store 142(@entryPointOutput) 143 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index ba84224d..4139a17e 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -159,7 +159,7 @@ gl_FragCoord origin is upper left 0:58 1.000000 0:60 Sequence 0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -350,7 +350,7 @@ gl_FragCoord origin is upper left 0:58 1.000000 0:60 Sequence 0:60 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -379,14 +379,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 178 +// Id's are bound by 179 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 139 + EntryPoint Fragment 4 "main" 140 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -412,19 +412,22 @@ gl_FragCoord origin is upper left MemberName 128(PS_OUTPUT) 0 "Color" MemberName 128(PS_OUTPUT) 1 "Depth" Name 130 "psout" - Name 139 "@entryPointOutput" - Name 144 "g_tTex3df4" - Name 147 "g_tTex3di4" - Name 150 "g_tTex3du4" - Name 153 "g_tTex1df4a" - Name 156 "g_tTex1di4a" - Name 159 "g_tTex1du4a" - Name 162 "g_tTex2df4a" - Name 165 "g_tTex2di4a" - Name 168 "g_tTex2du4a" - Name 171 "g_tTexcdf4a" - Name 174 "g_tTexcdi4a" - Name 177 "g_tTexcdu4a" + Name 138 "PS_OUTPUT" + MemberName 138(PS_OUTPUT) 0 "Color" + MemberName 138(PS_OUTPUT) 1 "Depth" + Name 140 "@entryPointOutput" + Name 145 "g_tTex3df4" + Name 148 "g_tTex3di4" + Name 151 "g_tTex3du4" + Name 154 "g_tTex1df4a" + Name 157 "g_tTex1di4a" + Name 160 "g_tTex1du4a" + Name 163 "g_tTex2df4a" + Name 166 "g_tTex2di4a" + Name 169 "g_tTex2du4a" + Name 172 "g_tTexcdf4a" + Name 175 "g_tTexcdi4a" + Name 178 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -438,18 +441,20 @@ gl_FragCoord origin is upper left Decorate 106(g_tTexcdi4) DescriptorSet 0 Decorate 118(g_tTexcdu4) DescriptorSet 0 MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 144(g_tTex3df4) DescriptorSet 0 - Decorate 147(g_tTex3di4) DescriptorSet 0 - Decorate 150(g_tTex3du4) DescriptorSet 0 - Decorate 153(g_tTex1df4a) DescriptorSet 0 - Decorate 156(g_tTex1di4a) DescriptorSet 0 - Decorate 159(g_tTex1du4a) DescriptorSet 0 - Decorate 162(g_tTex2df4a) DescriptorSet 0 - Decorate 165(g_tTex2di4a) DescriptorSet 0 - Decorate 168(g_tTex2du4a) DescriptorSet 0 - Decorate 171(g_tTexcdf4a) DescriptorSet 0 - Decorate 174(g_tTexcdi4a) DescriptorSet 0 - Decorate 177(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 138(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 140(@entryPointOutput) Location 0 + Decorate 145(g_tTex3df4) DescriptorSet 0 + Decorate 148(g_tTex3di4) DescriptorSet 0 + Decorate 151(g_tTex3du4) DescriptorSet 0 + Decorate 154(g_tTex1df4a) DescriptorSet 0 + Decorate 157(g_tTex1di4a) DescriptorSet 0 + Decorate 160(g_tTex1du4a) DescriptorSet 0 + Decorate 163(g_tTex2df4a) DescriptorSet 0 + Decorate 166(g_tTex2di4a) DescriptorSet 0 + Decorate 169(g_tTex2du4a) DescriptorSet 0 + Decorate 172(g_tTexcdf4a) DescriptorSet 0 + Decorate 175(g_tTexcdi4a) DescriptorSet 0 + Decorate 178(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -521,44 +526,45 @@ gl_FragCoord origin is upper left 133: 127(fvec4) ConstantComposite 132 132 132 132 134: TypePointer Function 127(fvec4) 136: 26(int) Constant 1 - 138: TypePointer Output 128(PS_OUTPUT) -139(@entryPointOutput): 138(ptr) Variable Output - 142: TypeImage 6(float) 3D sampled format:Unknown - 143: TypePointer UniformConstant 142 - 144(g_tTex3df4): 143(ptr) Variable UniformConstant - 145: TypeImage 26(int) 3D sampled format:Unknown - 146: TypePointer UniformConstant 145 - 147(g_tTex3di4): 146(ptr) Variable UniformConstant - 148: TypeImage 38(int) 3D sampled format:Unknown - 149: TypePointer UniformConstant 148 - 150(g_tTex3du4): 149(ptr) Variable UniformConstant - 151: TypeImage 6(float) 1D array sampled format:Unknown - 152: TypePointer UniformConstant 151 -153(g_tTex1df4a): 152(ptr) Variable UniformConstant - 154: TypeImage 26(int) 1D array sampled format:Unknown - 155: TypePointer UniformConstant 154 -156(g_tTex1di4a): 155(ptr) Variable UniformConstant - 157: TypeImage 38(int) 1D array sampled format:Unknown - 158: TypePointer UniformConstant 157 -159(g_tTex1du4a): 158(ptr) Variable UniformConstant - 160: TypeImage 6(float) 2D array sampled format:Unknown - 161: TypePointer UniformConstant 160 -162(g_tTex2df4a): 161(ptr) Variable UniformConstant - 163: TypeImage 26(int) 2D array sampled format:Unknown - 164: TypePointer UniformConstant 163 -165(g_tTex2di4a): 164(ptr) Variable UniformConstant - 166: TypeImage 38(int) 2D array sampled format:Unknown - 167: TypePointer UniformConstant 166 -168(g_tTex2du4a): 167(ptr) Variable UniformConstant - 169: TypeImage 6(float) Cube array sampled format:Unknown - 170: TypePointer UniformConstant 169 -171(g_tTexcdf4a): 170(ptr) Variable UniformConstant - 172: TypeImage 26(int) Cube array sampled format:Unknown - 173: TypePointer UniformConstant 172 -174(g_tTexcdi4a): 173(ptr) Variable UniformConstant - 175: TypeImage 38(int) Cube array sampled format:Unknown - 176: TypePointer UniformConstant 175 -177(g_tTexcdu4a): 176(ptr) Variable UniformConstant + 138(PS_OUTPUT): TypeStruct 127(fvec4) 6(float) + 139: TypePointer Output 138(PS_OUTPUT) +140(@entryPointOutput): 139(ptr) Variable Output + 143: TypeImage 6(float) 3D sampled format:Unknown + 144: TypePointer UniformConstant 143 + 145(g_tTex3df4): 144(ptr) Variable UniformConstant + 146: TypeImage 26(int) 3D sampled format:Unknown + 147: TypePointer UniformConstant 146 + 148(g_tTex3di4): 147(ptr) Variable UniformConstant + 149: TypeImage 38(int) 3D sampled format:Unknown + 150: TypePointer UniformConstant 149 + 151(g_tTex3du4): 150(ptr) Variable UniformConstant + 152: TypeImage 6(float) 1D array sampled format:Unknown + 153: TypePointer UniformConstant 152 +154(g_tTex1df4a): 153(ptr) Variable UniformConstant + 155: TypeImage 26(int) 1D array sampled format:Unknown + 156: TypePointer UniformConstant 155 +157(g_tTex1di4a): 156(ptr) Variable UniformConstant + 158: TypeImage 38(int) 1D array sampled format:Unknown + 159: TypePointer UniformConstant 158 +160(g_tTex1du4a): 159(ptr) Variable UniformConstant + 161: TypeImage 6(float) 2D array sampled format:Unknown + 162: TypePointer UniformConstant 161 +163(g_tTex2df4a): 162(ptr) Variable UniformConstant + 164: TypeImage 26(int) 2D array sampled format:Unknown + 165: TypePointer UniformConstant 164 +166(g_tTex2di4a): 165(ptr) Variable UniformConstant + 167: TypeImage 38(int) 2D array sampled format:Unknown + 168: TypePointer UniformConstant 167 +169(g_tTex2du4a): 168(ptr) Variable UniformConstant + 170: TypeImage 6(float) Cube array sampled format:Unknown + 171: TypePointer UniformConstant 170 +172(g_tTexcdf4a): 171(ptr) Variable UniformConstant + 173: TypeImage 26(int) Cube array sampled format:Unknown + 174: TypePointer UniformConstant 173 +175(g_tTexcdi4a): 174(ptr) Variable UniformConstant + 176: TypeImage 38(int) Cube array sampled format:Unknown + 177: TypePointer UniformConstant 176 +178(g_tTexcdu4a): 177(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function @@ -635,7 +641,7 @@ gl_FragCoord origin is upper left Store 135 133 137: 7(ptr) AccessChain 130(psout) 136 Store 137 132 - 140:128(PS_OUTPUT) Load 130(psout) - Store 139(@entryPointOutput) 140 + 141:128(PS_OUTPUT) Load 130(psout) + Store 140(@entryPointOutput) 141 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index 9bed7964..1ea38853 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -126,7 +126,7 @@ gl_FragCoord origin is upper left 0:63 1.000000 0:65 Sequence 0:65 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -284,7 +284,7 @@ gl_FragCoord origin is upper left 0:63 1.000000 0:65 Sequence 0:65 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -313,14 +313,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 152 +// Id's are bound by 153 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 104 + EntryPoint Fragment 4 "main" 105 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r01" @@ -340,22 +340,25 @@ gl_FragCoord origin is upper left MemberName 93(PS_OUTPUT) 0 "Color" MemberName 93(PS_OUTPUT) 1 "Depth" Name 95 "psout" - Name 104 "@entryPointOutput" - Name 109 "g_tTex3df4" - Name 112 "g_tTex3di4" - Name 115 "g_tTex3du4" - Name 118 "g_tTexcdf4" - Name 121 "g_tTexcdi4" - Name 124 "g_tTexcdu4" - Name 127 "g_tTex1df4a" - Name 130 "g_tTex1di4a" - Name 133 "g_tTex1du4a" - Name 136 "g_tTex2df4a" - Name 139 "g_tTex2di4a" - Name 142 "g_tTex2du4a" - Name 145 "g_tTexcdf4a" - Name 148 "g_tTexcdi4a" - Name 151 "g_tTexcdu4a" + Name 103 "PS_OUTPUT" + MemberName 103(PS_OUTPUT) 0 "Color" + MemberName 103(PS_OUTPUT) 1 "Depth" + Name 105 "@entryPointOutput" + Name 110 "g_tTex3df4" + Name 113 "g_tTex3di4" + Name 116 "g_tTex3du4" + Name 119 "g_tTexcdf4" + Name 122 "g_tTexcdi4" + Name 125 "g_tTexcdu4" + Name 128 "g_tTex1df4a" + Name 131 "g_tTex1di4a" + Name 134 "g_tTex1du4a" + Name 137 "g_tTex2df4a" + Name 140 "g_tTex2di4a" + Name 143 "g_tTex2du4a" + Name 146 "g_tTexcdf4a" + Name 149 "g_tTexcdi4a" + Name 152 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -366,21 +369,23 @@ gl_FragCoord origin is upper left Decorate 71(g_tTex2di4) DescriptorSet 0 Decorate 83(g_tTex2du4) DescriptorSet 0 MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 109(g_tTex3df4) DescriptorSet 0 - Decorate 112(g_tTex3di4) DescriptorSet 0 - Decorate 115(g_tTex3du4) DescriptorSet 0 - Decorate 118(g_tTexcdf4) DescriptorSet 0 - Decorate 121(g_tTexcdi4) DescriptorSet 0 - Decorate 124(g_tTexcdu4) DescriptorSet 0 - Decorate 127(g_tTex1df4a) DescriptorSet 0 - Decorate 130(g_tTex1di4a) DescriptorSet 0 - Decorate 133(g_tTex1du4a) DescriptorSet 0 - Decorate 136(g_tTex2df4a) DescriptorSet 0 - Decorate 139(g_tTex2di4a) DescriptorSet 0 - Decorate 142(g_tTex2du4a) DescriptorSet 0 - Decorate 145(g_tTexcdf4a) DescriptorSet 0 - Decorate 148(g_tTexcdi4a) DescriptorSet 0 - Decorate 151(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 103(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 105(@entryPointOutput) Location 0 + Decorate 110(g_tTex3df4) DescriptorSet 0 + Decorate 113(g_tTex3di4) DescriptorSet 0 + Decorate 116(g_tTex3du4) DescriptorSet 0 + Decorate 119(g_tTexcdf4) DescriptorSet 0 + Decorate 122(g_tTexcdi4) DescriptorSet 0 + Decorate 125(g_tTexcdu4) DescriptorSet 0 + Decorate 128(g_tTex1df4a) DescriptorSet 0 + Decorate 131(g_tTex1di4a) DescriptorSet 0 + Decorate 134(g_tTex1du4a) DescriptorSet 0 + Decorate 137(g_tTex2df4a) DescriptorSet 0 + Decorate 140(g_tTex2di4a) DescriptorSet 0 + Decorate 143(g_tTex2du4a) DescriptorSet 0 + Decorate 146(g_tTexcdf4a) DescriptorSet 0 + Decorate 149(g_tTexcdi4a) DescriptorSet 0 + Decorate 152(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -438,53 +443,54 @@ gl_FragCoord origin is upper left 98: 92(fvec4) ConstantComposite 97 97 97 97 99: TypePointer Function 92(fvec4) 101: 23(int) Constant 1 - 103: TypePointer Output 93(PS_OUTPUT) -104(@entryPointOutput): 103(ptr) Variable Output - 107: TypeImage 6(float) 3D sampled format:Unknown - 108: TypePointer UniformConstant 107 - 109(g_tTex3df4): 108(ptr) Variable UniformConstant - 110: TypeImage 23(int) 3D sampled format:Unknown - 111: TypePointer UniformConstant 110 - 112(g_tTex3di4): 111(ptr) Variable UniformConstant - 113: TypeImage 39(int) 3D sampled format:Unknown - 114: TypePointer UniformConstant 113 - 115(g_tTex3du4): 114(ptr) Variable UniformConstant - 116: TypeImage 6(float) Cube sampled format:Unknown - 117: TypePointer UniformConstant 116 - 118(g_tTexcdf4): 117(ptr) Variable UniformConstant - 119: TypeImage 23(int) Cube sampled format:Unknown - 120: TypePointer UniformConstant 119 - 121(g_tTexcdi4): 120(ptr) Variable UniformConstant - 122: TypeImage 39(int) Cube sampled format:Unknown - 123: TypePointer UniformConstant 122 - 124(g_tTexcdu4): 123(ptr) Variable UniformConstant - 125: TypeImage 6(float) 1D array sampled format:Unknown - 126: TypePointer UniformConstant 125 -127(g_tTex1df4a): 126(ptr) Variable UniformConstant - 128: TypeImage 23(int) 1D array sampled format:Unknown - 129: TypePointer UniformConstant 128 -130(g_tTex1di4a): 129(ptr) Variable UniformConstant - 131: TypeImage 39(int) 1D array sampled format:Unknown - 132: TypePointer UniformConstant 131 -133(g_tTex1du4a): 132(ptr) Variable UniformConstant - 134: TypeImage 6(float) 2D array sampled format:Unknown - 135: TypePointer UniformConstant 134 -136(g_tTex2df4a): 135(ptr) Variable UniformConstant - 137: TypeImage 23(int) 2D array sampled format:Unknown - 138: TypePointer UniformConstant 137 -139(g_tTex2di4a): 138(ptr) Variable UniformConstant - 140: TypeImage 39(int) 2D array sampled format:Unknown - 141: TypePointer UniformConstant 140 -142(g_tTex2du4a): 141(ptr) Variable UniformConstant - 143: TypeImage 6(float) Cube array sampled format:Unknown - 144: TypePointer UniformConstant 143 -145(g_tTexcdf4a): 144(ptr) Variable UniformConstant - 146: TypeImage 23(int) Cube array sampled format:Unknown - 147: TypePointer UniformConstant 146 -148(g_tTexcdi4a): 147(ptr) Variable UniformConstant - 149: TypeImage 39(int) Cube array sampled format:Unknown - 150: TypePointer UniformConstant 149 -151(g_tTexcdu4a): 150(ptr) Variable UniformConstant + 103(PS_OUTPUT): TypeStruct 92(fvec4) 6(float) + 104: TypePointer Output 103(PS_OUTPUT) +105(@entryPointOutput): 104(ptr) Variable Output + 108: TypeImage 6(float) 3D sampled format:Unknown + 109: TypePointer UniformConstant 108 + 110(g_tTex3df4): 109(ptr) Variable UniformConstant + 111: TypeImage 23(int) 3D sampled format:Unknown + 112: TypePointer UniformConstant 111 + 113(g_tTex3di4): 112(ptr) Variable UniformConstant + 114: TypeImage 39(int) 3D sampled format:Unknown + 115: TypePointer UniformConstant 114 + 116(g_tTex3du4): 115(ptr) Variable UniformConstant + 117: TypeImage 6(float) Cube sampled format:Unknown + 118: TypePointer UniformConstant 117 + 119(g_tTexcdf4): 118(ptr) Variable UniformConstant + 120: TypeImage 23(int) Cube sampled format:Unknown + 121: TypePointer UniformConstant 120 + 122(g_tTexcdi4): 121(ptr) Variable UniformConstant + 123: TypeImage 39(int) Cube sampled format:Unknown + 124: TypePointer UniformConstant 123 + 125(g_tTexcdu4): 124(ptr) Variable UniformConstant + 126: TypeImage 6(float) 1D array sampled format:Unknown + 127: TypePointer UniformConstant 126 +128(g_tTex1df4a): 127(ptr) Variable UniformConstant + 129: TypeImage 23(int) 1D array sampled format:Unknown + 130: TypePointer UniformConstant 129 +131(g_tTex1di4a): 130(ptr) Variable UniformConstant + 132: TypeImage 39(int) 1D array sampled format:Unknown + 133: TypePointer UniformConstant 132 +134(g_tTex1du4a): 133(ptr) Variable UniformConstant + 135: TypeImage 6(float) 2D array sampled format:Unknown + 136: TypePointer UniformConstant 135 +137(g_tTex2df4a): 136(ptr) Variable UniformConstant + 138: TypeImage 23(int) 2D array sampled format:Unknown + 139: TypePointer UniformConstant 138 +140(g_tTex2di4a): 139(ptr) Variable UniformConstant + 141: TypeImage 39(int) 2D array sampled format:Unknown + 142: TypePointer UniformConstant 141 +143(g_tTex2du4a): 142(ptr) Variable UniformConstant + 144: TypeImage 6(float) Cube array sampled format:Unknown + 145: TypePointer UniformConstant 144 +146(g_tTexcdf4a): 145(ptr) Variable UniformConstant + 147: TypeImage 23(int) Cube array sampled format:Unknown + 148: TypePointer UniformConstant 147 +149(g_tTexcdi4a): 148(ptr) Variable UniformConstant + 150: TypeImage 39(int) Cube array sampled format:Unknown + 151: TypePointer UniformConstant 150 +152(g_tTexcdu4a): 151(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r01): 7(ptr) Variable Function @@ -537,7 +543,7 @@ gl_FragCoord origin is upper left Store 100 98 102: 7(ptr) AccessChain 95(psout) 101 Store 102 97 - 105:93(PS_OUTPUT) Load 95(psout) - Store 104(@entryPointOutput) 105 + 106:93(PS_OUTPUT) Load 95(psout) + Store 105(@entryPointOutput) 106 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index b2dcaecc..4ef2c65d 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -132,7 +132,7 @@ gl_FragCoord origin is upper left 0:64 1.000000 0:66 Sequence 0:66 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -296,7 +296,7 @@ gl_FragCoord origin is upper left 0:64 1.000000 0:66 Sequence 0:66 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -325,14 +325,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 158 +// Id's are bound by 159 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 110 + EntryPoint Fragment 4 "main" 111 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r11" @@ -352,22 +352,25 @@ gl_FragCoord origin is upper left MemberName 99(PS_OUTPUT) 0 "Color" MemberName 99(PS_OUTPUT) 1 "Depth" Name 101 "psout" - Name 110 "@entryPointOutput" - Name 115 "g_tTex1df4" - Name 118 "g_tTex1di4" - Name 121 "g_tTex1du4" - Name 124 "g_tTex2df4" - Name 127 "g_tTex2di4" - Name 130 "g_tTex2du4" - Name 133 "g_tTex3df4" - Name 136 "g_tTex3di4" - Name 139 "g_tTex3du4" - Name 142 "g_tTexcdf4" - Name 145 "g_tTexcdi4" - Name 148 "g_tTexcdu4" - Name 151 "g_tTexcdf4a" - Name 154 "g_tTexcdi4a" - Name 157 "g_tTexcdu4a" + Name 109 "PS_OUTPUT" + MemberName 109(PS_OUTPUT) 0 "Color" + MemberName 109(PS_OUTPUT) 1 "Depth" + Name 111 "@entryPointOutput" + Name 116 "g_tTex1df4" + Name 119 "g_tTex1di4" + Name 122 "g_tTex1du4" + Name 125 "g_tTex2df4" + Name 128 "g_tTex2di4" + Name 131 "g_tTex2du4" + Name 134 "g_tTex3df4" + Name 137 "g_tTex3di4" + Name 140 "g_tTex3du4" + Name 143 "g_tTexcdf4" + Name 146 "g_tTexcdi4" + Name 149 "g_tTexcdu4" + Name 152 "g_tTexcdf4a" + Name 155 "g_tTexcdi4a" + Name 158 "g_tTexcdu4a" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -377,22 +380,24 @@ gl_FragCoord origin is upper left Decorate 77(g_tTex2di4a) DescriptorSet 0 Decorate 89(g_tTex2du4a) DescriptorSet 0 MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 115(g_tTex1df4) DescriptorSet 0 - Decorate 115(g_tTex1df4) Binding 0 - Decorate 118(g_tTex1di4) DescriptorSet 0 - Decorate 121(g_tTex1du4) DescriptorSet 0 - Decorate 124(g_tTex2df4) DescriptorSet 0 - Decorate 127(g_tTex2di4) DescriptorSet 0 - Decorate 130(g_tTex2du4) DescriptorSet 0 - Decorate 133(g_tTex3df4) DescriptorSet 0 - Decorate 136(g_tTex3di4) DescriptorSet 0 - Decorate 139(g_tTex3du4) DescriptorSet 0 - Decorate 142(g_tTexcdf4) DescriptorSet 0 - Decorate 145(g_tTexcdi4) DescriptorSet 0 - Decorate 148(g_tTexcdu4) DescriptorSet 0 - Decorate 151(g_tTexcdf4a) DescriptorSet 0 - Decorate 154(g_tTexcdi4a) DescriptorSet 0 - Decorate 157(g_tTexcdu4a) DescriptorSet 0 + MemberDecorate 109(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 111(@entryPointOutput) Location 0 + Decorate 116(g_tTex1df4) DescriptorSet 0 + Decorate 116(g_tTex1df4) Binding 0 + Decorate 119(g_tTex1di4) DescriptorSet 0 + Decorate 122(g_tTex1du4) DescriptorSet 0 + Decorate 125(g_tTex2df4) DescriptorSet 0 + Decorate 128(g_tTex2di4) DescriptorSet 0 + Decorate 131(g_tTex2du4) DescriptorSet 0 + Decorate 134(g_tTex3df4) DescriptorSet 0 + Decorate 137(g_tTex3di4) DescriptorSet 0 + Decorate 140(g_tTex3du4) DescriptorSet 0 + Decorate 143(g_tTexcdf4) DescriptorSet 0 + Decorate 146(g_tTexcdi4) DescriptorSet 0 + Decorate 149(g_tTexcdu4) DescriptorSet 0 + Decorate 152(g_tTexcdf4a) DescriptorSet 0 + Decorate 155(g_tTexcdi4a) DescriptorSet 0 + Decorate 158(g_tTexcdu4a) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -453,53 +458,54 @@ gl_FragCoord origin is upper left 104: 98(fvec4) ConstantComposite 103 103 103 103 105: TypePointer Function 98(fvec4) 107: 27(int) Constant 1 - 109: TypePointer Output 99(PS_OUTPUT) -110(@entryPointOutput): 109(ptr) Variable Output - 113: TypeImage 6(float) 1D sampled format:Unknown - 114: TypePointer UniformConstant 113 - 115(g_tTex1df4): 114(ptr) Variable UniformConstant - 116: TypeImage 27(int) 1D sampled format:Unknown - 117: TypePointer UniformConstant 116 - 118(g_tTex1di4): 117(ptr) Variable UniformConstant - 119: TypeImage 44(int) 1D sampled format:Unknown - 120: TypePointer UniformConstant 119 - 121(g_tTex1du4): 120(ptr) Variable UniformConstant - 122: TypeImage 6(float) 2D sampled format:Unknown - 123: TypePointer UniformConstant 122 - 124(g_tTex2df4): 123(ptr) Variable UniformConstant - 125: TypeImage 27(int) 2D sampled format:Unknown - 126: TypePointer UniformConstant 125 - 127(g_tTex2di4): 126(ptr) Variable UniformConstant - 128: TypeImage 44(int) 2D sampled format:Unknown - 129: TypePointer UniformConstant 128 - 130(g_tTex2du4): 129(ptr) Variable UniformConstant - 131: TypeImage 6(float) 3D sampled format:Unknown - 132: TypePointer UniformConstant 131 - 133(g_tTex3df4): 132(ptr) Variable UniformConstant - 134: TypeImage 27(int) 3D sampled format:Unknown - 135: TypePointer UniformConstant 134 - 136(g_tTex3di4): 135(ptr) Variable UniformConstant - 137: TypeImage 44(int) 3D sampled format:Unknown - 138: TypePointer UniformConstant 137 - 139(g_tTex3du4): 138(ptr) Variable UniformConstant - 140: TypeImage 6(float) Cube sampled format:Unknown - 141: TypePointer UniformConstant 140 - 142(g_tTexcdf4): 141(ptr) Variable UniformConstant - 143: TypeImage 27(int) Cube sampled format:Unknown - 144: TypePointer UniformConstant 143 - 145(g_tTexcdi4): 144(ptr) Variable UniformConstant - 146: TypeImage 44(int) Cube sampled format:Unknown - 147: TypePointer UniformConstant 146 - 148(g_tTexcdu4): 147(ptr) Variable UniformConstant - 149: TypeImage 6(float) Cube array sampled format:Unknown - 150: TypePointer UniformConstant 149 -151(g_tTexcdf4a): 150(ptr) Variable UniformConstant - 152: TypeImage 27(int) Cube array sampled format:Unknown - 153: TypePointer UniformConstant 152 -154(g_tTexcdi4a): 153(ptr) Variable UniformConstant - 155: TypeImage 44(int) Cube array sampled format:Unknown - 156: TypePointer UniformConstant 155 -157(g_tTexcdu4a): 156(ptr) Variable UniformConstant + 109(PS_OUTPUT): TypeStruct 98(fvec4) 6(float) + 110: TypePointer Output 109(PS_OUTPUT) +111(@entryPointOutput): 110(ptr) Variable Output + 114: TypeImage 6(float) 1D sampled format:Unknown + 115: TypePointer UniformConstant 114 + 116(g_tTex1df4): 115(ptr) Variable UniformConstant + 117: TypeImage 27(int) 1D sampled format:Unknown + 118: TypePointer UniformConstant 117 + 119(g_tTex1di4): 118(ptr) Variable UniformConstant + 120: TypeImage 44(int) 1D sampled format:Unknown + 121: TypePointer UniformConstant 120 + 122(g_tTex1du4): 121(ptr) Variable UniformConstant + 123: TypeImage 6(float) 2D sampled format:Unknown + 124: TypePointer UniformConstant 123 + 125(g_tTex2df4): 124(ptr) Variable UniformConstant + 126: TypeImage 27(int) 2D sampled format:Unknown + 127: TypePointer UniformConstant 126 + 128(g_tTex2di4): 127(ptr) Variable UniformConstant + 129: TypeImage 44(int) 2D sampled format:Unknown + 130: TypePointer UniformConstant 129 + 131(g_tTex2du4): 130(ptr) Variable UniformConstant + 132: TypeImage 6(float) 3D sampled format:Unknown + 133: TypePointer UniformConstant 132 + 134(g_tTex3df4): 133(ptr) Variable UniformConstant + 135: TypeImage 27(int) 3D sampled format:Unknown + 136: TypePointer UniformConstant 135 + 137(g_tTex3di4): 136(ptr) Variable UniformConstant + 138: TypeImage 44(int) 3D sampled format:Unknown + 139: TypePointer UniformConstant 138 + 140(g_tTex3du4): 139(ptr) Variable UniformConstant + 141: TypeImage 6(float) Cube sampled format:Unknown + 142: TypePointer UniformConstant 141 + 143(g_tTexcdf4): 142(ptr) Variable UniformConstant + 144: TypeImage 27(int) Cube sampled format:Unknown + 145: TypePointer UniformConstant 144 + 146(g_tTexcdi4): 145(ptr) Variable UniformConstant + 147: TypeImage 44(int) Cube sampled format:Unknown + 148: TypePointer UniformConstant 147 + 149(g_tTexcdu4): 148(ptr) Variable UniformConstant + 150: TypeImage 6(float) Cube array sampled format:Unknown + 151: TypePointer UniformConstant 150 +152(g_tTexcdf4a): 151(ptr) Variable UniformConstant + 153: TypeImage 27(int) Cube array sampled format:Unknown + 154: TypePointer UniformConstant 153 +155(g_tTexcdi4a): 154(ptr) Variable UniformConstant + 156: TypeImage 44(int) Cube array sampled format:Unknown + 157: TypePointer UniformConstant 156 +158(g_tTexcdu4a): 157(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 8(r11): 7(ptr) Variable Function @@ -555,7 +561,7 @@ gl_FragCoord origin is upper left Store 106 104 108: 7(ptr) AccessChain 101(psout) 107 Store 108 103 - 111:99(PS_OUTPUT) Load 101(psout) - Store 110(@entryPointOutput) 111 + 112:99(PS_OUTPUT) Load 101(psout) + Store 111(@entryPointOutput) 112 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index f42074b8..44574aaa 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -177,7 +177,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -375,7 +375,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -393,14 +393,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 128 +// Id's are bound by 129 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 124 + EntryPoint Fragment 4 "main" 125 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -426,8 +426,11 @@ gl_FragCoord origin is upper left MemberName 113(PS_OUTPUT) 0 "Color" MemberName 113(PS_OUTPUT) 1 "Depth" Name 115 "psout" - Name 124 "@entryPointOutput" - Name 127 "g_tTex1df4a" + Name 123 "PS_OUTPUT" + MemberName 123(PS_OUTPUT) 0 "Color" + MemberName 123(PS_OUTPUT) 1 "Depth" + Name 125 "@entryPointOutput" + Name 128 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -441,8 +444,10 @@ gl_FragCoord origin is upper left Decorate 98(g_tTexcdi4) DescriptorSet 0 Decorate 107(g_tTexcdu4) DescriptorSet 0 MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 127(g_tTex1df4a) DescriptorSet 0 - Decorate 127(g_tTex1df4a) Binding 1 + MemberDecorate 123(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 125(@entryPointOutput) Location 0 + Decorate 128(g_tTex1df4a) DescriptorSet 0 + Decorate 128(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -514,9 +519,10 @@ gl_FragCoord origin is upper left 118: 7(fvec4) ConstantComposite 117 117 117 117 120: 27(int) Constant 1 121: TypePointer Function 6(float) - 123: TypePointer Output 113(PS_OUTPUT) -124(@entryPointOutput): 123(ptr) Variable Output -127(g_tTex1df4a): 11(ptr) Variable UniformConstant + 123(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 124: TypePointer Output 123(PS_OUTPUT) +125(@entryPointOutput): 124(ptr) Variable Output +128(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -578,7 +584,7 @@ gl_FragCoord origin is upper left Store 119 118 122: 121(ptr) AccessChain 115(psout) 120 Store 122 117 - 125:113(PS_OUTPUT) Load 115(psout) - Store 124(@entryPointOutput) 125 + 126:113(PS_OUTPUT) Load 115(psout) + Store 125(@entryPointOutput) 126 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 403bfca1..06a34d88 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -225,7 +225,7 @@ gl_FragCoord origin is upper left 0:48 1.000000 0:50 Sequence 0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -474,7 +474,7 @@ gl_FragCoord origin is upper left 0:48 1.000000 0:50 Sequence 0:50 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -495,13 +495,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 163 +// Id's are bound by 164 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 159 + EntryPoint Fragment 4 "main" 160 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -533,8 +533,11 @@ gl_FragCoord origin is upper left MemberName 148(PS_OUTPUT) 0 "Color" MemberName 148(PS_OUTPUT) 1 "Depth" Name 150 "psout" - Name 159 "@entryPointOutput" - Name 162 "g_tTex1df4a" + Name 158 "PS_OUTPUT" + MemberName 158(PS_OUTPUT) 0 "Color" + MemberName 158(PS_OUTPUT) 1 "Depth" + Name 160 "@entryPointOutput" + Name 163 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -551,8 +554,10 @@ gl_FragCoord origin is upper left Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 162(g_tTex1df4a) DescriptorSet 0 - Decorate 162(g_tTex1df4a) Binding 1 + MemberDecorate 158(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 160(@entryPointOutput) Location 0 + Decorate 163(g_tTex1df4a) DescriptorSet 0 + Decorate 163(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -644,9 +649,10 @@ gl_FragCoord origin is upper left 153: 7(fvec4) ConstantComposite 152 152 152 152 155: 24(int) Constant 1 156: TypePointer Function 6(float) - 158: TypePointer Output 148(PS_OUTPUT) -159(@entryPointOutput): 158(ptr) Variable Output -162(g_tTex1df4a): 11(ptr) Variable UniformConstant + 158(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 159: TypePointer Output 158(PS_OUTPUT) +160(@entryPointOutput): 159(ptr) Variable Output +163(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -726,7 +732,7 @@ gl_FragCoord origin is upper left Store 154 153 157: 156(ptr) AccessChain 150(psout) 155 Store 157 152 - 160:148(PS_OUTPUT) Load 150(psout) - Store 159(@entryPointOutput) 160 + 161:148(PS_OUTPUT) Load 150(psout) + Store 160(@entryPointOutput) 161 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index 6b83def7..156d2db0 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -217,7 +217,7 @@ Shader version: 450 0:? 0.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:48 Branch: Return 0:? Linker Objects @@ -458,7 +458,7 @@ Shader version: 450 0:? 0.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:48 Branch: Return 0:? Linker Objects @@ -479,13 +479,13 @@ Shader version: 450 // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 160 +// Id's are bound by 161 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 156 + EntryPoint Vertex 4 "main" 157 Name 4 "main" Name 9 "txval10" Name 12 "g_tTex1df4" @@ -515,8 +515,10 @@ Shader version: 450 Name 148 "VS_OUTPUT" MemberName 148(VS_OUTPUT) 0 "Pos" Name 150 "vsout" - Name 156 "@entryPointOutput" - Name 159 "g_tTex1df4a" + Name 155 "VS_OUTPUT" + MemberName 155(VS_OUTPUT) 0 "Pos" + Name 157 "@entryPointOutput" + Name 160 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -533,8 +535,10 @@ Shader version: 450 Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 MemberDecorate 148(VS_OUTPUT) 0 BuiltIn Position - Decorate 159(g_tTex1df4a) DescriptorSet 0 - Decorate 159(g_tTex1df4a) Binding 1 + MemberDecorate 155(VS_OUTPUT) 0 BuiltIn Position + Decorate 157(@entryPointOutput) Location 0 + Decorate 160(g_tTex1df4a) DescriptorSet 0 + Decorate 160(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -624,9 +628,10 @@ Shader version: 450 151: 24(int) Constant 0 152: 6(float) Constant 0 153: 7(fvec4) ConstantComposite 152 152 152 152 - 155: TypePointer Output 148(VS_OUTPUT) -156(@entryPointOutput): 155(ptr) Variable Output -159(g_tTex1df4a): 11(ptr) Variable UniformConstant + 155(VS_OUTPUT): TypeStruct 7(fvec4) + 156: TypePointer Output 155(VS_OUTPUT) +157(@entryPointOutput): 156(ptr) Variable Output +160(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -704,7 +709,7 @@ Shader version: 450 Store 139(txval42) 147 154: 8(ptr) AccessChain 150(vsout) 151 Store 154 153 - 157:148(VS_OUTPUT) Load 150(vsout) - Store 156(@entryPointOutput) 157 + 158:148(VS_OUTPUT) Load 150(vsout) + Store 157(@entryPointOutput) 158 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index f73d8cf6..9a273d9d 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -195,7 +195,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -414,7 +414,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -435,13 +435,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 154 +// Id's are bound by 155 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 141 + EntryPoint Fragment 4 "main" 142 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -467,11 +467,14 @@ gl_FragCoord origin is upper left MemberName 132(PS_OUTPUT) 0 "Color" MemberName 132(PS_OUTPUT) 1 "Depth" Name 134 "psout" - Name 141 "@entryPointOutput" - Name 144 "g_tTex1df4a" - Name 147 "g_tTexcdf4" - Name 150 "g_tTexcdi4" - Name 153 "g_tTexcdu4" + Name 140 "PS_OUTPUT" + MemberName 140(PS_OUTPUT) 0 "Color" + MemberName 140(PS_OUTPUT) 1 "Depth" + Name 142 "@entryPointOutput" + Name 145 "g_tTex1df4a" + Name 148 "g_tTexcdf4" + Name 151 "g_tTexcdi4" + Name 154 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -485,11 +488,13 @@ gl_FragCoord origin is upper left Decorate 110(g_tTex3di4) DescriptorSet 0 Decorate 121(g_tTex3du4) DescriptorSet 0 MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 144(g_tTex1df4a) DescriptorSet 0 - Decorate 144(g_tTex1df4a) Binding 1 - Decorate 147(g_tTexcdf4) DescriptorSet 0 - Decorate 150(g_tTexcdi4) DescriptorSet 0 - Decorate 153(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 142(@entryPointOutput) Location 0 + Decorate 145(g_tTex1df4a) DescriptorSet 0 + Decorate 145(g_tTex1df4a) Binding 1 + Decorate 148(g_tTexcdf4) DescriptorSet 0 + Decorate 151(g_tTexcdi4) DescriptorSet 0 + Decorate 154(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -578,18 +583,19 @@ gl_FragCoord origin is upper left 135: 6(float) Constant 1065353216 136: 7(fvec4) ConstantComposite 135 135 135 135 138: TypePointer Function 6(float) - 140: TypePointer Output 132(PS_OUTPUT) -141(@entryPointOutput): 140(ptr) Variable Output -144(g_tTex1df4a): 11(ptr) Variable UniformConstant - 145: TypeImage 6(float) Cube sampled format:Unknown - 146: TypePointer UniformConstant 145 - 147(g_tTexcdf4): 146(ptr) Variable UniformConstant - 148: TypeImage 23(int) Cube sampled format:Unknown - 149: TypePointer UniformConstant 148 - 150(g_tTexcdi4): 149(ptr) Variable UniformConstant - 151: TypeImage 38(int) Cube sampled format:Unknown - 152: TypePointer UniformConstant 151 - 153(g_tTexcdu4): 152(ptr) Variable UniformConstant + 140(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 141: TypePointer Output 140(PS_OUTPUT) +142(@entryPointOutput): 141(ptr) Variable Output +145(g_tTex1df4a): 11(ptr) Variable UniformConstant + 146: TypeImage 6(float) Cube sampled format:Unknown + 147: TypePointer UniformConstant 146 + 148(g_tTexcdf4): 147(ptr) Variable UniformConstant + 149: TypeImage 23(int) Cube sampled format:Unknown + 150: TypePointer UniformConstant 149 + 151(g_tTexcdi4): 150(ptr) Variable UniformConstant + 152: TypeImage 38(int) Cube sampled format:Unknown + 153: TypePointer UniformConstant 152 + 154(g_tTexcdu4): 153(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -651,7 +657,7 @@ gl_FragCoord origin is upper left Store 137 136 139: 138(ptr) AccessChain 134(psout) 24 Store 139 135 - 142:132(PS_OUTPUT) Load 134(psout) - Store 141(@entryPointOutput) 142 + 143:132(PS_OUTPUT) Load 134(psout) + Store 142(@entryPointOutput) 143 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index d6bc7643..3750d992 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -132,7 +132,7 @@ gl_FragCoord origin is upper left 0:36 1.000000 0:38 Sequence 0:38 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 Branch: Return 0:? Linker Objects @@ -285,7 +285,7 @@ gl_FragCoord origin is upper left 0:36 1.000000 0:38 Sequence 0:38 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 Branch: Return 0:? Linker Objects @@ -303,14 +303,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 108 +// Id's are bound by 109 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 95 + EntryPoint Fragment 4 "main" 96 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -330,11 +330,14 @@ gl_FragCoord origin is upper left MemberName 86(PS_OUTPUT) 0 "Color" MemberName 86(PS_OUTPUT) 1 "Depth" Name 88 "psout" - Name 95 "@entryPointOutput" - Name 98 "g_tTex1df4a" - Name 101 "g_tTexcdf4" - Name 104 "g_tTexcdi4" - Name 107 "g_tTexcdu4" + Name 94 "PS_OUTPUT" + MemberName 94(PS_OUTPUT) 0 "Color" + MemberName 94(PS_OUTPUT) 1 "Depth" + Name 96 "@entryPointOutput" + Name 99 "g_tTex1df4a" + Name 102 "g_tTexcdf4" + Name 105 "g_tTexcdi4" + Name 108 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -345,11 +348,13 @@ gl_FragCoord origin is upper left Decorate 71(g_tTex2di4) DescriptorSet 0 Decorate 80(g_tTex2du4) DescriptorSet 0 MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 98(g_tTex1df4a) DescriptorSet 0 - Decorate 98(g_tTex1df4a) Binding 1 - Decorate 101(g_tTexcdf4) DescriptorSet 0 - Decorate 104(g_tTexcdi4) DescriptorSet 0 - Decorate 107(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 96(@entryPointOutput) Location 0 + Decorate 99(g_tTex1df4a) DescriptorSet 0 + Decorate 99(g_tTex1df4a) Binding 1 + Decorate 102(g_tTexcdf4) DescriptorSet 0 + Decorate 105(g_tTexcdi4) DescriptorSet 0 + Decorate 108(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -407,18 +412,19 @@ gl_FragCoord origin is upper left 89: 6(float) Constant 1065353216 90: 7(fvec4) ConstantComposite 89 89 89 89 92: TypePointer Function 6(float) - 94: TypePointer Output 86(PS_OUTPUT) -95(@entryPointOutput): 94(ptr) Variable Output - 98(g_tTex1df4a): 11(ptr) Variable UniformConstant - 99: TypeImage 6(float) Cube array sampled format:Unknown - 100: TypePointer UniformConstant 99 - 101(g_tTexcdf4): 100(ptr) Variable UniformConstant - 102: TypeImage 26(int) Cube array sampled format:Unknown - 103: TypePointer UniformConstant 102 - 104(g_tTexcdi4): 103(ptr) Variable UniformConstant - 105: TypeImage 40(int) Cube array sampled format:Unknown - 106: TypePointer UniformConstant 105 - 107(g_tTexcdu4): 106(ptr) Variable UniformConstant + 94(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 95: TypePointer Output 94(PS_OUTPUT) +96(@entryPointOutput): 95(ptr) Variable Output + 99(g_tTex1df4a): 11(ptr) Variable UniformConstant + 100: TypeImage 6(float) Cube array sampled format:Unknown + 101: TypePointer UniformConstant 100 + 102(g_tTexcdf4): 101(ptr) Variable UniformConstant + 103: TypeImage 26(int) Cube array sampled format:Unknown + 104: TypePointer UniformConstant 103 + 105(g_tTexcdi4): 104(ptr) Variable UniformConstant + 106: TypeImage 40(int) Cube array sampled format:Unknown + 107: TypePointer UniformConstant 106 + 108(g_tTexcdu4): 107(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -462,7 +468,7 @@ gl_FragCoord origin is upper left Store 91 90 93: 92(ptr) AccessChain 88(psout) 27 Store 93 89 - 96:86(PS_OUTPUT) Load 88(psout) - Store 95(@entryPointOutput) 96 + 97:86(PS_OUTPUT) Load 88(psout) + Store 96(@entryPointOutput) 97 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 9ed0650f..4dc08b8c 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -141,7 +141,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -303,7 +303,7 @@ gl_FragCoord origin is upper left 0:40 1.000000 0:42 Sequence 0:42 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -321,14 +321,14 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 135 +// Id's are bound by 136 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 131 + EntryPoint Fragment 4 "main" 132 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -354,8 +354,11 @@ gl_FragCoord origin is upper left MemberName 121(PS_OUTPUT) 0 "Color" MemberName 121(PS_OUTPUT) 1 "Depth" Name 123 "psout" - Name 131 "@entryPointOutput" - Name 134 "g_tTex1df4" + Name 130 "PS_OUTPUT" + MemberName 130(PS_OUTPUT) 0 "Color" + MemberName 130(PS_OUTPUT) 1 "Depth" + Name 132 "@entryPointOutput" + Name 135 "g_tTex1df4" Decorate 12(g_tTex1df4a) DescriptorSet 0 Decorate 12(g_tTex1df4a) Binding 1 Decorate 16(g_sSamp) DescriptorSet 0 @@ -369,8 +372,10 @@ gl_FragCoord origin is upper left Decorate 101(g_tTexcdi4a) DescriptorSet 0 Decorate 111(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 134(g_tTex1df4) DescriptorSet 0 - Decorate 134(g_tTex1df4) Binding 0 + MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 132(@entryPointOutput) Location 0 + Decorate 135(g_tTex1df4) DescriptorSet 0 + Decorate 135(g_tTex1df4) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -449,9 +454,10 @@ gl_FragCoord origin is upper left 125: 7(fvec4) ConstantComposite 118 118 118 118 127: 26(int) Constant 1 128: TypePointer Function 6(float) - 130: TypePointer Output 121(PS_OUTPUT) -131(@entryPointOutput): 130(ptr) Variable Output - 134(g_tTex1df4): 11(ptr) Variable UniformConstant + 130(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 131: TypePointer Output 130(PS_OUTPUT) +132(@entryPointOutput): 131(ptr) Variable Output + 135(g_tTex1df4): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -513,7 +519,7 @@ gl_FragCoord origin is upper left Store 126 125 129: 128(ptr) AccessChain 123(psout) 127 Store 129 118 - 132:121(PS_OUTPUT) Load 123(psout) - Store 131(@entryPointOutput) 132 + 133:121(PS_OUTPUT) Load 123(psout) + Store 132(@entryPointOutput) 133 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 38676721..b23e723f 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -171,7 +171,7 @@ gl_FragCoord origin is upper left 0:49 1.000000 0:51 Sequence 0:51 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 Branch: Return 0:? Linker Objects @@ -367,7 +367,7 @@ gl_FragCoord origin is upper left 0:49 1.000000 0:51 Sequence 0:51 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 Branch: Return 0:? Linker Objects @@ -389,13 +389,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 160 +// Id's are bound by 161 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 155 + EntryPoint Fragment 4 "main" 156 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -427,9 +427,12 @@ gl_FragCoord origin is upper left MemberName 144(PS_OUTPUT) 0 "Color" MemberName 144(PS_OUTPUT) 1 "Depth" Name 146 "psout" - Name 155 "@entryPointOutput" - Name 158 "g_sSamp2d" - Name 159 "g_tTex1df4a" + Name 154 "PS_OUTPUT" + MemberName 154(PS_OUTPUT) 0 "Color" + MemberName 154(PS_OUTPUT) 1 "Depth" + Name 156 "@entryPointOutput" + Name 159 "g_sSamp2d" + Name 160 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -446,9 +449,11 @@ gl_FragCoord origin is upper left Decorate 129(g_tTexcdi4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0 MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 158(g_sSamp2d) DescriptorSet 0 - Decorate 159(g_tTex1df4a) DescriptorSet 0 - Decorate 159(g_tTex1df4a) Binding 1 + MemberDecorate 154(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 156(@entryPointOutput) Location 0 + Decorate 159(g_sSamp2d) DescriptorSet 0 + Decorate 160(g_tTex1df4a) DescriptorSet 0 + Decorate 160(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -536,10 +541,11 @@ gl_FragCoord origin is upper left 149: 7(fvec4) ConstantComposite 148 148 148 148 151: 23(int) Constant 1 152: TypePointer Function 6(float) - 154: TypePointer Output 144(PS_OUTPUT) -155(@entryPointOutput): 154(ptr) Variable Output - 158(g_sSamp2d): 15(ptr) Variable UniformConstant -159(g_tTex1df4a): 11(ptr) Variable UniformConstant + 154(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 155: TypePointer Output 154(PS_OUTPUT) +156(@entryPointOutput): 155(ptr) Variable Output + 159(g_sSamp2d): 15(ptr) Variable UniformConstant +160(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -619,7 +625,7 @@ gl_FragCoord origin is upper left Store 150 149 153: 152(ptr) AccessChain 146(psout) 151 Store 153 148 - 156:144(PS_OUTPUT) Load 146(psout) - Store 155(@entryPointOutput) 156 + 157:144(PS_OUTPUT) Load 146(psout) + Store 156(@entryPointOutput) 157 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index 088c465e..e8edd2ad 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -163,7 +163,7 @@ Shader version: 450 0:? 0.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:48 Branch: Return 0:? Linker Objects @@ -350,7 +350,7 @@ Shader version: 450 0:? 0.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos}) 0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos}) 0:48 Branch: Return 0:? Linker Objects @@ -371,13 +371,13 @@ Shader version: 450 // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 156 +// Id's are bound by 157 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 152 + EntryPoint Vertex 4 "main" 153 Name 4 "main" Name 9 "txval10" Name 12 "g_tTex1df4" @@ -407,8 +407,10 @@ Shader version: 450 Name 144 "VS_OUTPUT" MemberName 144(VS_OUTPUT) 0 "Pos" Name 146 "vsout" - Name 152 "@entryPointOutput" - Name 155 "g_tTex1df4a" + Name 151 "VS_OUTPUT" + MemberName 151(VS_OUTPUT) 0 "Pos" + Name 153 "@entryPointOutput" + Name 156 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -425,8 +427,10 @@ Shader version: 450 Decorate 129(g_tTexcdi4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0 MemberDecorate 144(VS_OUTPUT) 0 BuiltIn Position - Decorate 155(g_tTex1df4a) DescriptorSet 0 - Decorate 155(g_tTex1df4a) Binding 1 + MemberDecorate 151(VS_OUTPUT) 0 BuiltIn Position + Decorate 153(@entryPointOutput) Location 0 + Decorate 156(g_tTex1df4a) DescriptorSet 0 + Decorate 156(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -512,9 +516,10 @@ Shader version: 450 147: 23(int) Constant 0 148: 6(float) Constant 0 149: 7(fvec4) ConstantComposite 148 148 148 148 - 151: TypePointer Output 144(VS_OUTPUT) -152(@entryPointOutput): 151(ptr) Variable Output -155(g_tTex1df4a): 11(ptr) Variable UniformConstant + 151(VS_OUTPUT): TypeStruct 7(fvec4) + 152: TypePointer Output 151(VS_OUTPUT) +153(@entryPointOutput): 152(ptr) Variable Output +156(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -592,7 +597,7 @@ Shader version: 450 Store 135(txval42) 143 150: 8(ptr) AccessChain 146(vsout) 147 Store 150 149 - 153:144(VS_OUTPUT) Load 146(vsout) - Store 152(@entryPointOutput) 153 + 154:144(VS_OUTPUT) Load 146(vsout) + Store 153(@entryPointOutput) 154 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 2dc61c75..fa7ffd9d 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -159,7 +159,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -342,7 +342,7 @@ gl_FragCoord origin is upper left 0:46 1.000000 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -363,13 +363,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 150 +// Id's are bound by 151 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 137 + EntryPoint Fragment 4 "main" 138 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -395,11 +395,14 @@ gl_FragCoord origin is upper left MemberName 128(PS_OUTPUT) 0 "Color" MemberName 128(PS_OUTPUT) 1 "Depth" Name 130 "psout" - Name 137 "@entryPointOutput" - Name 140 "g_tTex1df4a" - Name 143 "g_tTexcdf4" - Name 146 "g_tTexcdi4" - Name 149 "g_tTexcdu4" + Name 136 "PS_OUTPUT" + MemberName 136(PS_OUTPUT) 0 "Color" + MemberName 136(PS_OUTPUT) 1 "Depth" + Name 138 "@entryPointOutput" + Name 141 "g_tTex1df4a" + Name 144 "g_tTexcdf4" + Name 147 "g_tTexcdi4" + Name 150 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -413,11 +416,13 @@ gl_FragCoord origin is upper left Decorate 106(g_tTex3di4) DescriptorSet 0 Decorate 117(g_tTex3du4) DescriptorSet 0 MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 140(g_tTex1df4a) DescriptorSet 0 - Decorate 140(g_tTex1df4a) Binding 1 - Decorate 143(g_tTexcdf4) DescriptorSet 0 - Decorate 146(g_tTexcdi4) DescriptorSet 0 - Decorate 149(g_tTexcdu4) DescriptorSet 0 + MemberDecorate 136(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 138(@entryPointOutput) Location 0 + Decorate 141(g_tTex1df4a) DescriptorSet 0 + Decorate 141(g_tTex1df4a) Binding 1 + Decorate 144(g_tTexcdf4) DescriptorSet 0 + Decorate 147(g_tTexcdi4) DescriptorSet 0 + Decorate 150(g_tTexcdu4) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -502,18 +507,19 @@ gl_FragCoord origin is upper left 131: 6(float) Constant 1065353216 132: 7(fvec4) ConstantComposite 131 131 131 131 134: TypePointer Function 6(float) - 136: TypePointer Output 128(PS_OUTPUT) -137(@entryPointOutput): 136(ptr) Variable Output -140(g_tTex1df4a): 11(ptr) Variable UniformConstant - 141: TypeImage 6(float) Cube sampled format:Unknown - 142: TypePointer UniformConstant 141 - 143(g_tTexcdf4): 142(ptr) Variable UniformConstant - 144: TypeImage 22(int) Cube sampled format:Unknown - 145: TypePointer UniformConstant 144 - 146(g_tTexcdi4): 145(ptr) Variable UniformConstant - 147: TypeImage 37(int) Cube sampled format:Unknown - 148: TypePointer UniformConstant 147 - 149(g_tTexcdu4): 148(ptr) Variable UniformConstant + 136(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 137: TypePointer Output 136(PS_OUTPUT) +138(@entryPointOutput): 137(ptr) Variable Output +141(g_tTex1df4a): 11(ptr) Variable UniformConstant + 142: TypeImage 6(float) Cube sampled format:Unknown + 143: TypePointer UniformConstant 142 + 144(g_tTexcdf4): 143(ptr) Variable UniformConstant + 145: TypeImage 22(int) Cube sampled format:Unknown + 146: TypePointer UniformConstant 145 + 147(g_tTexcdi4): 146(ptr) Variable UniformConstant + 148: TypeImage 37(int) Cube sampled format:Unknown + 149: TypePointer UniformConstant 148 + 150(g_tTexcdu4): 149(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -575,7 +581,7 @@ gl_FragCoord origin is upper left Store 133 132 135: 134(ptr) AccessChain 130(psout) 23 Store 135 131 - 138:128(PS_OUTPUT) Load 130(psout) - Store 137(@entryPointOutput) 138 + 139:128(PS_OUTPUT) Load 130(psout) + Store 138(@entryPointOutput) 139 Return FunctionEnd diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index bc3c4ae2..7402e75c 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -246,7 +246,7 @@ gl_FragCoord origin is upper left 0:34 1.000000 0:36 Sequence 0:36 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -261,13 +261,13 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 107 +// Id's are bound by 108 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 103 + EntryPoint Fragment 4 "main" 104 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -287,8 +287,11 @@ gl_FragCoord origin is upper left MemberName 94(PS_OUTPUT) 0 "Color" MemberName 94(PS_OUTPUT) 1 "Depth" Name 96 "psout" - Name 103 "@entryPointOutput" - Name 106 "g_tTex1df4a" + Name 102 "PS_OUTPUT" + MemberName 102(PS_OUTPUT) 0 "Color" + MemberName 102(PS_OUTPUT) 1 "Depth" + Name 104 "@entryPointOutput" + Name 107 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -299,8 +302,10 @@ gl_FragCoord origin is upper left Decorate 73(g_tTex2di4) DescriptorSet 0 Decorate 84(g_tTex2du4) DescriptorSet 0 MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 106(g_tTex1df4a) DescriptorSet 0 - Decorate 106(g_tTex1df4a) Binding 1 + MemberDecorate 102(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 104(@entryPointOutput) Location 0 + Decorate 107(g_tTex1df4a) DescriptorSet 0 + Decorate 107(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -366,9 +371,10 @@ gl_FragCoord origin is upper left 97: 6(float) Constant 1065353216 98: 7(fvec4) ConstantComposite 97 97 97 97 100: TypePointer Function 6(float) - 102: TypePointer Output 94(PS_OUTPUT) -103(@entryPointOutput): 102(ptr) Variable Output -106(g_tTex1df4a): 11(ptr) Variable UniformConstant + 102(PS_OUTPUT): TypeStruct 7(fvec4) 6(float) + 103: TypePointer Output 102(PS_OUTPUT) +104(@entryPointOutput): 103(ptr) Variable Output +107(g_tTex1df4a): 11(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function @@ -412,7 +418,7 @@ gl_FragCoord origin is upper left Store 99 98 101: 100(ptr) AccessChain 96(psout) 40 Store 101 97 - 104:94(PS_OUTPUT) Load 96(psout) - Store 103(@entryPointOutput) 104 + 105:94(PS_OUTPUT) Load 96(psout) + Store 104(@entryPointOutput) 105 Return FunctionEnd diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index 470556ed..733ff991 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -21,7 +21,7 @@ gl_FragCoord origin is upper left 0:16 1.000000 0:17 Sequence 0:17 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:17 'ps_output' (temp structure{temp 4-component vector of float color}) 0:17 Branch: Return 0:? Linker Objects @@ -52,19 +52,19 @@ gl_FragCoord origin is upper left 0:16 1.000000 0:17 Sequence 0:17 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) 0:17 'ps_output' (temp structure{temp 4-component vector of float color}) 0:17 Branch: Return 0:? Linker Objects // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 25 +// Id's are bound by 26 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 22 + EntryPoint Fragment 4 "main" 23 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 6 "MyFunc(" @@ -72,7 +72,10 @@ gl_FragCoord origin is upper left Name 12 "PS_OUTPUT" MemberName 12(PS_OUTPUT) 0 "color" Name 14 "ps_output" - Name 22 "@entryPointOutput" + Name 21 "PS_OUTPUT" + MemberName 21(PS_OUTPUT) 0 "color" + Name 23 "@entryPointOutput" + Decorate 23(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 10: TypeFloat 32 @@ -84,15 +87,16 @@ gl_FragCoord origin is upper left 17: 10(float) Constant 1065353216 18: 11(fvec4) ConstantComposite 17 17 17 17 19: TypePointer Function 11(fvec4) - 21: TypePointer Output 12(PS_OUTPUT) -22(@entryPointOutput): 21(ptr) Variable Output + 21(PS_OUTPUT): TypeStruct 11(fvec4) + 22: TypePointer Output 21(PS_OUTPUT) +23(@entryPointOutput): 22(ptr) Variable Output 4(main): 2 Function None 3 5: Label 14(ps_output): 13(ptr) Variable Function 20: 19(ptr) AccessChain 14(ps_output) 16 Store 20 18 - 23:12(PS_OUTPUT) Load 14(ps_output) - Store 22(@entryPointOutput) 23 + 24:12(PS_OUTPUT) Load 14(ps_output) + Store 23(@entryPointOutput) 24 Return FunctionEnd 6(MyFunc(): 2 Function None 3 diff --git a/Test/baseResults/hlsl.sin.frag.out b/Test/baseResults/hlsl.sin.frag.out index ab72308a..c32282be 100755 --- a/Test/baseResults/hlsl.sin.frag.out +++ b/Test/baseResults/hlsl.sin.frag.out @@ -8,7 +8,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 sine (global 4-component vector of float) 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return @@ -27,7 +27,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 sine (global 4-component vector of float) 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return @@ -45,6 +45,7 @@ gl_FragCoord origin is upper left Name 4 "PixelShaderFunction" Name 9 "@entryPointOutput" Name 11 "input" + Decorate 9(@entryPointOutput) Location 0 Decorate 11(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index e5fbf654..8edda1d8 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -17,7 +17,7 @@ gl_FragCoord origin is upper left 0:? 1.000000 0:19 Sequence 0:19 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) 0:19 'psout' (temp structure{temp 4-component vector of float Color}) 0:19 Branch: Return 0:? Linker Objects @@ -46,7 +46,7 @@ gl_FragCoord origin is upper left 0:? 1.000000 0:19 Sequence 0:19 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) 0:19 'psout' (temp structure{temp 4-component vector of float Color}) 0:19 Branch: Return 0:? Linker Objects @@ -55,21 +55,24 @@ gl_FragCoord origin is upper left // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 27 +// Id's are bound by 28 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 19 + EntryPoint Fragment 4 "main" 20 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "PS_OUTPUT" MemberName 8(PS_OUTPUT) 0 "Color" Name 10 "psout" - Name 19 "@entryPointOutput" - Name 24 "TestTexture" - Name 26 "TestUF" - Decorate 24(TestTexture) DescriptorSet 0 + Name 18 "PS_OUTPUT" + MemberName 18(PS_OUTPUT) 0 "Color" + Name 20 "@entryPointOutput" + Name 25 "TestTexture" + Name 27 "TestUF" + Decorate 20(@entryPointOutput) Location 0 + Decorate 25(TestTexture) DescriptorSet 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -82,19 +85,20 @@ gl_FragCoord origin is upper left 14: 6(float) Constant 1065353216 15: 7(fvec4) ConstantComposite 13 13 13 14 16: TypePointer Function 7(fvec4) - 18: TypePointer Output 8(PS_OUTPUT) -19(@entryPointOutput): 18(ptr) Variable Output - 22: TypeImage 6(float) 2D sampled format:Unknown - 23: TypePointer UniformConstant 22 - 24(TestTexture): 23(ptr) Variable UniformConstant - 25: TypePointer UniformConstant 7(fvec4) - 26(TestUF): 25(ptr) Variable UniformConstant + 18(PS_OUTPUT): TypeStruct 7(fvec4) + 19: TypePointer Output 18(PS_OUTPUT) +20(@entryPointOutput): 19(ptr) Variable Output + 23: TypeImage 6(float) 2D sampled format:Unknown + 24: TypePointer UniformConstant 23 + 25(TestTexture): 24(ptr) Variable UniformConstant + 26: TypePointer UniformConstant 7(fvec4) + 27(TestUF): 26(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 10(psout): 9(ptr) Variable Function 17: 16(ptr) AccessChain 10(psout) 12 Store 17 15 - 20:8(PS_OUTPUT) Load 10(psout) - Store 19(@entryPointOutput) 20 + 21:8(PS_OUTPUT) Load 10(psout) + Store 20(@entryPointOutput) 21 Return FunctionEnd diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index 36fa18f0..a1c23a27 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:40 7 (const int) 0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:42 'input' (layout(location=0 ) in 4-component vector of float) 0:42 Branch: Return 0:? Linker Objects @@ -59,7 +59,7 @@ gl_FragCoord origin is upper left 0:40 7 (const int) 0:42 Sequence 0:42 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:42 'input' (layout(location=0 ) in 4-component vector of float) 0:42 Branch: Return 0:? Linker Objects @@ -106,6 +106,7 @@ gl_FragCoord origin is upper left Name 44 "ff5" Name 45 "ff6" MemberDecorate 25 4 BuiltIn FrontFacing + Decorate 34(@entryPointOutput) Location 0 Decorate 36(input) Location 0 Decorate 44(ff5) Offset 20 Decorate 44(ff5) Binding 5 diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out index 7185eb04..ac46f01b 100755 --- a/Test/baseResults/hlsl.switch.frag.out +++ b/Test/baseResults/hlsl.switch.frag.out @@ -121,7 +121,7 @@ gl_FragCoord origin is upper left 0:51 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Sequence 0:54 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects @@ -252,7 +252,7 @@ gl_FragCoord origin is upper left 0:51 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Sequence 0:54 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects @@ -274,6 +274,7 @@ gl_FragCoord origin is upper left Decorate 8(c) Location 1 Decorate 21(input) Location 0 Decorate 41(d) Location 2 + Decorate 81(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 diff --git a/Test/baseResults/hlsl.templatetypes.frag.out b/Test/baseResults/hlsl.templatetypes.frag.out index e3c8baad..06f3f480 100644 --- a/Test/baseResults/hlsl.templatetypes.frag.out +++ b/Test/baseResults/hlsl.templatetypes.frag.out @@ -241,7 +241,7 @@ gl_FragCoord origin is upper left 0:? 12.000000 0:45 Sequence 0:45 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:45 Constant: 0:45 0.000000 0:45 Branch: Return @@ -493,7 +493,7 @@ gl_FragCoord origin is upper left 0:? 12.000000 0:45 Sequence 0:45 move second child to first child (temp float) -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:45 Constant: 0:45 0.000000 0:45 Branch: Return @@ -539,6 +539,7 @@ gl_FragCoord origin is upper left Name 136 "r65" Name 141 "r66" Name 145 "@entryPointOutput" + Decorate 145(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out index a3fb1986..564c74c4 100755 --- a/Test/baseResults/hlsl.whileLoop.frag.out +++ b/Test/baseResults/hlsl.whileLoop.frag.out @@ -15,7 +15,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:4 Loop with condition tested first @@ -55,7 +55,7 @@ gl_FragCoord origin is upper left 0:? Sequence 0:3 Sequence 0:3 move second child to first child (temp 4-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:4 Loop with condition tested first @@ -88,6 +88,7 @@ gl_FragCoord origin is upper left Name 14 "input" Name 22 "@entryPointOutput" Decorate 14(input) Location 0 + Decorate 22(@entryPointOutput) Location 0 2: TypeVoid 3: TypeFunction 2 11: TypeFloat 32 diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out index 297730e9..a51134c3 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out @@ -31,6 +31,8 @@ Linked fragment stage: Decorate 3805 DescriptorSet 0 Decorate 3869 DescriptorSet 0 MemberDecorate 1032 1 BuiltIn FragDepth + MemberDecorate 1033 1 BuiltIn FragDepth + Decorate 4045 Location 0 8: TypeVoid 1282: TypeFunction 8 12: TypeInt 32 1 @@ -128,7 +130,8 @@ Linked fragment stage: 138: 13(float) Constant 1065353216 1284: 29(fvec4) ConstantComposite 138 138 138 138 650: TypePointer Function 13(float) - 1670: TypePointer Output 1032(struct) + 1033: TypeStruct 29(fvec4) 13(float) + 1670: TypePointer Output 1033(struct) 4045: 1670(ptr) Variable Output 5663: 8 Function None 1282 24915: Label diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index fe4d1b05..a70b8317 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out @@ -7,13 +7,13 @@ Linked fragment stage: // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 185 +// Id's are bound by 186 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 181 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 7 "MemberTest" @@ -59,10 +59,13 @@ Linked fragment stage: MemberName 171(PS_OUTPUT) 0 "Color" MemberName 171(PS_OUTPUT) 1 "Depth" Name 173 "psout" - Name 180 "@entryPointOutput" - Name 182 "g_sSamp2d" - Name 183 "g_sSamp2D_b" - Name 184 "g_tTex1df4a" + Name 179 "PS_OUTPUT" + MemberName 179(PS_OUTPUT) 0 "Color" + MemberName 179(PS_OUTPUT) 1 "Depth" + Name 181 "@entryPointOutput" + Name 183 "g_sSamp2d" + Name 184 "g_sSamp2D_b" + Name 185 "g_tTex1df4a" Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) Binding 0 Decorate 45(g_sSamp) DescriptorSet 0 @@ -79,10 +82,12 @@ Linked fragment stage: Decorate 156(g_tTexcdi4) DescriptorSet 0 Decorate 165(g_tTexcdu4) DescriptorSet 0 MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 182(g_sSamp2d) DescriptorSet 0 - Decorate 183(g_sSamp2D_b) DescriptorSet 0 - Decorate 184(g_tTex1df4a) DescriptorSet 0 - Decorate 184(g_tTex1df4a) Binding 1 + MemberDecorate 179(PS_OUTPUT) 1 BuiltIn FragDepth + Decorate 181(@entryPointOutput) Location 0 + Decorate 183(g_sSamp2d) DescriptorSet 0 + Decorate 184(g_sSamp2D_b) DescriptorSet 0 + Decorate 185(g_tTex1df4a) DescriptorSet 0 + Decorate 185(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -182,11 +187,12 @@ Linked fragment stage: 174: 35(float) Constant 1065353216 175: 36(fvec4) ConstantComposite 174 174 174 174 177: TypePointer Function 35(float) - 179: TypePointer Output 171(PS_OUTPUT) -180(@entryPointOutput): 179(ptr) Variable Output - 182(g_sSamp2d): 44(ptr) Variable UniformConstant -183(g_sSamp2D_b): 44(ptr) Variable UniformConstant -184(g_tTex1df4a): 40(ptr) Variable UniformConstant + 179(PS_OUTPUT): TypeStruct 36(fvec4) 35(float) + 180: TypePointer Output 179(PS_OUTPUT) +181(@entryPointOutput): 180(ptr) Variable Output + 183(g_sSamp2d): 44(ptr) Variable UniformConstant +184(g_sSamp2D_b): 44(ptr) Variable UniformConstant +185(g_tTex1df4a): 40(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label 9(mtest): 8(ptr) Variable Function @@ -291,7 +297,7 @@ Linked fragment stage: Store 176 175 178: 177(ptr) AccessChain 173(psout) 10 Store 178 174 - 181:171(PS_OUTPUT) Load 173(psout) - Store 180(@entryPointOutput) 181 + 182:171(PS_OUTPUT) Load 173(psout) + Store 181(@entryPointOutput) 182 Return FunctionEnd diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out index d7f3003e..60b2b780 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out @@ -7,13 +7,13 @@ Linked fragment stage: // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 185 +// Id's are bound by 186 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 181 ExecutionMode 4 OriginUpperLeft Decorate 41 DescriptorSet 0 Decorate 41 Binding 0 @@ -31,10 +31,12 @@ Linked fragment stage: Decorate 156 DescriptorSet 0 Decorate 165 DescriptorSet 0 MemberDecorate 171 1 BuiltIn FragDepth - Decorate 182 DescriptorSet 0 + MemberDecorate 179 1 BuiltIn FragDepth + Decorate 181 Location 0 Decorate 183 DescriptorSet 0 Decorate 184 DescriptorSet 0 - Decorate 184 Binding 1 + Decorate 185 DescriptorSet 0 + Decorate 185 Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -134,11 +136,12 @@ Linked fragment stage: 174: 35(float) Constant 1065353216 175: 36(fvec4) ConstantComposite 174 174 174 174 177: TypePointer Function 35(float) - 179: TypePointer Output 171(struct) - 180: 179(ptr) Variable Output - 182: 44(ptr) Variable UniformConstant + 179: TypeStruct 36(fvec4) 35(float) + 180: TypePointer Output 179(struct) + 181: 180(ptr) Variable Output 183: 44(ptr) Variable UniformConstant - 184: 40(ptr) Variable UniformConstant + 184: 44(ptr) Variable UniformConstant + 185: 40(ptr) Variable UniformConstant 4: 2 Function None 3 5: Label 9: 8(ptr) Variable Function @@ -243,7 +246,7 @@ Linked fragment stage: Store 176 175 178: 177(ptr) AccessChain 173 10 Store 178 174 - 181: 171(struct) Load 173 - Store 180 181 + 182: 171(struct) Load 173 + Store 181 182 Return FunctionEnd diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 2248b476..b064e5b2 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1453" +#define GLSLANG_REVISION "Overload400-PrecQual.1454" #define GLSLANG_DATE "29-Aug-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 9f957a6d..74609b77 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -754,28 +754,8 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l functionReturnsValue = false; inEntrypoint = (function.getName() == intermediate.getEntryPoint().c_str()); - if (inEntrypoint) { - // parameters are actually shader-scoped inputs and outputs (in or out) - unsigned int inCount = 0; - unsigned int outCount = 0; - for (int i = 0; i < function.getParamCount(); i++) { - if (function[i].type->getQualifier().isParamInput()) { - if (function[i].type->getQualifier().builtIn == EbvNone) - function[i].type->getQualifier().layoutLocation = inCount++; - function[i].type->getQualifier().storage = EvqVaryingIn; - } else { - if (function[i].type->getQualifier().builtIn == EbvNone && language != EShLangFragment) - function[i].type->getQualifier().layoutLocation = outCount++; - function[i].type->getQualifier().storage = EvqVaryingOut; - } - } - - // return value is actually shader-scoped output (out) - if (function.getType().getBasicType() != EbtVoid) { - entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType()); - entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut; - } - } + if (inEntrypoint) + remapEntrypointIO(function); // // New symbol table scope for body of function plus its arguments @@ -819,6 +799,43 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l return paramNodes; } +// AST I/O is done through shader globals declared in the 'in' or 'out' +// storage class. An HLSL entry point has a return value, input parameters +// and output parameters. These need to get remapped to the AST I/O. +void HlslParseContext::remapEntrypointIO(TFunction& function) +{ + // Will auto-assign locations here to the inputs/outputs defined by the entry point + unsigned int inCount = 0; + unsigned int outCount = 0; + + // return value is actually a shader-scoped output (out) + if (function.getType().getBasicType() != EbtVoid) { + entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType()); + entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut; + if (function.getType().getQualifier().builtIn == EbvNone) { + entryPointOutput->getWritableType().getQualifier().layoutLocation = outCount; + outCount += intermediate.computeTypeLocationSize(function.getType()); + } + } + + // parameters are actually shader-scoped inputs and outputs (in or out) + for (int i = 0; i < function.getParamCount(); i++) { + if (function[i].type->getQualifier().isParamInput()) { + function[i].type->getQualifier().storage = EvqVaryingIn; + if (function[i].type->getQualifier().builtIn == EbvNone) { + function[i].type->getQualifier().layoutLocation = inCount; + inCount += intermediate.computeTypeLocationSize(*function[i].type); + } + } else { + function[i].type->getQualifier().storage = EvqVaryingOut; + if (function[i].type->getQualifier().builtIn == EbvNone && language != EShLangFragment) { + function[i].type->getQualifier().layoutLocation = outCount; + outCount += intermediate.computeTypeLocationSize(*function[i].type); + } + } + } +} + // Handle function returns, including type conversions to the function return type // if necessary. TIntermNode* HlslParseContext::handleReturnValue(const TSourceLoc& loc, TIntermTyped* value) diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h index 50f3e8b2..f7ac1750 100755 --- a/hlsl/hlslParseHelper.h +++ b/hlsl/hlslParseHelper.h @@ -85,6 +85,7 @@ public: TIntermTyped* handleDotDereference(const TSourceLoc&, TIntermTyped* base, const TString& field); TFunction* handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype); TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&); + void remapEntrypointIO(TFunction& function); TIntermNode* handleReturnValue(const TSourceLoc&, TIntermTyped*); void handleFunctionArgument(TFunction*, TIntermTyped*& arguments, TIntermTyped* newArg); TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermNode*);