diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out index feb5c753..359f62f8 100755 --- a/Test/baseResults/hlsl.array.frag.out +++ b/Test/baseResults/hlsl.array.frag.out @@ -49,7 +49,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'a' (global 4-element array of 4-component vector of float) 0:? 's' (global 11-element array of structure{temp 7-element array of 4-component vector of float m}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'i' (layout(location=0 ) in int) 0:? 'input' (layout(location=1 ) in 3-element array of 4-component vector of float) @@ -107,7 +107,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'a' (global 4-element array of 4-component vector of float) 0:? 's' (global 11-element array of structure{temp 7-element array of 4-component vector of float m}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'i' (layout(location=0 ) in int) 0:? 'input' (layout(location=1 ) in 3-element array of 4-component vector of float) diff --git a/Test/baseResults/hlsl.assoc.frag.out b/Test/baseResults/hlsl.assoc.frag.out index 883aac26..d54d4674 100755 --- a/Test/baseResults/hlsl.assoc.frag.out +++ b/Test/baseResults/hlsl.assoc.frag.out @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:10 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'a1' (layout(location=0 ) in 4-component vector of float) 0:? 'a2' (layout(location=1 ) in 4-component vector of float) 0:? 'a3' (layout(location=2 ) in 4-component vector of float) @@ -78,7 +78,7 @@ gl_FragCoord origin is upper left 0:10 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'a1' (layout(location=0 ) in 4-component vector of float) 0:? 'a2' (layout(location=1 ) in 4-component vector of float) 0:? 'a3' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out index 2f3d1b87..78a8e738 100755 --- a/Test/baseResults/hlsl.buffer.frag.out +++ b/Test/baseResults/hlsl.buffer.frag.out @@ -36,7 +36,7 @@ gl_FragCoord origin is upper left 0:? 'anon@1' (layout(column_major std430 ) buffer block{layout(column_major std430 ) buffer 4-component vector of float v2}) 0:? 'anon@2' (layout(set=10 binding=2 column_major std140 ) uniform block{layout(column_major std140 ) uniform 4-component vector of float v3, layout(column_major std140 offset=20 ) uniform int i3}) 0:? 'anon@3' (layout(binding=8 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v4, layout(column_major std430 offset=48 ) buffer int i4, layout(column_major std430 offset=60 ) buffer float f1, layout(column_major std430 offset=64 ) buffer float f3, layout(column_major std430 offset=68 ) buffer float f4, layout(column_major std430 offset=72 ) buffer float f5, layout(column_major std430 ) buffer float f6, layout(column_major std430 ) buffer float f7}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:? 'anon@1' (layout(column_major std430 ) buffer block{layout(column_major std430 ) buffer 4-component vector of float v2}) 0:? 'anon@2' (layout(set=10 binding=2 column_major std140 ) uniform block{layout(column_major std140 ) uniform 4-component vector of float v3, layout(column_major std140 offset=20 ) uniform int i3}) 0:? 'anon@3' (layout(binding=8 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v4, layout(column_major std430 offset=48 ) buffer int i4, layout(column_major std430 offset=60 ) buffer float f1, layout(column_major std430 offset=64 ) buffer float f3, layout(column_major std430 offset=68 ) buffer float f4, layout(column_major std430 offset=72 ) buffer float f5, layout(column_major std430 ) buffer float f6, layout(column_major std430 ) buffer float f7}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index 83aec993..cf251a6f 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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -156,7 +156,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -304,7 +305,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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -319,11 +320,12 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 145 +// Id's are bound by 149 Capability Shader Capability Sampled1D @@ -331,7 +333,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" 141 146 148 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "txval10" @@ -359,6 +361,8 @@ gl_FragCoord origin is upper left Name 133 "psout" Name 141 "@entryPointOutput" Name 144 "g_tTex1df4" + Name 146 "Color" + Name 148 "Depth" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 11(g_tTex1df4a) Binding 1 Decorate 15(g_sSamp) DescriptorSet 0 @@ -372,9 +376,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 141(@entryPointOutput) Location 0 Decorate 144(g_tTex1df4) DescriptorSet 0 Decorate 144(g_tTex1df4) Binding 0 + Decorate 146(Color) Location 0 + Decorate 148(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -448,6 +453,10 @@ gl_FragCoord origin is upper left 140: TypePointer Output 131(PS_OUTPUT) 141(@entryPointOutput): 140(ptr) Variable Output 144(g_tTex1df4): 10(ptr) Variable UniformConstant + 145: TypePointer Output 130(fvec4) + 146(Color): 145(ptr) Variable Output + 147: TypePointer Output 6(float) + 148(Depth): 147(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(txval10): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index 05b7a58e..3faac3ce 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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -168,7 +168,8 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -316,7 +317,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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -331,6 +332,7 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.cast.frag.out b/Test/baseResults/hlsl.cast.frag.out index c64e23a1..3bef95f0 100755 --- a/Test/baseResults/hlsl.cast.frag.out +++ b/Test/baseResults/hlsl.cast.frag.out @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left 0:3 1.198000 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -54,7 +54,7 @@ gl_FragCoord origin is upper left 0:3 1.198000 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out index c5723222..f6c00fe6 100755 --- a/Test/baseResults/hlsl.conditional.frag.out +++ b/Test/baseResults/hlsl.conditional.frag.out @@ -109,7 +109,7 @@ gl_FragCoord origin is upper left 0:15 'f' (temp 4-component vector of float) 0:15 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -226,7 +226,7 @@ gl_FragCoord origin is upper left 0:15 'f' (temp 4-component vector of float) 0:15 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index 4c013b00..a8ff93cc 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -36,11 +36,11 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -83,27 +83,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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 34 +// Id's are bound by 36 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 31 + EntryPoint Fragment 4 "main" 31 35 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 22 "PS_OUTPUT" MemberName 22(PS_OUTPUT) 0 "color" Name 24 "ps_output" Name 31 "@entryPointOutput" - Decorate 31(@entryPointOutput) Location 0 + Name 35 "color" + Decorate 35(color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -130,6 +131,8 @@ gl_FragCoord origin is upper left 28: TypePointer Function 21(fvec4) 30: TypePointer Output 22(PS_OUTPUT) 31(@entryPointOutput): 30(ptr) Variable Output + 34: TypePointer Output 21(fvec4) + 35(color): 34(ptr) Variable Output 4(main): 2 Function None 3 5: Label 24(ps_output): 23(ptr) Variable Function diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out index 315fc2e9..019f43d7 100755 --- a/Test/baseResults/hlsl.doLoop.frag.out +++ b/Test/baseResults/hlsl.doLoop.frag.out @@ -28,7 +28,7 @@ gl_FragCoord origin is upper left 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -64,7 +64,7 @@ gl_FragCoord origin is upper left 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index 872d738c..efd82f75 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -6,7 +6,7 @@ gl_FragCoord origin is upper left 0:7 Function Parameters: 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 'out1' (layout(location=1 ) out 4-component vector of float) -0:7 'out2' (layout(location=2 ) out structure{temp 2-component vector of float v, temp 2-component vector of int i}) +0:7 'out2' (out structure{temp 2-component vector of float v, temp 2-component vector of int i}) 0:? Sequence 0:8 move second child to first child (temp 4-component vector of float) 0:8 'out1' (layout(location=1 ) out 4-component vector of float) @@ -27,7 +27,7 @@ gl_FragCoord origin is upper left 0:11 'out1' (layout(location=1 ) out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) 0:? 'out1' (layout(location=1 ) out 4-component vector of float) 0:? 'v' (layout(location=2 ) out 2-component vector of float) @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:7 Function Parameters: 0:7 'input' (layout(location=0 ) in 4-component vector of float) 0:7 'out1' (layout(location=1 ) out 4-component vector of float) -0:7 'out2' (layout(location=2 ) out structure{temp 2-component vector of float v, temp 2-component vector of int i}) +0:7 'out2' (out structure{temp 2-component vector of float v, temp 2-component vector of int i}) 0:? Sequence 0:8 move second child to first child (temp 4-component vector of float) 0:8 'out1' (layout(location=1 ) out 4-component vector of float) @@ -65,7 +65,7 @@ gl_FragCoord origin is upper left 0:11 'out1' (layout(location=1 ) out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) 0:? 'out1' (layout(location=1 ) out 4-component vector of float) 0:? 'v' (layout(location=2 ) out 2-component vector of float) diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out index 5be0720c..ba8e32e7 100755 --- a/Test/baseResults/hlsl.forLoop.frag.out +++ b/Test/baseResults/hlsl.forLoop.frag.out @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:12 Pre-Decrement (temp float) 0:12 'ii' (temp float) 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -236,7 +236,7 @@ gl_FragCoord origin is upper left 0:12 Pre-Decrement (temp float) 0:12 'ii' (temp float) 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index e8c20f09..e224ce87 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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -108,7 +108,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -208,7 +209,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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -223,18 +224,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 112 +// Id's are bound by 116 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 99 + EntryPoint Fragment 4 "main" 99 113 115 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -259,6 +261,8 @@ gl_FragCoord origin is upper left Name 105 "g_tTex1df4" Name 108 "g_tTex1di4a" Name 111 "g_tTex1du4a" + Name 113 "Color" + Name 115 "Depth" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -268,13 +272,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 99(@entryPointOutput) Location 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_tTex1di4a) DescriptorSet 0 Decorate 111(g_tTex1du4a) DescriptorSet 0 + Decorate 113(Color) Location 0 + Decorate 115(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -348,6 +353,10 @@ gl_FragCoord origin is upper left 109: TypeImage 42(int) 1D array sampled format:Unknown 110: TypePointer UniformConstant 109 111(g_tTex1du4a): 110(ptr) Variable UniformConstant + 112: TypePointer Output 7(fvec4) + 113(Color): 112(ptr) Variable Output + 114: TypePointer Output 6(float) + 115(Depth): 114(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index d5be71be..1703e472 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' (layout(location=0 ) out 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:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 Branch: Return 0:? Linker Objects @@ -106,7 +106,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -200,7 +201,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' (layout(location=0 ) out 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:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:47 Branch: Return 0:? Linker Objects @@ -219,17 +220,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 123 +// Id's are bound by 127 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 100 + EntryPoint Fragment 4 "main" 100 124 126 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -258,6 +260,8 @@ gl_FragCoord origin is upper left Name 116 "g_tTex3df4" Name 119 "g_tTex3di4" Name 122 "g_tTex3du4" + Name 124 "Color" + Name 126 "Depth" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -267,7 +271,6 @@ 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 100(@entryPointOutput) Location 0 Decorate 103(g_sSamp2d) DescriptorSet 0 Decorate 106(g_tTex1df4a) DescriptorSet 0 Decorate 106(g_tTex1df4a) Binding 1 @@ -278,6 +281,8 @@ gl_FragCoord origin is upper left Decorate 116(g_tTex3df4) DescriptorSet 0 Decorate 119(g_tTex3di4) DescriptorSet 0 Decorate 122(g_tTex3du4) DescriptorSet 0 + Decorate 124(Color) Location 0 + Decorate 126(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -362,6 +367,10 @@ gl_FragCoord origin is upper left 120: TypeImage 41(int) 3D sampled format:Unknown 121: TypePointer UniformConstant 120 122(g_tTex3du4): 121(ptr) Variable UniformConstant + 123: TypePointer Output 7(fvec4) + 124(Color): 123(ptr) Variable Output + 125: TypePointer Output 6(float) + 126(Depth): 125(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index bec800c0..abc7de17 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -98,7 +98,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) Linked vertex stage: @@ -203,7 +203,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index e16f76cb..61d42c9e 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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -81,7 +81,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -151,7 +152,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' (layout(location=0 ) out 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:43 Branch: Return 0:? Linker Objects @@ -169,17 +170,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 102 +// Id's are bound by 106 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 71 + EntryPoint Fragment 4 "main" 71 103 105 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -204,13 +206,14 @@ gl_FragCoord origin is upper left Name 95 "g_tTexcdf4" Name 98 "g_tTexcdi4" Name 101 "g_tTexcdu4" + Name 103 "Color" + Name 105 "Depth" 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 71(@entryPointOutput) Location 0 Decorate 76(g_tTex1df4a) DescriptorSet 0 Decorate 76(g_tTex1df4a) Binding 1 Decorate 77(g_tTex1df4) DescriptorSet 0 @@ -223,6 +226,8 @@ gl_FragCoord origin is upper left Decorate 95(g_tTexcdf4) DescriptorSet 0 Decorate 98(g_tTexcdi4) DescriptorSet 0 Decorate 101(g_tTexcdu4) DescriptorSet 0 + Decorate 103(Color) Location 0 + Decorate 105(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -301,6 +306,10 @@ gl_FragCoord origin is upper left 99: TypeImage 45(int) Cube sampled format:Unknown 100: TypePointer UniformConstant 99 101(g_tTexcdu4): 100(ptr) Variable UniformConstant + 102: TypePointer Output 7(fvec4) + 103(Color): 102(ptr) Variable Output + 104: TypePointer Output 6(float) + 105(Depth): 104(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index b98c1dfc..c3fab2ea 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' (layout(location=0 ) out 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:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 Branch: Return 0:? Linker Objects @@ -78,7 +78,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -151,7 +152,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' (layout(location=0 ) out 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:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:35 Branch: Return 0:? Linker Objects @@ -163,17 +164,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 85 +// Id's are bound by 89 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 72 + EntryPoint Fragment 4 "main" 72 86 88 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval20" @@ -192,19 +194,22 @@ gl_FragCoord origin is upper left Name 78 "g_tTex1df4" Name 81 "g_tTex1di4" Name 84 "g_tTex1du4" + Name 86 "Color" + Name 88 "Depth" 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 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 86(Color) Location 0 + Decorate 88(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -266,6 +271,10 @@ gl_FragCoord origin is upper left 82: TypeImage 45(int) 1D array sampled format:Unknown 83: TypePointer UniformConstant 82 84(g_tTex1du4): 83(ptr) Variable UniformConstant + 85: TypePointer Output 7(fvec4) + 86(Color): 85(ptr) Variable Output + 87: TypePointer Output 6(float) + 88(Depth): 87(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval20): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index ee448860..7cfe3d95 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' (layout(location=0 ) out 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:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -283,7 +283,8 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -554,7 +555,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' (layout(location=0 ) out 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:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -573,18 +574,19 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 222 +// Id's are bound by 226 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 204 + EntryPoint Fragment 4 "main" 204 223 225 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval00" @@ -631,6 +633,8 @@ gl_FragCoord origin is upper left Name 216 "g_tTex1du4a" Name 218 "c1" Name 221 "c2" + Name 223 "Color" + Name 225 "Depth" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -640,12 +644,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 204(@entryPointOutput) Location 0 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 + Decorate 223(Color) Location 0 + Decorate 225(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -715,6 +720,10 @@ gl_FragCoord origin is upper left 219: TypeVector 6(float) 2 220: TypePointer UniformConstant 219(fvec2) 221(c2): 220(ptr) Variable UniformConstant + 222: TypePointer Output 7(fvec4) + 223(Color): 222(ptr) Variable Output + 224: TypePointer Output 6(float) + 225(Depth): 224(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval00): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 15defeba..9ba2a1ac 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' (layout(location=0 ) out 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:76 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 Branch: Return 0:? Linker Objects @@ -287,7 +287,8 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -558,7 +559,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' (layout(location=0 ) out 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:76 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:76 Branch: Return 0:? Linker Objects @@ -581,17 +582,18 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 232 +// Id's are bound by 236 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 205 + EntryPoint Fragment 4 "main" 205 233 235 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval00" @@ -642,6 +644,8 @@ gl_FragCoord origin is upper left Name 227 "g_tTex3du4" Name 229 "c1" Name 231 "c4" + Name 233 "Color" + Name 235 "Depth" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 Decorate 16(g_sSamp) Binding 0 @@ -651,7 +655,6 @@ 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 205(@entryPointOutput) Location 0 Decorate 208(g_sSamp2d) DescriptorSet 0 Decorate 211(g_tTex1df4a) DescriptorSet 0 Decorate 211(g_tTex1df4a) Binding 1 @@ -662,6 +665,8 @@ gl_FragCoord origin is upper left Decorate 221(g_tTex3df4) DescriptorSet 0 Decorate 224(g_tTex3di4) DescriptorSet 0 Decorate 227(g_tTex3du4) DescriptorSet 0 + Decorate 233(Color) Location 0 + Decorate 235(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -741,6 +746,10 @@ gl_FragCoord origin is upper left 229(c1): 228(ptr) Variable UniformConstant 230: TypePointer UniformConstant 7(fvec4) 231(c4): 230(ptr) Variable UniformConstant + 232: TypePointer Output 7(fvec4) + 233(Color): 232(ptr) Variable Output + 234: TypePointer Output 6(float) + 235(Depth): 234(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval00): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index 6c1cee2b..283e085d 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' (layout(location=0 ) out 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:115 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 Branch: Return 0:? Linker Objects @@ -363,7 +363,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -706,7 +707,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' (layout(location=0 ) out 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:115 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:115 Branch: Return 0:? Linker Objects @@ -733,18 +734,19 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 313 +// Id's are bound by 317 Capability Shader Capability ImageGatherExtended Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 267 + EntryPoint Fragment 4 "main" 267 314 316 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval001" @@ -799,13 +801,14 @@ gl_FragCoord origin is upper left Name 307 "o1" Name 310 "o3" Name 312 "o4" + Name 314 "Color" + Name 316 "Depth" 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 267(@entryPointOutput) Location 0 Decorate 270(g_sSamp2d) DescriptorSet 0 Decorate 273(g_tTex1df4a) DescriptorSet 0 Decorate 273(g_tTex1df4a) Binding 1 @@ -819,6 +822,8 @@ gl_FragCoord origin is upper left Decorate 292(g_tTexcdf4) DescriptorSet 0 Decorate 295(g_tTexcdi4) DescriptorSet 0 Decorate 298(g_tTexcdu4) DescriptorSet 0 + Decorate 314(Color) Location 0 + Decorate 316(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -907,6 +912,10 @@ gl_FragCoord origin is upper left 310(o3): 309(ptr) Variable UniformConstant 311: TypePointer UniformConstant 31(ivec4) 312(o4): 311(ptr) Variable UniformConstant + 313: TypePointer Output 7(fvec4) + 314(Color): 313(ptr) Variable Output + 315: TypePointer Output 6(float) + 316(Depth): 315(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval001): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 547f1194..a6fabbf1 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' (layout(location=0 ) out 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:109 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 Branch: Return 0:? Linker Objects @@ -359,7 +359,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -702,7 +703,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' (layout(location=0 ) out 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:109 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:109 Branch: Return 0:? Linker Objects @@ -725,11 +726,12 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 303 +// Id's are bound by 307 Capability Shader Capability ImageGatherExtended @@ -737,7 +739,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" 267 304 306 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval001" @@ -788,13 +790,14 @@ gl_FragCoord origin is upper left Name 297 "o1" Name 300 "o3" Name 302 "o4" + Name 304 "Color" + Name 306 "Depth" 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 267(@entryPointOutput) Location 0 Decorate 270(g_sSamp2d) DescriptorSet 0 Decorate 273(g_tTex1df4a) DescriptorSet 0 Decorate 273(g_tTex1df4a) Binding 0 @@ -803,6 +806,8 @@ gl_FragCoord origin is upper left Decorate 282(g_tTexcdf4a) DescriptorSet 0 Decorate 285(g_tTexcdi4a) DescriptorSet 0 Decorate 288(g_tTexcdu4a) DescriptorSet 0 + Decorate 304(Color) Location 0 + Decorate 306(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -881,6 +886,10 @@ gl_FragCoord origin is upper left 300(o3): 299(ptr) Variable UniformConstant 301: TypePointer UniformConstant 31(ivec4) 302(o4): 301(ptr) Variable UniformConstant + 303: TypePointer Output 7(fvec4) + 304(Color): 303(ptr) Variable Output + 305: TypePointer Output 6(float) + 306(Depth): 305(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval001): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index 278fa6fd..1c5e4255 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' (layout(location=0 ) out 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:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 Branch: Return 0:? Linker Objects @@ -1094,7 +1094,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' (uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' (uniform utexture2DMSArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -2163,7 +2164,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' (layout(location=0 ) out 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:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:279 Branch: Return 0:? Linker Objects @@ -2195,11 +2196,12 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' (uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' (uniform utexture2DMSArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 540 +// Id's are bound by 544 Capability Shader Capability Sampled1D @@ -2208,7 +2210,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" 534 541 543 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "sizeQueryTemp" @@ -2298,6 +2300,8 @@ gl_FragCoord origin is upper left Name 524 "psout" Name 534 "@entryPointOutput" Name 539 "g_sSamp" + Name 541 "Color" + Name 543 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 @@ -2327,9 +2331,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 534(@entryPointOutput) Location 0 Decorate 539(g_sSamp) DescriptorSet 0 Decorate 539(g_sSamp) Binding 0 + Decorate 541(Color) Location 0 + Decorate 543(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 @@ -2441,6 +2446,10 @@ gl_FragCoord origin is upper left 537: TypeSampler 538: TypePointer UniformConstant 537 539(g_sSamp): 538(ptr) Variable UniformConstant + 540: TypePointer Output 521(fvec4) + 541(Color): 540(ptr) Variable Output + 542: TypePointer Output 9(float) + 543(Depth): 542(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(sizeQueryTemp): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index c8a10643..c03e8c21 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -44,7 +44,7 @@ Shader version: 450 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) -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}) Linked vertex stage: @@ -95,7 +95,7 @@ Shader version: 450 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) -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}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index ac5ee6b2..8addf8fa 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -45,14 +45,15 @@ 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' (layout(location=0 ) out 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:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 Branch: Return 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -99,13 +100,14 @@ 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' (layout(location=0 ) out 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:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:22 Branch: Return 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out index d9e9fa58..499015a4 100755 --- a/Test/baseResults/hlsl.if.frag.out +++ b/Test/baseResults/hlsl.if.frag.out @@ -93,7 +93,7 @@ gl_FragCoord origin is upper left 0:32 Pre-Increment (temp int) 0:32 'ii' (temp int) 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -194,7 +194,7 @@ gl_FragCoord origin is upper left 0:32 Pre-Increment (temp int) 0:32 'ii' (temp int) 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out index e6b24c3f..99acc235 100755 --- a/Test/baseResults/hlsl.init.frag.out +++ b/Test/baseResults/hlsl.init.frag.out @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:? 'single2' (global structure{temp 2-component vector of uint v}) 0:? 'single3' (global structure{temp structure{temp int f} s1}) 0:? 'single4' (global structure{temp structure{temp 2-component vector of uint v} s1}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -308,7 +308,7 @@ gl_FragCoord origin is upper left 0:? 'single2' (global structure{temp 2-component vector of uint v}) 0:? 'single3' (global structure{temp structure{temp int f} s1}) 0:? 'single4' (global structure{temp structure{temp 2-component vector of uint v} s1}) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index 6b8e95ca..b5702f34 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -45,11 +45,11 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -101,20 +101,20 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 46 +// Id's are bound by 48 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 43 + EntryPoint Fragment 4 "main" 43 47 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 6 "Test1(" @@ -132,7 +132,8 @@ gl_FragCoord origin is upper left MemberName 34(PS_OUTPUT) 0 "color" Name 36 "ps_output" Name 43 "@entryPointOutput" - Decorate 43(@entryPointOutput) Location 0 + Name 47 "color" + Decorate 47(color) Location 0 2: TypeVoid 3: TypeFunction 2 8: TypeFloat 32 @@ -164,6 +165,8 @@ gl_FragCoord origin is upper left 40: TypePointer Function 33(fvec4) 42: TypePointer Output 34(PS_OUTPUT) 43(@entryPointOutput): 42(ptr) Variable Output + 46: TypePointer Output 33(fvec4) + 47(color): 46(ptr) Variable Output 4(main): 2 Function None 3 5: Label 36(ps_output): 35(ptr) Variable Function diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index 4e974927..af6106b4 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -57,11 +57,12 @@ 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' (layout(location=0 ) out 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:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) 0:? 'inpos' (noperspective in 4-component vector of float FragCoord) @@ -126,21 +127,22 @@ 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' (layout(location=0 ) out 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:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) 0:? 'inpos' (noperspective in 4-component vector of float FragCoord) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 56 +// Id's are bound by 60 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 45 53 + EntryPoint Fragment 4 "main" 45 53 57 59 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 12 "MyFunc(f1;f1;f1;" @@ -159,10 +161,13 @@ gl_FragCoord origin is upper left Name 33 "psout" Name 45 "inpos" Name 53 "@entryPointOutput" + Name 57 "Color" + Name 59 "Depth" MemberDecorate 31(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 45(inpos) NoPerspective Decorate 45(inpos) BuiltIn FragCoord - Decorate 53(@entryPointOutput) Location 0 + Decorate 57(Color) Location 0 + Decorate 59(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -186,6 +191,10 @@ gl_FragCoord origin is upper left 48: TypePointer Input 6(float) 52: TypePointer Output 31(PS_OUTPUT) 53(@entryPointOutput): 52(ptr) Variable Output + 56: TypePointer Output 30(fvec4) + 57(Color): 56(ptr) Variable Output + 58: TypePointer Output 6(float) + 59(Depth): 58(ptr) Variable Output 4(main): 2 Function None 3 5: Label 17(x): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out index 82a64477..95e17258 100644 --- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out +++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out @@ -18,7 +18,7 @@ local_size = (1, 1, 1) 0:11 0.000000 0:11 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) Linked compute stage: @@ -43,7 +43,7 @@ local_size = (1, 1, 1) 0:11 0.000000 0:11 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.comp.out b/Test/baseResults/hlsl.intrinsics.comp.out index cbf47118..b760c65e 100644 --- a/Test/baseResults/hlsl.intrinsics.comp.out +++ b/Test/baseResults/hlsl.intrinsics.comp.out @@ -321,7 +321,7 @@ local_size = (1, 1, 1) 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) @@ -654,7 +654,7 @@ local_size = (1, 1, 1) 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.intrinsics.double.frag.out b/Test/baseResults/hlsl.intrinsics.double.frag.out index a5ace7e8..0dba0329 100644 --- a/Test/baseResults/hlsl.intrinsics.double.frag.out +++ b/Test/baseResults/hlsl.intrinsics.double.frag.out @@ -34,7 +34,7 @@ gl_FragCoord origin is upper left 0:9 0.000000 0:9 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:? 'inDV1a' (layout(location=0 ) in double) 0:? 'inDV1b' (layout(location=1 ) in double) 0:? 'inDV1c' (layout(location=2 ) in double) @@ -83,7 +83,7 @@ gl_FragCoord origin is upper left 0:9 0.000000 0:9 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) 0:? 'inDV1a' (layout(location=0 ) in double) 0:? 'inDV1b' (layout(location=1 ) in double) 0:? 'inDV1c' (layout(location=2 ) in double) diff --git a/Test/baseResults/hlsl.intrinsics.f1632.frag.out b/Test/baseResults/hlsl.intrinsics.f1632.frag.out index aae3cedc..21daced7 100644 --- a/Test/baseResults/hlsl.intrinsics.f1632.frag.out +++ b/Test/baseResults/hlsl.intrinsics.f1632.frag.out @@ -66,7 +66,7 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:32 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) @@ -133,7 +133,7 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:32 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 562cdcd9..fd807bae 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -2774,7 +2774,7 @@ gl_FragCoord origin is upper left 0:491 1.000000 0:492 Sequence 0:492 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) 0:492 'ps_output' (temp structure{temp 4-component vector of float color}) 0:492 Branch: Return 0:? Linker Objects @@ -2790,7 +2790,7 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -5571,7 +5571,7 @@ gl_FragCoord origin is upper left 0:491 1.000000 0:492 Sequence 0:492 move second child to first child (temp structure{temp 4-component vector of float color}) -0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) 0:492 'ps_output' (temp structure{temp 4-component vector of float color}) 0:492 Branch: Return 0:? Linker Objects @@ -5587,17 +5587,17 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 1824 +// Id's are bound by 1826 Capability Shader Capability DerivativeControl 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 1805 + EntryPoint Fragment 4 "main" 1805 1825 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 16 "PixelShaderFunctionS(f1;f1;f1;u1;u1;" @@ -6124,7 +6124,8 @@ gl_FragCoord origin is upper left Name 1821 "gs_ua4" Name 1822 "gs_ub4" Name 1823 "gs_uc4" - Decorate 1805(@entryPointOutput) Location 0 + Name 1825 "color" + Decorate 1825(color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -6258,6 +6259,8 @@ gl_FragCoord origin is upper left 1821(gs_ua4): 1820(ptr) Variable Private 1822(gs_ub4): 1820(ptr) Variable Private 1823(gs_uc4): 1820(ptr) Variable Private + 1824: TypePointer Output 48(fvec4) + 1825(color): 1824(ptr) Variable Output 4(main): 2 Function None 3 5: Label 1800(ps_output): 1799(ptr) Variable Function diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out index 75bdbf6c..01008644 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.comp.out +++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out @@ -62,7 +62,7 @@ local_size = (1, 1, 1) 0:? 4.000000 0:199 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) @@ -135,7 +135,7 @@ local_size = (1, 1, 1) 0:? 4.000000 0:199 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.intrinsics.negative.frag.out b/Test/baseResults/hlsl.intrinsics.negative.frag.out index 28526950..2244e8bc 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.frag.out +++ b/Test/baseResults/hlsl.intrinsics.negative.frag.out @@ -408,7 +408,7 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:? 4.000000 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) @@ -764,7 +764,7 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:? 4.000000 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out index a9b2bbc5..e702d332 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.vert.out +++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out @@ -126,7 +126,7 @@ Shader version: 450 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) @@ -263,7 +263,7 @@ Shader version: 450 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'inF0' (layout(location=0 ) in 4-component vector of float) 0:? 'inF1' (layout(location=1 ) in 4-component vector of float) 0:? 'inF2' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 0a40e2a7..5de1da62 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' (layout(location=0 ) out 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 Branch: Return 0:? Linker Objects @@ -109,7 +109,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -206,7 +207,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' (layout(location=0 ) out 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:54 Branch: Return 0:? Linker Objects @@ -225,18 +226,19 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 105 +// Id's are bound by 109 Capability Shader Capability ImageGatherExtended Capability ImageMSArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 92 + EntryPoint Fragment 4 "main" 92 106 108 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex2dmsf4" @@ -259,6 +261,8 @@ gl_FragCoord origin is upper left Name 102 "o1" Name 103 "o3" Name 104 "o4" + Name 106 "Color" + Name 108 "Depth" Decorate 9(g_tTex2dmsf4) DescriptorSet 0 Decorate 21(g_tTex2dmsi4) DescriptorSet 0 Decorate 29(g_tTex2dmsu4) DescriptorSet 0 @@ -266,9 +270,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 92(@entryPointOutput) Location 0 Decorate 97(g_sSamp) DescriptorSet 0 Decorate 97(g_sSamp) Binding 0 + Decorate 106(Color) Location 0 + Decorate 108(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -323,6 +328,10 @@ gl_FragCoord origin is upper left 102(o1): 98(ptr) Variable UniformConstant 103(o3): 52(ptr) Variable UniformConstant 104(o4): 100(ptr) Variable UniformConstant + 105: TypePointer Output 17(fvec4) + 106(Color): 105(ptr) Variable Output + 107: TypePointer Output 6(float) + 108(Depth): 107(ptr) Variable Output 4(main): 2 Function None 3 5: Label 82(psout): 81(ptr) Variable Function diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 2c019d8d..f4966766 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' (layout(location=0 ) out 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:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -142,7 +142,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -257,7 +258,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' (layout(location=0 ) out 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:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:70 Branch: Return 0:? Linker Objects @@ -291,18 +292,19 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 145 +// Id's are bound by 149 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 87 + EntryPoint Fragment 4 "main" 87 146 148 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4a" @@ -340,6 +342,8 @@ gl_FragCoord origin is upper left Name 142 "o2" Name 143 "o3" Name 144 "o4" + Name 146 "Color" + Name 148 "Depth" Decorate 9(g_tTex1df4a) DescriptorSet 0 Decorate 27(g_tTex1di4a) DescriptorSet 0 Decorate 37(g_tTex1du4a) DescriptorSet 0 @@ -347,7 +351,6 @@ 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 87(@entryPointOutput) Location 0 Decorate 92(g_sSamp) DescriptorSet 0 Decorate 92(g_sSamp) Binding 0 Decorate 95(g_tTex1df4) DescriptorSet 0 @@ -366,6 +369,8 @@ gl_FragCoord origin is upper left Decorate 131(g_tTexcdf4a) DescriptorSet 0 Decorate 134(g_tTexcdi4a) DescriptorSet 0 Decorate 137(g_tTexcdu4a) DescriptorSet 0 + Decorate 146(Color) Location 0 + Decorate 148(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -466,6 +471,10 @@ gl_FragCoord origin is upper left 142(o2): 139(ptr) Variable UniformConstant 143(o3): 13(ptr) Variable UniformConstant 144(o4): 49(ptr) Variable UniformConstant + 145: TypePointer Output 23(fvec4) + 146(Color): 145(ptr) Variable Output + 147: TypePointer Output 6(float) + 148(Depth): 147(ptr) Variable Output 4(main): 2 Function None 3 5: Label 77(psout): 76(ptr) Variable Function diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 10d0442b..2d8501aa 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' (layout(location=0 ) out 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:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -175,7 +175,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -323,7 +324,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' (layout(location=0 ) out 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:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -357,18 +358,19 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 165 +// Id's are bound by 169 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 118 + EntryPoint Fragment 4 "main" 118 166 168 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4" @@ -406,6 +408,8 @@ gl_FragCoord origin is upper left Name 162 "o2" Name 163 "o3" Name 164 "o4" + Name 166 "Color" + Name 168 "Depth" Decorate 9(g_tTex1df4) DescriptorSet 0 Decorate 9(g_tTex1df4) Binding 0 Decorate 27(g_tTex1di4) DescriptorSet 0 @@ -417,7 +421,6 @@ 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 118(@entryPointOutput) Location 0 Decorate 123(g_sSamp) DescriptorSet 0 Decorate 123(g_sSamp) Binding 0 Decorate 126(g_tTexcdf4) DescriptorSet 0 @@ -432,6 +435,8 @@ gl_FragCoord origin is upper left Decorate 153(g_tTexcdf4a) DescriptorSet 0 Decorate 156(g_tTexcdi4a) DescriptorSet 0 Decorate 159(g_tTexcdu4a) DescriptorSet 0 + Decorate 166(Color) Location 0 + Decorate 168(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -534,6 +539,10 @@ gl_FragCoord origin is upper left 162(o2): 13(ptr) Variable UniformConstant 163(o3): 50(ptr) Variable UniformConstant 164(o4): 80(ptr) Variable UniformConstant + 165: TypePointer Output 23(fvec4) + 166(Color): 165(ptr) Variable Output + 167: TypePointer Output 6(float) + 168(Depth): 167(ptr) Variable Output 4(main): 2 Function None 3 5: Label 108(psout): 107(ptr) Variable Function diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index fd3761c9..a0082097 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -167,7 +167,7 @@ Shader version: 450 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -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}) Linked vertex stage: @@ -341,7 +341,7 @@ Shader version: 450 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -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}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index 57f6eb55..86acd71f 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' (layout(location=0 ) out 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:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 Branch: Return 0:? Linker Objects @@ -58,7 +58,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -107,7 +108,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' (layout(location=0 ) out 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:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:37 Branch: Return 0:? Linker Objects @@ -123,17 +124,18 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 71 +// Id's are bound by 75 Capability Shader Capability SampledBuffer 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 55 + EntryPoint Fragment 4 "main" 55 72 74 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "r00" @@ -156,13 +158,16 @@ gl_FragCoord origin is upper left Name 68 "o2" Name 69 "o3" Name 70 "o4" + Name 72 "Color" + Name 74 "Depth" 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 55(@entryPointOutput) Location 0 Decorate 58(g_tTexbf4_test) DescriptorSet 0 Decorate 58(g_tTexbf4_test) Binding 0 + Decorate 72(Color) Location 0 + Decorate 74(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -210,6 +215,10 @@ gl_FragCoord origin is upper left 68(o2): 60(ptr) Variable UniformConstant 69(o3): 63(ptr) Variable UniformConstant 70(o4): 65(ptr) Variable UniformConstant + 71: TypePointer Output 7(fvec4) + 72(Color): 71(ptr) Variable Output + 73: TypePointer Output 6(float) + 74(Depth): 73(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(r00): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index 57dd6f77..82f00d24 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' (layout(location=0 ) out 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:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -184,7 +184,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -341,7 +342,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' (layout(location=0 ) out 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:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:75 Branch: Return 0:? Linker Objects @@ -375,11 +376,12 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 174 +// Id's are bound by 178 Capability Shader Capability ImageGatherExtended @@ -387,7 +389,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" 130 175 177 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4" @@ -425,6 +427,8 @@ gl_FragCoord origin is upper left Name 171 "g_tTexcdu4a" Name 172 "c1" Name 173 "o4" + Name 175 "Color" + Name 177 "Depth" Decorate 9(g_tTex1df4) DescriptorSet 0 Decorate 9(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 @@ -436,7 +440,6 @@ 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 130(@entryPointOutput) Location 0 Decorate 135(g_sSamp) DescriptorSet 0 Decorate 135(g_sSamp) Binding 0 Decorate 138(g_tTexcdf4) DescriptorSet 0 @@ -451,6 +454,8 @@ gl_FragCoord origin is upper left Decorate 165(g_tTexcdf4a) DescriptorSet 0 Decorate 168(g_tTexcdi4a) DescriptorSet 0 Decorate 171(g_tTexcdu4a) DescriptorSet 0 + Decorate 175(Color) Location 0 + Decorate 177(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -553,6 +558,10 @@ gl_FragCoord origin is upper left 171(g_tTexcdu4a): 170(ptr) Variable UniformConstant 172(c1): 17(ptr) Variable UniformConstant 173(o4): 88(ptr) Variable UniformConstant + 174: TypePointer Output 25(fvec4) + 175(Color): 174(ptr) Variable Output + 176: TypePointer Output 6(float) + 177(Depth): 176(ptr) Variable Output 4(main): 2 Function None 3 5: Label 120(psout): 119(ptr) Variable Function diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 68e0aed4..e3230f6c 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' (layout(location=0 ) out 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:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 Branch: Return 0:? Linker Objects @@ -148,7 +148,8 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -269,7 +270,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' (layout(location=0 ) out 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:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:68 Branch: Return 0:? Linker Objects @@ -303,11 +304,12 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 151 +// Id's are bound by 155 Capability Shader Capability ImageGatherExtended @@ -315,7 +317,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" 96 152 154 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "g_tTex1df4a" @@ -353,6 +355,8 @@ gl_FragCoord origin is upper left Name 148 "c2" Name 149 "o3" Name 150 "o4" + Name 152 "Color" + Name 154 "Depth" Decorate 9(g_tTex1df4a) DescriptorSet 0 Decorate 29(g_tTex1di4a) DescriptorSet 0 Decorate 40(g_tTex1du4a) DescriptorSet 0 @@ -360,7 +364,6 @@ 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 96(@entryPointOutput) Location 0 Decorate 101(g_sSamp) DescriptorSet 0 Decorate 101(g_sSamp) Binding 0 Decorate 104(g_tTex1df4) DescriptorSet 0 @@ -379,6 +382,8 @@ gl_FragCoord origin is upper left Decorate 140(g_tTexcdf4a) DescriptorSet 0 Decorate 143(g_tTexcdi4a) DescriptorSet 0 Decorate 146(g_tTexcdu4a) DescriptorSet 0 + Decorate 152(Color) Location 0 + Decorate 154(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -479,6 +484,10 @@ gl_FragCoord origin is upper left 148(c2): 60(ptr) Variable UniformConstant 149(o3): 13(ptr) Variable UniformConstant 150(o4): 53(ptr) Variable UniformConstant + 151: TypePointer Output 25(fvec4) + 152(Color): 151(ptr) Variable Output + 153: TypePointer Output 6(float) + 154(Depth): 153(ptr) Variable Output 4(main): 2 Function None 3 5: Label 86(psout): 85(ptr) Variable Function diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out index 36ba9019..d8eb9de3 100644 --- a/Test/baseResults/hlsl.matrixindex.frag.out +++ b/Test/baseResults/hlsl.matrixindex.frag.out @@ -110,13 +110,13 @@ gl_FragCoord origin is upper left 0:47 'e2_11' (temp float) 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) 0:48 'psout' (temp structure{temp 4-component vector of float Color}) 0:48 Branch: Return 0:? Linker Objects 0:? 'idx' (uniform int) 0:? 'um' (uniform 3X2 matrix of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -233,22 +233,22 @@ gl_FragCoord origin is upper left 0:47 'e2_11' (temp float) 0:48 Sequence 0:48 move second child to first child (temp structure{temp 4-component vector of float Color}) -0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) 0:48 'psout' (temp structure{temp 4-component vector of float Color}) 0:48 Branch: Return 0:? Linker Objects 0:? 'idx' (uniform int) 0:? 'um' (uniform 3X2 matrix of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 74 +// Id's are bound by 76 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 71 + EntryPoint Fragment 4 "main" 71 75 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "e1_00" @@ -275,7 +275,8 @@ gl_FragCoord origin is upper left MemberName 62(PS_OUTPUT) 0 "Color" Name 64 "psout" Name 71 "@entryPointOutput" - Decorate 71(@entryPointOutput) Location 0 + Name 75 "Color" + Decorate 75(Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -316,6 +317,8 @@ gl_FragCoord origin is upper left 68: TypePointer Function 61(fvec4) 70: TypePointer Output 62(PS_OUTPUT) 71(@entryPointOutput): 70(ptr) Variable Output + 74: TypePointer Output 61(fvec4) + 75(Color): 74(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(e1_00): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.max.frag.out b/Test/baseResults/hlsl.max.frag.out index 04aeb2d4..d396be8b 100755 --- a/Test/baseResults/hlsl.max.frag.out +++ b/Test/baseResults/hlsl.max.frag.out @@ -15,7 +15,7 @@ gl_FragCoord origin is upper left 0:3 'input2' (layout(location=1 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input1' (layout(location=0 ) in 4-component vector of float) 0:? 'input2' (layout(location=1 ) in 4-component vector of float) @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:3 'input2' (layout(location=1 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input1' (layout(location=0 ) in 4-component vector of float) 0:? 'input2' (layout(location=1 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index e470893b..787a503a 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -60,11 +60,11 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -131,20 +131,20 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 43 +// Id's are bound by 45 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 40 + EntryPoint Fragment 4 "main" 40 44 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -160,7 +160,8 @@ gl_FragCoord origin is upper left MemberName 30(PS_OUTPUT) 0 "color" Name 32 "ps_output" Name 40 "@entryPointOutput" - Decorate 40(@entryPointOutput) Location 0 + Name 44 "color" + Decorate 44(color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -184,6 +185,8 @@ gl_FragCoord origin is upper left 37: TypePointer Function 29(fvec4) 39: TypePointer Output 30(PS_OUTPUT) 40(@entryPointOutput): 39(ptr) Variable Output + 43: TypePointer Output 29(fvec4) + 44(color): 43(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.overload.frag.out b/Test/baseResults/hlsl.overload.frag.out index 24a23a95..0e0f4707 100755 --- a/Test/baseResults/hlsl.overload.frag.out +++ b/Test/baseResults/hlsl.overload.frag.out @@ -354,7 +354,7 @@ gl_FragCoord origin is upper left 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -716,7 +716,7 @@ gl_FragCoord origin is upper left 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 6acd5684..fac24107 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -33,11 +33,12 @@ 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' (layout(location=0 ) out 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:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -77,20 +78,21 @@ 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' (layout(location=0 ) out 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:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 30 +// Id's are bound by 34 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 27 + EntryPoint Fragment 4 "main" 27 31 33 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "thisLineIs" @@ -99,8 +101,11 @@ gl_FragCoord origin is upper left MemberName 12(PS_OUTPUT) 1 "Depth" Name 14 "psout" Name 27 "@entryPointOutput" + Name 31 "Color" + Name 33 "Depth" MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 27(@entryPointOutput) Location 0 + Decorate 31(Color) Location 0 + Decorate 33(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -118,6 +123,10 @@ gl_FragCoord origin is upper left 24: TypePointer Function 10(float) 26: TypePointer Output 12(PS_OUTPUT) 27(@entryPointOutput): 26(ptr) Variable Output + 30: TypePointer Output 11(fvec4) + 31(Color): 30(ptr) Variable Output + 32: TypePointer Output 10(float) + 33(Depth): 32(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(thisLineIs): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.precedence.frag.out b/Test/baseResults/hlsl.precedence.frag.out index 6733aa5c..e6338470 100755 --- a/Test/baseResults/hlsl.precedence.frag.out +++ b/Test/baseResults/hlsl.precedence.frag.out @@ -46,7 +46,7 @@ gl_FragCoord origin is upper left 0:8 3 (const int) 0:8 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'a1' (layout(location=0 ) in 4-component vector of float) 0:? 'a2' (layout(location=1 ) in 4-component vector of float) 0:? 'a3' (layout(location=2 ) in 4-component vector of float) @@ -103,7 +103,7 @@ gl_FragCoord origin is upper left 0:8 3 (const int) 0:8 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'a1' (layout(location=0 ) in 4-component vector of float) 0:? 'a2' (layout(location=1 ) in 4-component vector of float) 0:? 'a3' (layout(location=2 ) in 4-component vector of float) diff --git a/Test/baseResults/hlsl.precedence2.frag.out b/Test/baseResults/hlsl.precedence2.frag.out index 3f5f159d..7021837b 100755 --- a/Test/baseResults/hlsl.precedence2.frag.out +++ b/Test/baseResults/hlsl.precedence2.frag.out @@ -29,7 +29,7 @@ gl_FragCoord origin is upper left 0:8 'a4' (layout(location=3 ) in int) 0:8 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out int) +0:? '@entryPointOutput' (layout(location=0 ) out int) 0:? 'a1' (layout(location=0 ) in int) 0:? 'a2' (layout(location=1 ) in int) 0:? 'a3' (layout(location=2 ) in int) @@ -69,7 +69,7 @@ gl_FragCoord origin is upper left 0:8 'a4' (layout(location=3 ) in int) 0:8 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out int) +0:? '@entryPointOutput' (layout(location=0 ) out int) 0:? 'a1' (layout(location=0 ) in int) 0:? 'a2' (layout(location=1 ) in int) 0:? 'a3' (layout(location=2 ) in int) diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index 38b97951..4cbf8b77 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -21,12 +21,12 @@ 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' (layout(location=0 ) out structure{noContraction temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 0:? 'precisefloat' (noContraction global float) -0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) noContraction out 4-component vector of float) Linked fragment stage: @@ -54,21 +54,21 @@ 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' (layout(location=0 ) out structure{noContraction temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 0:? 'precisefloat' (noContraction global float) -0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) noContraction out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 31 +// Id's are bound by 33 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 26 + EntryPoint Fragment 4 "main" 26 32 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 13 "MyFunction(f1;vf3;" @@ -79,7 +79,8 @@ gl_FragCoord origin is upper left Name 18 "ps_output" Name 26 "@entryPointOutput" Name 30 "precisefloat" - Decorate 26(@entryPointOutput) Location 0 + Name 32 "color" + Decorate 32(color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -99,6 +100,8 @@ gl_FragCoord origin is upper left 26(@entryPointOutput): 25(ptr) Variable Output 29: TypePointer Private 6(float) 30(precisefloat): 29(ptr) Variable Private + 31: TypePointer Output 15(fvec4) + 32(color): 31(ptr) Variable Output 4(main): 2 Function None 3 5: Label 18(ps_output): 17(ptr) Variable Function diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index eea37d35..1e20680f 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' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (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 @@ -512,7 +512,7 @@ gl_FragCoord origin is upper left 0:? 'fs' (uniform float) 0:? 'us' (uniform uint) 0:? 'ds' (uniform double) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -1017,7 +1017,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' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (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 @@ -1031,17 +1031,17 @@ gl_FragCoord origin is upper left 0:? 'fs' (uniform float) 0:? 'us' (uniform uint) 0:? 'ds' (uniform double) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 480 +// Id's are bound by 482 Capability Shader Capability Float64 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 477 + EntryPoint Fragment 4 "main" 477 481 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 11 "Fn_F3(vf3;" @@ -1131,7 +1131,8 @@ gl_FragCoord origin is upper left MemberName 471(PS_OUTPUT) 0 "Color" Name 473 "psout" Name 477 "@entryPointOutput" - Decorate 477(@entryPointOutput) Location 0 + Name 481 "Color" + Decorate 481(Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -1204,6 +1205,8 @@ gl_FragCoord origin is upper left 472: TypePointer Function 471(PS_OUTPUT) 476: TypePointer Output 471(PS_OUTPUT) 477(@entryPointOutput): 476(ptr) Variable Output + 480: TypePointer Output 462(fvec4) + 481(Color): 480(ptr) Variable Output 4(main): 2 Function None 3 5: Label 252(r00): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index da683940..d5499257 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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -138,7 +138,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -268,7 +269,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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -283,18 +284,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 134 +// Id's are bound by 138 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 130 + EntryPoint Fragment 4 "main" 130 135 137 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -322,6 +324,8 @@ gl_FragCoord origin is upper left Name 122 "psout" Name 130 "@entryPointOutput" Name 133 "g_tTex1df4a" + Name 135 "Color" + Name 137 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -335,9 +339,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 130(@entryPointOutput) Location 0 Decorate 133(g_tTex1df4a) DescriptorSet 0 Decorate 133(g_tTex1df4a) Binding 1 + Decorate 135(Color) Location 0 + Decorate 137(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -418,6 +423,10 @@ gl_FragCoord origin is upper left 129: TypePointer Output 120(PS_OUTPUT) 130(@entryPointOutput): 129(ptr) Variable Output 133(g_tTex1df4a): 11(ptr) Variable UniformConstant + 134: TypePointer Output 7(fvec4) + 135(Color): 134(ptr) Variable Output + 136: TypePointer Output 6(float) + 137(Depth): 136(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 6f6dc6de..bb73a97e 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' (layout(location=0 ) out 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 Branch: Return 0:? Linker Objects @@ -253,7 +253,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -491,7 +492,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' (layout(location=0 ) out 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:89 Branch: Return 0:? Linker Objects @@ -511,17 +512,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 186 +// Id's are bound by 190 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 180 187 189 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 7 "MemberTest" @@ -571,6 +573,8 @@ gl_FragCoord origin is upper left Name 183 "g_sSamp2d" Name 184 "g_sSamp2D_b" Name 185 "g_tTex1df4a" + Name 187 "Color" + Name 189 "Depth" Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) Binding 0 Decorate 45(g_sSamp) DescriptorSet 0 @@ -587,11 +591,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 180(@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 + Decorate 187(Color) Location 0 + Decorate 189(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -696,6 +701,10 @@ gl_FragCoord origin is upper left 183(g_sSamp2d): 44(ptr) Variable UniformConstant 184(g_sSamp2D_b): 44(ptr) Variable UniformConstant 185(g_tTex1df4a): 40(ptr) Variable UniformConstant + 186: TypePointer Output 36(fvec4) + 187(Color): 186(ptr) Variable Output + 188: TypePointer Output 35(float) + 189(Depth): 188(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(mtest): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index dae4594d..b241f6d1 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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -159,7 +159,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -307,7 +308,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -325,17 +326,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 149 +// Id's are bound by 153 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 136 + EntryPoint Fragment 4 "main" 136 150 152 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -366,6 +368,8 @@ gl_FragCoord origin is upper left Name 142 "g_tTexcdf4" Name 145 "g_tTexcdi4" Name 148 "g_tTexcdu4" + Name 150 "Color" + Name 152 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -379,12 +383,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 136(@entryPointOutput) Location 0 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 + Decorate 150(Color) Location 0 + Decorate 152(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -480,6 +485,10 @@ gl_FragCoord origin is upper left 146: TypeImage 36(int) Cube sampled format:Unknown 147: TypePointer UniformConstant 146 148(g_tTexcdu4): 147(ptr) Variable UniformConstant + 149: TypePointer Output 7(fvec4) + 150(Color): 149(ptr) Variable Output + 151: TypePointer Output 6(float) + 152(Depth): 151(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index 0df5d1e4..a2debf48 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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -114,7 +114,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -223,7 +224,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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -235,17 +236,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 106 +// Id's are bound by 110 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 102 + EntryPoint Fragment 4 "main" 102 107 109 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -267,6 +269,8 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 102 "@entryPointOutput" Name 105 "g_tTex1df4a" + Name 107 "Color" + Name 109 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -277,9 +281,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 102(@entryPointOutput) Location 0 Decorate 105(g_tTex1df4a) DescriptorSet 0 Decorate 105(g_tTex1df4a) Binding 1 + Decorate 107(Color) Location 0 + Decorate 109(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -347,6 +352,10 @@ gl_FragCoord origin is upper left 101: TypePointer Output 93(PS_OUTPUT) 102(@entryPointOutput): 101(ptr) Variable Output 105(g_tTex1df4a): 11(ptr) Variable UniformConstant + 106: TypePointer Output 7(fvec4) + 107(Color): 106(ptr) Variable Output + 108: TypePointer Output 6(float) + 109(Depth): 108(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index 76774948..2bb30523 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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -156,7 +156,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -304,7 +305,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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -319,18 +320,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 134 +// Id's are bound by 138 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 130 + EntryPoint Fragment 4 "main" 130 135 137 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -358,6 +360,8 @@ gl_FragCoord origin is upper left Name 122 "psout" Name 130 "@entryPointOutput" Name 133 "g_tTex1df4a" + Name 135 "Color" + Name 137 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -371,9 +375,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 130(@entryPointOutput) Location 0 Decorate 133(g_tTex1df4a) DescriptorSet 0 Decorate 133(g_tTex1df4a) Binding 1 + Decorate 135(Color) Location 0 + Decorate 137(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -454,6 +459,10 @@ gl_FragCoord origin is upper left 129: TypePointer Output 120(PS_OUTPUT) 130(@entryPointOutput): 129(ptr) Variable Output 133(g_tTex1df4a): 11(ptr) Variable UniformConstant + 134: TypePointer Output 7(fvec4) + 135(Color): 134(ptr) Variable Output + 136: TypePointer Output 6(float) + 137(Depth): 136(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index 7af43cb6..7c19be99 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' (layout(location=0 ) out 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -189,7 +189,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -367,7 +368,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' (layout(location=0 ) out 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -385,17 +386,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 158 +// Id's are bound by 162 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 154 + EntryPoint Fragment 4 "main" 154 159 161 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -429,6 +431,8 @@ gl_FragCoord origin is upper left Name 145 "psout" Name 154 "@entryPointOutput" Name 157 "g_tTex1df4a" + Name 159 "Color" + Name 161 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -445,9 +449,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 154(@entryPointOutput) Location 0 Decorate 157(g_tTex1df4a) DescriptorSet 0 Decorate 157(g_tTex1df4a) Binding 1 + Decorate 159(Color) Location 0 + Decorate 161(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -537,6 +542,10 @@ gl_FragCoord origin is upper left 153: TypePointer Output 143(PS_OUTPUT) 154(@entryPointOutput): 153(ptr) Variable Output 157(g_tTex1df4a): 11(ptr) Variable UniformConstant + 158: TypePointer Output 7(fvec4) + 159(Color): 158(ptr) Variable Output + 160: TypePointer Output 6(float) + 161(Depth): 160(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index e1b1027c..57e32605 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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -177,7 +177,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -343,7 +344,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -361,17 +362,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 149 +// Id's are bound by 153 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 136 + EntryPoint Fragment 4 "main" 136 150 152 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -402,6 +404,8 @@ gl_FragCoord origin is upper left Name 142 "g_tTexcdf4" Name 145 "g_tTexcdi4" Name 148 "g_tTexcdu4" + Name 150 "Color" + Name 152 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -415,12 +419,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 136(@entryPointOutput) Location 0 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 + Decorate 150(Color) Location 0 + Decorate 152(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -516,6 +521,10 @@ gl_FragCoord origin is upper left 146: TypeImage 37(int) Cube sampled format:Unknown 147: TypePointer UniformConstant 146 148(g_tTexcdu4): 147(ptr) Variable UniformConstant + 149: TypePointer Output 7(fvec4) + 150(Color): 149(ptr) Variable Output + 151: TypePointer Output 6(float) + 152(Depth): 151(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 44182349..5a5380c3 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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -126,7 +126,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -247,7 +248,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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -259,17 +260,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 106 +// Id's are bound by 110 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 102 + EntryPoint Fragment 4 "main" 102 107 109 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -291,6 +293,8 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 102 "@entryPointOutput" Name 105 "g_tTex1df4a" + Name 107 "Color" + Name 109 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -301,9 +305,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 102(@entryPointOutput) Location 0 Decorate 105(g_tTex1df4a) DescriptorSet 0 Decorate 105(g_tTex1df4a) Binding 1 + Decorate 107(Color) Location 0 + Decorate 109(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -371,6 +376,10 @@ gl_FragCoord origin is upper left 101: TypePointer Output 93(PS_OUTPUT) 102(@entryPointOutput): 101(ptr) Variable Output 105(g_tTex1df4a): 11(ptr) Variable UniformConstant + 106: TypePointer Output 7(fvec4) + 107(Color): 106(ptr) Variable Output + 108: TypePointer Output 6(float) + 109(Depth): 108(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index df7bb630..17f4743e 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' (layout(location=0 ) out 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:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -176,7 +176,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -333,7 +334,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' (layout(location=0 ) out 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:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -359,18 +360,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 179 +// Id's are bound by 183 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 140 + EntryPoint Fragment 4 "main" 140 180 182 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r10" @@ -409,6 +411,8 @@ gl_FragCoord origin is upper left Name 172 "g_tTexcdf4" Name 175 "g_tTexcdi4" Name 178 "g_tTexcdu4" + Name 180 "Color" + Name 182 "Depth" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -421,7 +425,6 @@ 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 140(@entryPointOutput) Location 0 Decorate 145(g_tTex1df4) DescriptorSet 0 Decorate 145(g_tTex1df4) Binding 0 Decorate 148(g_tTex1di4) DescriptorSet 0 @@ -435,6 +438,8 @@ gl_FragCoord origin is upper left Decorate 172(g_tTexcdf4) DescriptorSet 0 Decorate 175(g_tTexcdi4) DescriptorSet 0 Decorate 178(g_tTexcdu4) DescriptorSet 0 + Decorate 180(Color) Location 0 + Decorate 182(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -545,6 +550,10 @@ gl_FragCoord origin is upper left 176: TypeImage 42(int) Cube sampled format:Unknown 177: TypePointer UniformConstant 176 178(g_tTexcdu4): 177(ptr) Variable UniformConstant + 179: TypePointer Output 102(fvec4) + 180(Color): 179(ptr) Variable Output + 181: TypePointer Output 6(float) + 182(Depth): 181(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r10): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index 3bae16f2..31814458 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' (layout(location=0 ) out 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:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -167,7 +167,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -315,7 +316,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' (layout(location=0 ) out 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:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -341,18 +342,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 177 +// Id's are bound by 181 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 138 + EntryPoint Fragment 4 "main" 138 178 180 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -391,6 +393,8 @@ gl_FragCoord origin is upper left Name 170 "g_tTexcdf4a" Name 173 "g_tTexcdi4a" Name 176 "g_tTexcdu4a" + Name 178 "Color" + Name 180 "Depth" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -404,7 +408,6 @@ 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 138(@entryPointOutput) Location 0 Decorate 143(g_tTex3df4) DescriptorSet 0 Decorate 146(g_tTex3di4) DescriptorSet 0 Decorate 149(g_tTex3du4) DescriptorSet 0 @@ -417,6 +420,8 @@ gl_FragCoord origin is upper left Decorate 170(g_tTexcdf4a) DescriptorSet 0 Decorate 173(g_tTexcdi4a) DescriptorSet 0 Decorate 176(g_tTexcdu4a) DescriptorSet 0 + Decorate 178(Color) Location 0 + Decorate 180(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -525,6 +530,10 @@ gl_FragCoord origin is upper left 174: TypeImage 37(int) Cube array sampled format:Unknown 175: TypePointer UniformConstant 174 176(g_tTexcdu4a): 175(ptr) Variable UniformConstant + 177: TypePointer Output 126(fvec4) + 178(Color): 177(ptr) Variable Output + 179: TypePointer Output 6(float) + 180(Depth): 179(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index de345e2a..fa3904e2 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' (layout(location=0 ) out 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:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -140,7 +140,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -261,7 +262,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' (layout(location=0 ) out 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:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -287,18 +288,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 151 +// Id's are bound by 155 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 103 + EntryPoint Fragment 4 "main" 103 152 154 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r01" @@ -334,6 +336,8 @@ gl_FragCoord origin is upper left Name 144 "g_tTexcdf4a" Name 147 "g_tTexcdi4a" Name 150 "g_tTexcdu4a" + Name 152 "Color" + Name 154 "Depth" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -344,7 +348,6 @@ 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 103(@entryPointOutput) Location 0 Decorate 108(g_tTex3df4) DescriptorSet 0 Decorate 111(g_tTex3di4) DescriptorSet 0 Decorate 114(g_tTex3du4) DescriptorSet 0 @@ -360,6 +363,8 @@ gl_FragCoord origin is upper left Decorate 144(g_tTexcdf4a) DescriptorSet 0 Decorate 147(g_tTexcdi4a) DescriptorSet 0 Decorate 150(g_tTexcdu4a) DescriptorSet 0 + Decorate 152(Color) Location 0 + Decorate 154(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -463,6 +468,10 @@ gl_FragCoord origin is upper left 148: TypeImage 38(int) Cube array sampled format:Unknown 149: TypePointer UniformConstant 148 150(g_tTexcdu4a): 149(ptr) Variable UniformConstant + 151: TypePointer Output 91(fvec4) + 152(Color): 151(ptr) Variable Output + 153: TypePointer Output 6(float) + 154(Depth): 153(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r01): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index 1deff2aa..ba413641 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' (layout(location=0 ) out 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -146,7 +146,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -273,7 +274,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' (layout(location=0 ) out 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -299,18 +300,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 157 +// Id's are bound by 161 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 109 + EntryPoint Fragment 4 "main" 109 158 160 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r11" @@ -346,6 +348,8 @@ gl_FragCoord origin is upper left Name 150 "g_tTexcdf4a" Name 153 "g_tTexcdi4a" Name 156 "g_tTexcdu4a" + Name 158 "Color" + Name 160 "Depth" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -355,7 +359,6 @@ 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 109(@entryPointOutput) Location 0 Decorate 114(g_tTex1df4) DescriptorSet 0 Decorate 114(g_tTex1df4) Binding 0 Decorate 117(g_tTex1di4) DescriptorSet 0 @@ -372,6 +375,8 @@ gl_FragCoord origin is upper left Decorate 150(g_tTexcdf4a) DescriptorSet 0 Decorate 153(g_tTexcdi4a) DescriptorSet 0 Decorate 156(g_tTexcdu4a) DescriptorSet 0 + Decorate 158(Color) Location 0 + Decorate 160(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -478,6 +483,10 @@ gl_FragCoord origin is upper left 154: TypeImage 43(int) Cube array sampled format:Unknown 155: TypePointer UniformConstant 154 156(g_tTexcdu4a): 155(ptr) Variable UniformConstant + 157: TypePointer Output 97(fvec4) + 158(Color): 157(ptr) Variable Output + 159: TypePointer Output 6(float) + 160(Depth): 159(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r11): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index 8468b8e3..f8049ba2 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' (layout(location=0 ) out 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:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -194,7 +194,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -369,7 +370,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' (layout(location=0 ) out 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:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:59 Branch: Return 0:? Linker Objects @@ -395,18 +396,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 180 +// Id's are bound by 184 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 141 + EntryPoint Fragment 4 "main" 141 181 183 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r10" @@ -445,6 +447,8 @@ gl_FragCoord origin is upper left Name 173 "g_tTexcdf4" Name 176 "g_tTexcdi4" Name 179 "g_tTexcdu4" + Name 181 "Color" + Name 183 "Depth" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -457,7 +461,6 @@ 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 141(@entryPointOutput) Location 0 Decorate 146(g_tTex1df4) DescriptorSet 0 Decorate 146(g_tTex1df4) Binding 0 Decorate 149(g_tTex1di4) DescriptorSet 0 @@ -471,6 +474,8 @@ gl_FragCoord origin is upper left Decorate 173(g_tTexcdf4) DescriptorSet 0 Decorate 176(g_tTexcdi4) DescriptorSet 0 Decorate 179(g_tTexcdu4) DescriptorSet 0 + Decorate 181(Color) Location 0 + Decorate 183(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -582,6 +587,10 @@ gl_FragCoord origin is upper left 177: TypeImage 43(int) Cube sampled format:Unknown 178: TypePointer UniformConstant 177 179(g_tTexcdu4): 178(ptr) Variable UniformConstant + 180: TypePointer Output 103(fvec4) + 181(Color): 180(ptr) Variable Output + 182: TypePointer Output 6(float) + 183(Depth): 182(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r10): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 08d1154a..10ae1b7f 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' (layout(location=0 ) out 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:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -185,7 +185,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -351,7 +352,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' (layout(location=0 ) out 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:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:60 Branch: Return 0:? Linker Objects @@ -377,18 +378,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 178 +// Id's are bound by 182 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 139 + EntryPoint Fragment 4 "main" 139 179 181 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r00" @@ -427,6 +429,8 @@ gl_FragCoord origin is upper left Name 171 "g_tTexcdf4a" Name 174 "g_tTexcdi4a" Name 177 "g_tTexcdu4a" + Name 179 "Color" + Name 181 "Depth" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -440,7 +444,6 @@ 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 139(@entryPointOutput) Location 0 Decorate 144(g_tTex3df4) DescriptorSet 0 Decorate 147(g_tTex3di4) DescriptorSet 0 Decorate 150(g_tTex3du4) DescriptorSet 0 @@ -453,6 +456,8 @@ gl_FragCoord origin is upper left Decorate 171(g_tTexcdf4a) DescriptorSet 0 Decorate 174(g_tTexcdi4a) DescriptorSet 0 Decorate 177(g_tTexcdu4a) DescriptorSet 0 + Decorate 179(Color) Location 0 + Decorate 181(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -562,6 +567,10 @@ gl_FragCoord origin is upper left 175: TypeImage 38(int) Cube array sampled format:Unknown 176: TypePointer UniformConstant 175 177(g_tTexcdu4a): 176(ptr) Variable UniformConstant + 178: TypePointer Output 127(fvec4) + 179(Color): 178(ptr) Variable Output + 180: TypePointer Output 6(float) + 181(Depth): 180(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index 662a1df5..e744e607 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' (layout(location=0 ) out 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:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -152,7 +152,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -285,7 +286,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' (layout(location=0 ) out 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:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:65 Branch: Return 0:? Linker Objects @@ -311,18 +312,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 152 +// Id's are bound by 156 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 104 + EntryPoint Fragment 4 "main" 104 153 155 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r01" @@ -358,6 +360,8 @@ gl_FragCoord origin is upper left Name 145 "g_tTexcdf4a" Name 148 "g_tTexcdi4a" Name 151 "g_tTexcdu4a" + Name 153 "Color" + Name 155 "Depth" Decorate 11(g_tTex1df4) DescriptorSet 0 Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 @@ -368,7 +372,6 @@ 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 104(@entryPointOutput) Location 0 Decorate 109(g_tTex3df4) DescriptorSet 0 Decorate 112(g_tTex3di4) DescriptorSet 0 Decorate 115(g_tTex3du4) DescriptorSet 0 @@ -384,6 +387,8 @@ gl_FragCoord origin is upper left Decorate 145(g_tTexcdf4a) DescriptorSet 0 Decorate 148(g_tTexcdi4a) DescriptorSet 0 Decorate 151(g_tTexcdu4a) DescriptorSet 0 + Decorate 153(Color) Location 0 + Decorate 155(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -488,6 +493,10 @@ gl_FragCoord origin is upper left 149: TypeImage 39(int) Cube array sampled format:Unknown 150: TypePointer UniformConstant 149 151(g_tTexcdu4a): 150(ptr) Variable UniformConstant + 152: TypePointer Output 92(fvec4) + 153(Color): 152(ptr) Variable Output + 154: TypePointer Output 6(float) + 155(Depth): 154(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r01): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 86c6801b..f529d464 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' (layout(location=0 ) out 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -158,7 +158,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -297,7 +298,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' (layout(location=0 ) out 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:66 Branch: Return 0:? Linker Objects @@ -323,18 +324,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 158 +// Id's are bound by 162 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 110 + EntryPoint Fragment 4 "main" 110 159 161 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "r11" @@ -370,6 +372,8 @@ gl_FragCoord origin is upper left Name 151 "g_tTexcdf4a" Name 154 "g_tTexcdi4a" Name 157 "g_tTexcdu4a" + Name 159 "Color" + Name 161 "Depth" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 Decorate 15(g_sSamp) Binding 0 @@ -379,7 +383,6 @@ 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 110(@entryPointOutput) Location 0 Decorate 115(g_tTex1df4) DescriptorSet 0 Decorate 115(g_tTex1df4) Binding 0 Decorate 118(g_tTex1di4) DescriptorSet 0 @@ -396,6 +399,8 @@ gl_FragCoord origin is upper left Decorate 151(g_tTexcdf4a) DescriptorSet 0 Decorate 154(g_tTexcdi4a) DescriptorSet 0 Decorate 157(g_tTexcdu4a) DescriptorSet 0 + Decorate 159(Color) Location 0 + Decorate 161(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -503,6 +508,10 @@ gl_FragCoord origin is upper left 155: TypeImage 44(int) Cube array sampled format:Unknown 156: TypePointer UniformConstant 155 157(g_tTexcdu4a): 156(ptr) Variable UniformConstant + 158: TypePointer Output 98(fvec4) + 159(Color): 158(ptr) Variable Output + 160: TypePointer Output 6(float) + 161(Depth): 160(ptr) Variable Output 4(main): 2 Function None 3 5: Label 8(r11): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 27bcad42..75b31249 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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -192,7 +192,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -376,7 +377,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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -391,18 +392,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 128 +// Id's are bound by 132 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 124 + EntryPoint Fragment 4 "main" 124 129 131 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -430,6 +432,8 @@ gl_FragCoord origin is upper left Name 115 "psout" Name 124 "@entryPointOutput" Name 127 "g_tTex1df4a" + Name 129 "Color" + Name 131 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -443,9 +447,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 124(@entryPointOutput) Location 0 Decorate 127(g_tTex1df4a) DescriptorSet 0 Decorate 127(g_tTex1df4a) Binding 1 + Decorate 129(Color) Location 0 + Decorate 131(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -520,6 +525,10 @@ gl_FragCoord origin is upper left 123: TypePointer Output 113(PS_OUTPUT) 124(@entryPointOutput): 123(ptr) Variable Output 127(g_tTex1df4a): 11(ptr) Variable UniformConstant + 128: TypePointer Output 7(fvec4) + 129(Color): 128(ptr) Variable Output + 130: TypePointer Output 6(float) + 131(Depth): 130(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 82eea56d..ed868f3b 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' (layout(location=0 ) out 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -243,7 +243,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -475,7 +476,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' (layout(location=0 ) out 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:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:50 Branch: Return 0:? Linker Objects @@ -493,17 +494,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 163 +// Id's are bound by 167 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 159 + EntryPoint Fragment 4 "main" 159 164 166 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -537,6 +539,8 @@ gl_FragCoord origin is upper left Name 150 "psout" Name 159 "@entryPointOutput" Name 162 "g_tTex1df4a" + Name 164 "Color" + Name 166 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -553,9 +557,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 159(@entryPointOutput) Location 0 Decorate 162(g_tTex1df4a) DescriptorSet 0 Decorate 162(g_tTex1df4a) Binding 1 + Decorate 164(Color) Location 0 + Decorate 166(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -650,6 +655,10 @@ gl_FragCoord origin is upper left 158: TypePointer Output 148(PS_OUTPUT) 159(@entryPointOutput): 158(ptr) Variable Output 162(g_tTex1df4a): 11(ptr) Variable UniformConstant + 163: TypePointer Output 7(fvec4) + 164(Color): 163(ptr) Variable Output + 165: TypePointer Output 6(float) + 166(Depth): 165(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index 8f85cfcc..887f796d 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -235,7 +235,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) Linked vertex stage: @@ -477,7 +477,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 2928bed3..ce3b2cac 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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -213,7 +213,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -415,7 +416,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -433,17 +434,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 154 +// Id's are bound by 158 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 141 + EntryPoint Fragment 4 "main" 141 155 157 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -474,6 +476,8 @@ gl_FragCoord origin is upper left Name 147 "g_tTexcdf4" Name 150 "g_tTexcdi4" Name 153 "g_tTexcdu4" + Name 155 "Color" + Name 157 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -487,12 +491,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 141(@entryPointOutput) Location 0 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 + Decorate 155(Color) Location 0 + Decorate 157(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -593,6 +598,10 @@ gl_FragCoord origin is upper left 151: TypeImage 38(int) Cube sampled format:Unknown 152: TypePointer UniformConstant 151 153(g_tTexcdu4): 152(ptr) Variable UniformConstant + 154: TypePointer Output 7(fvec4) + 155(Color): 154(ptr) Variable Output + 156: TypePointer Output 6(float) + 157(Depth): 156(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index 76831db8..4e9f2af6 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' (layout(location=0 ) out 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:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 Branch: Return 0:? Linker Objects @@ -147,7 +147,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -286,7 +287,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' (layout(location=0 ) out 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:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:38 Branch: Return 0:? Linker Objects @@ -301,18 +302,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 108 +// Id's are bound by 112 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 95 + EntryPoint Fragment 4 "main" 95 109 111 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -337,6 +339,8 @@ gl_FragCoord origin is upper left Name 101 "g_tTexcdf4" Name 104 "g_tTexcdi4" Name 107 "g_tTexcdu4" + Name 109 "Color" + Name 111 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -347,12 +351,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 95(@entryPointOutput) Location 0 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 + Decorate 109(Color) Location 0 + Decorate 111(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -422,6 +427,10 @@ gl_FragCoord origin is upper left 105: TypeImage 40(int) Cube array sampled format:Unknown 106: TypePointer UniformConstant 105 107(g_tTexcdu4): 106(ptr) Variable UniformConstant + 108: TypePointer Output 7(fvec4) + 109(Color): 108(ptr) Variable Output + 110: TypePointer Output 6(float) + 111(Depth): 110(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index dbdf833c..675c3f8a 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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -156,7 +156,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -304,7 +305,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' (layout(location=0 ) out 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:42 Branch: Return 0:? Linker Objects @@ -319,18 +320,19 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 135 +// Id's are bound by 139 Capability Shader Capability Sampled1D Capability SampledCubeArray 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 131 + EntryPoint Fragment 4 "main" 131 136 138 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -358,6 +360,8 @@ gl_FragCoord origin is upper left Name 123 "psout" Name 131 "@entryPointOutput" Name 134 "g_tTex1df4" + Name 136 "Color" + Name 138 "Depth" Decorate 12(g_tTex1df4a) DescriptorSet 0 Decorate 12(g_tTex1df4a) Binding 1 Decorate 16(g_sSamp) DescriptorSet 0 @@ -371,9 +375,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 131(@entryPointOutput) Location 0 Decorate 134(g_tTex1df4) DescriptorSet 0 Decorate 134(g_tTex1df4) Binding 0 + Decorate 136(Color) Location 0 + Decorate 138(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -455,6 +460,10 @@ gl_FragCoord origin is upper left 130: TypePointer Output 121(PS_OUTPUT) 131(@entryPointOutput): 130(ptr) Variable Output 134(g_tTex1df4): 11(ptr) Variable UniformConstant + 135: TypePointer Output 7(fvec4) + 136(Color): 135(ptr) Variable Output + 137: TypePointer Output 6(float) + 138(Depth): 137(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 7e0c28e4..96def42f 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' (layout(location=0 ) out 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:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 Branch: Return 0:? Linker Objects @@ -190,7 +190,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -368,7 +369,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' (layout(location=0 ) out 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:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:51 Branch: Return 0:? Linker Objects @@ -387,17 +388,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 160 +// Id's are bound by 164 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 155 + EntryPoint Fragment 4 "main" 155 161 163 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -432,6 +434,8 @@ gl_FragCoord origin is upper left Name 155 "@entryPointOutput" Name 158 "g_sSamp2d" Name 159 "g_tTex1df4a" + Name 161 "Color" + Name 163 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -448,10 +452,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 155(@entryPointOutput) Location 0 Decorate 158(g_sSamp2d) DescriptorSet 0 Decorate 159(g_tTex1df4a) DescriptorSet 0 Decorate 159(g_tTex1df4a) Binding 1 + Decorate 161(Color) Location 0 + Decorate 163(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -543,6 +548,10 @@ gl_FragCoord origin is upper left 155(@entryPointOutput): 154(ptr) Variable Output 158(g_sSamp2d): 15(ptr) Variable UniformConstant 159(g_tTex1df4a): 11(ptr) Variable UniformConstant + 160: TypePointer Output 7(fvec4) + 161(Color): 160(ptr) Variable Output + 162: TypePointer Output 6(float) + 163(Depth): 162(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index e3b61aaf..50d34dd6 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -181,7 +181,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) Linked vertex stage: @@ -369,7 +369,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -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}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 81bafbde..9d32ce58 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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -177,7 +177,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -343,7 +344,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:48 Branch: Return 0:? Linker Objects @@ -361,17 +362,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 150 +// Id's are bound by 154 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 137 + EntryPoint Fragment 4 "main" 137 151 153 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -402,6 +404,8 @@ gl_FragCoord origin is upper left Name 143 "g_tTexcdf4" Name 146 "g_tTexcdi4" Name 149 "g_tTexcdu4" + Name 151 "Color" + Name 153 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -415,12 +419,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 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 + Decorate 151(Color) Location 0 + Decorate 153(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -517,6 +522,10 @@ gl_FragCoord origin is upper left 147: TypeImage 37(int) Cube sampled format:Unknown 148: TypePointer UniformConstant 147 149(g_tTexcdu4): 148(ptr) Variable UniformConstant + 150: TypePointer Output 7(fvec4) + 151(Color): 150(ptr) Variable Output + 152: TypePointer Output 6(float) + 153(Depth): 152(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index ebec613d..d628a7c1 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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -126,7 +126,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) Linked fragment stage: @@ -247,7 +248,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' (layout(location=0 ) out 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:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:36 Branch: Return 0:? Linker Objects @@ -259,17 +260,18 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) +0:? 'Depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 107 +// Id's are bound by 111 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 103 + EntryPoint Fragment 4 "main" 103 108 110 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "txval10" @@ -291,6 +293,8 @@ gl_FragCoord origin is upper left Name 96 "psout" Name 103 "@entryPointOutput" Name 106 "g_tTex1df4a" + Name 108 "Color" + Name 110 "Depth" Decorate 12(g_tTex1df4) DescriptorSet 0 Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 @@ -301,9 +305,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 103(@entryPointOutput) Location 0 Decorate 106(g_tTex1df4a) DescriptorSet 0 Decorate 106(g_tTex1df4a) Binding 1 + Decorate 108(Color) Location 0 + Decorate 110(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -372,6 +377,10 @@ gl_FragCoord origin is upper left 102: TypePointer Output 94(PS_OUTPUT) 103(@entryPointOutput): 102(ptr) Variable Output 106(g_tTex1df4a): 11(ptr) Variable UniformConstant + 107: TypePointer Output 7(fvec4) + 108(Color): 107(ptr) Variable Output + 109: TypePointer Output 6(float) + 110(Depth): 109(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(txval10): 8(ptr) Variable Function diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index e5eb8e2d..2d066905 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -21,11 +21,11 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -53,20 +53,20 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float color}) +0:? '@entryPointOutput' (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 -0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) +0:? 'color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 25 +// Id's are bound by 27 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 22 + EntryPoint Fragment 4 "main" 22 26 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 6 "MyFunc(" @@ -75,7 +75,8 @@ gl_FragCoord origin is upper left MemberName 12(PS_OUTPUT) 0 "color" Name 14 "ps_output" Name 22 "@entryPointOutput" - Decorate 22(@entryPointOutput) Location 0 + Name 26 "color" + Decorate 26(color) Location 0 2: TypeVoid 3: TypeFunction 2 10: TypeFloat 32 @@ -89,6 +90,8 @@ gl_FragCoord origin is upper left 19: TypePointer Function 11(fvec4) 21: TypePointer Output 12(PS_OUTPUT) 22(@entryPointOutput): 21(ptr) Variable Output + 25: TypePointer Output 11(fvec4) + 26(color): 25(ptr) Variable Output 4(main): 2 Function None 3 5: Label 14(ps_output): 13(ptr) Variable Function diff --git a/Test/baseResults/hlsl.sin.frag.out b/Test/baseResults/hlsl.sin.frag.out index 246cfe64..e4940ae6 100755 --- a/Test/baseResults/hlsl.sin.frag.out +++ b/Test/baseResults/hlsl.sin.frag.out @@ -13,7 +13,7 @@ gl_FragCoord origin is upper left 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -34,7 +34,7 @@ gl_FragCoord origin is upper left 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index 4d5d275c..a7e1e971 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -17,13 +17,13 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (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 0:? 'TestTexture' (uniform texture2D) 0:? 'TestUF' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) Linked fragment stage: @@ -47,22 +47,22 @@ 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' (layout(location=0 ) out structure{temp 4-component vector of float Color}) +0:? '@entryPointOutput' (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 0:? 'TestTexture' (uniform texture2D) 0:? 'TestUF' (uniform 4-component vector of float) -0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) +0:? 'Color' (layout(location=0 ) out 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 27 +// Id's are bound by 29 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 19 + EntryPoint Fragment 4 "main" 19 28 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 8 "PS_OUTPUT" @@ -71,8 +71,9 @@ gl_FragCoord origin is upper left Name 19 "@entryPointOutput" Name 24 "TestTexture" Name 26 "TestUF" - Decorate 19(@entryPointOutput) Location 0 + Name 28 "Color" Decorate 24(TestTexture) DescriptorSet 0 + Decorate 28(Color) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -92,6 +93,8 @@ gl_FragCoord origin is upper left 24(TestTexture): 23(ptr) Variable UniformConstant 25: TypePointer UniformConstant 7(fvec4) 26(TestUF): 25(ptr) Variable UniformConstant + 27: TypePointer Output 7(fvec4) + 28(Color): 27(ptr) Variable Output 4(main): 2 Function None 3 5: Label 10(psout): 9(ptr) Variable Function diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index 0809d08c..4a5548f7 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float ff4}) 0:? 'ff5' (layout(binding=5 offset=20 ) global 3-component vector of float) 0:? 'ff6' (layout(binding=8 offset=36 ) global 3-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -70,7 +70,7 @@ gl_FragCoord origin is upper left 0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float ff4}) 0:? 'ff5' (layout(binding=5 offset=20 ) global 3-component vector of float) 0:? 'ff6' (layout(binding=8 offset=36 ) global 3-component vector of float) -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out index 0531bd11..48d9f29e 100755 --- a/Test/baseResults/hlsl.structin.vert.out +++ b/Test/baseResults/hlsl.structin.vert.out @@ -4,7 +4,7 @@ Shader version: 450 0:7 Function Definition: main(vf4;struct-VI-vf4[2]-vu21;vf4; (global 4-component vector of float Position) 0:7 Function Parameters: 0:7 'd' (layout(location=0 ) in 4-component vector of float) -0:7 'vi' (layout(location=1 ) in structure{temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord}) +0:7 'vi' (in structure{temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord}) 0:7 'e' (layout(location=4 ) in 4-component vector of float) 0:? Sequence 0:8 Sequence @@ -47,7 +47,7 @@ Shader version: 450 0:7 Function Definition: main(vf4;struct-VI-vf4[2]-vu21;vf4; (global 4-component vector of float Position) 0:7 Function Parameters: 0:7 'd' (layout(location=0 ) in 4-component vector of float) -0:7 'vi' (layout(location=1 ) in structure{temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord}) +0:7 'vi' (in structure{temp 2-element array of 4-component vector of float m, temp 2-component vector of uint coord}) 0:7 'e' (layout(location=4 ) in 4-component vector of float) 0:? Sequence 0:8 Sequence diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out index bd1eaa08..abf777ab 100755 --- a/Test/baseResults/hlsl.switch.frag.out +++ b/Test/baseResults/hlsl.switch.frag.out @@ -125,7 +125,7 @@ gl_FragCoord origin is upper left 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) 0:? 'c' (layout(location=1 ) in int) 0:? 'd' (layout(location=2 ) in int) @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) 0:? 'c' (layout(location=1 ) in int) 0:? 'd' (layout(location=2 ) in int) diff --git a/Test/baseResults/hlsl.templatetypes.frag.out b/Test/baseResults/hlsl.templatetypes.frag.out index db2b4535..f5260869 100644 --- a/Test/baseResults/hlsl.templatetypes.frag.out +++ b/Test/baseResults/hlsl.templatetypes.frag.out @@ -246,7 +246,7 @@ gl_FragCoord origin is upper left 0:45 0.000000 0:45 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) Linked fragment stage: @@ -499,7 +499,7 @@ gl_FragCoord origin is upper left 0:45 0.000000 0:45 Branch: Return 0:? Linker Objects -0:? '@entryPointOutput' (out float) +0:? '@entryPointOutput' (layout(location=0 ) out float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out index d1b92ea3..63e14dcc 100755 --- a/Test/baseResults/hlsl.whileLoop.frag.out +++ b/Test/baseResults/hlsl.whileLoop.frag.out @@ -34,7 +34,7 @@ gl_FragCoord origin is upper left 0:6 false (const bool) 0:6 No loop body 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) @@ -76,7 +76,7 @@ gl_FragCoord origin is upper left 0:6 false (const bool) 0:6 No loop body 0:? Linker Objects -0:? '@entryPointOutput' (out 4-component vector of float) +0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out index e8eb2b8f..5436adf4 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out @@ -13,7 +13,7 @@ Linked fragment stage: Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 5663 "main" 4045 + EntryPoint Fragment 5663 "main" 4045 4656 4112 ExecutionMode 5663 OriginUpperLeft Decorate 4727 DescriptorSet 0 Decorate 4727 Binding 0 @@ -31,7 +31,8 @@ Linked fragment stage: Decorate 3805 DescriptorSet 0 Decorate 3869 DescriptorSet 0 MemberDecorate 1032 1 BuiltIn FragDepth - Decorate 4045 Location 0 + Decorate 4656 Location 0 + Decorate 4112 BuiltIn FragDepth 8: TypeVoid 1282: TypeFunction 8 12: TypeInt 32 1 @@ -131,6 +132,10 @@ Linked fragment stage: 650: TypePointer Function 13(float) 1670: TypePointer Output 1032(struct) 4045: 1670(ptr) Variable Output + 667: TypePointer Output 29(fvec4) + 4656: 667(ptr) Variable Output + 651: TypePointer Output 13(float) + 4112: 651(ptr) Variable Output 5663: 8 Function None 1282 24915: Label 5830: 1972(ptr) Variable Function diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index 0d67cd76..546763f8 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 189 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 180 186 188 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 7 "MemberTest" @@ -63,6 +63,8 @@ Linked fragment stage: Name 182 "g_sSamp2d" Name 183 "g_sSamp2D_b" Name 184 "g_tTex1df4a" + Name 186 "Color" + Name 188 "Depth" Decorate 41(g_tTex1df4) DescriptorSet 0 Decorate 41(g_tTex1df4) Binding 0 Decorate 45(g_sSamp) DescriptorSet 0 @@ -79,11 +81,12 @@ Linked fragment stage: Decorate 156(g_tTexcdi4) DescriptorSet 0 Decorate 165(g_tTexcdu4) DescriptorSet 0 MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth - Decorate 180(@entryPointOutput) Location 0 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 + Decorate 186(Color) Location 0 + Decorate 188(Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -188,6 +191,10 @@ Linked fragment stage: 182(g_sSamp2d): 44(ptr) Variable UniformConstant 183(g_sSamp2D_b): 44(ptr) Variable UniformConstant 184(g_tTex1df4a): 40(ptr) Variable UniformConstant + 185: TypePointer Output 36(fvec4) + 186(Color): 185(ptr) Variable Output + 187: TypePointer Output 35(float) + 188(Depth): 187(ptr) Variable Output 4(main): 2 Function None 3 5: Label 9(mtest): 8(ptr) Variable Function diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out index 37ef7c88..7ac9e466 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 189 Capability Shader Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 180 + EntryPoint Fragment 4 "main" 180 186 188 ExecutionMode 4 OriginUpperLeft Decorate 41 DescriptorSet 0 Decorate 41 Binding 0 @@ -31,11 +31,12 @@ Linked fragment stage: Decorate 156 DescriptorSet 0 Decorate 165 DescriptorSet 0 MemberDecorate 171 1 BuiltIn FragDepth - Decorate 180 Location 0 Decorate 182 DescriptorSet 0 Decorate 183 DescriptorSet 0 Decorate 184 DescriptorSet 0 Decorate 184 Binding 1 + Decorate 186 Location 0 + Decorate 188 BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -140,6 +141,10 @@ Linked fragment stage: 182: 44(ptr) Variable UniformConstant 183: 44(ptr) Variable UniformConstant 184: 40(ptr) Variable UniformConstant + 185: TypePointer Output 36(fvec4) + 186: 185(ptr) Variable Output + 187: TypePointer Output 35(float) + 188: 187(ptr) Variable Output 4: 2 Function None 3 5: Label 9: 8(ptr) Variable Function diff --git a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out index 7048c10f..7a40f944 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out @@ -13,6 +13,7 @@ Linked fragment stage: MemoryModel Logical GLSL450 EntryPoint Fragment 5663 "main" 4045 4872 ExecutionMode 5663 OriginUpperLeft + Decorate 4045 Location 0 Decorate 4872 Location 0 8: TypeVoid 1282: TypeFunction 8 diff --git a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out index 6fa58dbc..340198b3 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out @@ -44,6 +44,7 @@ Linked fragment stage: Name 141 "r66" Name 146 "@entryPointOutput" Name 148 "input" + Decorate 146(@entryPointOutput) Location 0 Decorate 148(input) Location 0 2: TypeVoid 3: TypeFunction 2 diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index e45c88a4..fd89a37c 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.1485" -#define GLSLANG_DATE "15-Sep-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1486" +#define GLSLANG_DATE "16-Sep-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index bd2ff629..65cde666 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -55,7 +55,8 @@ HlslParseContext::HlslParseContext(TSymbolTable& symbolTable, TIntermediate& int contextPragma(true, false), loopNestingLevel(0), structNestingLevel(0), controlFlowNestingLevel(0), postMainReturn(false), limits(resources.limits), - entryPointOutput(nullptr) + entryPointOutput(nullptr), + nextInLocation(0), nextOutLocation(0) { // ensure we always have a linkage node, even if empty, to simplify tree topology algorithms linkage = new TIntermAggregate; @@ -713,7 +714,7 @@ bool HlslParseContext::shouldFlatten(const TType& type) (language == EShLangFragment && qualifier == EvqVaryingOut)); } -// Figure out mapping between a structures top members and an +// Figure out the mapping between a structure's top members and an // equivalent set of individual variables. // // Assumes shouldFlatten() or equivalent was called first. @@ -724,14 +725,11 @@ void HlslParseContext::flattenStruct(const TVariable& variable) TVector memberVariables; auto members = *variable.getType().getStruct(); - int location = variable.getType().getQualifier().layoutLocation; for (int member = 0; member < (int)members.size(); ++member) { - TVariable* memberVariable = makeInternalVariable(members[member].type->getFieldName().c_str(), *members[member].type); - memberVariable->getWritableType().getQualifier() = variable.getType().getQualifier(); - memberVariable->getWritableType().getQualifier().layoutLocation = location; - location += intermediate.computeTypeLocationSize(memberVariable->getType()); + TVariable* memberVariable = makeInternalVariable(members[member].type->getFieldName().c_str(), + *members[member].type); + memberVariable->getWritableType().getQualifier().storage = variable.getType().getQualifier().storage; memberVariables.push_back(memberVariable); - intermediate.addSymbolLinkageNode(linkage, *memberVariable); } flattenMap[variable.getUniqueId()] = memberVariables; @@ -751,6 +749,37 @@ TIntermTyped* HlslParseContext::flattenAccess(TIntermTyped* base, int member) return intermediate.addSymbol(*memberVariable); } +// Variables that correspond to the user-interface in and out of a stage +// (not the built-in interface) are assigned locations and +// registered as a linkage node (part of the stage's external interface). +// +// Assumes it is called in the order in which locations should be assigned. +void HlslParseContext::assignLocations(TVariable& variable) +{ + const auto assignLocation = [&](TVariable& variable) { + const TQualifier& qualifier = variable.getType().getQualifier(); + if (qualifier.storage == EvqVaryingIn || qualifier.storage == EvqVaryingOut) { + if (qualifier.builtIn == EbvNone) { + if (qualifier.storage == EvqVaryingIn) { + variable.getWritableType().getQualifier().layoutLocation = nextInLocation; + nextInLocation += intermediate.computeTypeLocationSize(variable.getType()); + } else { + variable.getWritableType().getQualifier().layoutLocation = nextOutLocation; + nextOutLocation += intermediate.computeTypeLocationSize(variable.getType()); + } + } + intermediate.addSymbolLinkageNode(linkage, variable); + } + }; + + if (shouldFlatten(variable.getType())) { + auto& memberList = flattenMap[variable.getUniqueId()]; + for (auto member = memberList.begin(); member != memberList.end(); ++member) + assignLocation(**member); + } else + assignLocation(variable); +} + // // Handle seeing a function declarator in the grammar. This is the precursor // to recognizing a function prototype or function definition. @@ -822,9 +851,14 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l functionReturnsValue = false; inEntrypoint = (function.getName() == intermediate.getEntryPoint().c_str()); - if (inEntrypoint) + if (inEntrypoint) { remapEntrypointIO(function); - else + if (entryPointOutput) { + if (shouldFlatten(entryPointOutput->getType())) + flattenStruct(*entryPointOutput); + assignLocations(*entryPointOutput); + } + } else remapNonEntrypointIO(function); // @@ -837,7 +871,7 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l // If the parameter has no name, it's not an error, just don't insert it // (could be used for unused args). // - // Also, accumulate the list of parameters into the HIL, so lower level code + // Also, accumulate the list of parameters into the AST, so lower level code // knows where to find parameters. // TIntermAggregate* paramNodes = new TIntermAggregate; @@ -850,18 +884,20 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l if (! symbolTable.insert(*variable)) error(loc, "redefinition", variable->getName().c_str(), ""); else { + // get IO straightened out + if (inEntrypoint) { + if (shouldFlatten(*param.type)) + flattenStruct(*variable); + assignLocations(*variable); + } + // Transfer ownership of name pointer to symbol table. param.name = nullptr; - // Add the parameter to the HIL + // Add the parameter to the AST paramNodes = intermediate.growAggregate(paramNodes, - intermediate.addSymbol(*variable, loc), - loc); - - if (shouldFlatten(*param.type)) - flattenStruct(*variable); - else if (inEntrypoint) - intermediate.addSymbolLinkageNode(linkage, *variable); + intermediate.addSymbol(*variable, loc), + loc); } } else paramNodes = intermediate.growAggregate(paramNodes, intermediate.addSymbol(*param.type, loc), loc); @@ -892,21 +928,27 @@ void HlslParseContext::handleFunctionBody(const TSourceLoc& loc, TFunction& func 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; - const auto remapBuiltInType = [&](TType& type) { - switch (type.getQualifier().builtIn) { - case EbvFragDepthGreater: - intermediate.setDepth(EldGreater); - type.getQualifier().builtIn = EbvFragDepth; - break; - case EbvFragDepthLesser: - intermediate.setDepth(EldLess); - type.getQualifier().builtIn = EbvFragDepth; - break; - default: - break; + const auto remapType = [&](TType& type) { + const auto remapBuiltInType = [&](TType& type) { + switch (type.getQualifier().builtIn) { + case EbvFragDepthGreater: + intermediate.setDepth(EldGreater); + type.getQualifier().builtIn = EbvFragDepth; + break; + case EbvFragDepthLesser: + intermediate.setDepth(EldLess); + type.getQualifier().builtIn = EbvFragDepth; + break; + default: + break; + } + }; + remapBuiltInType(type); + if (type.isStruct()) { + auto members = *type.getStruct(); + for (auto member = members.begin(); member != members.end(); ++member) + remapBuiltInType(*member->type); } }; @@ -914,31 +956,14 @@ void HlslParseContext::remapEntrypointIO(TFunction& function) if (function.getType().getBasicType() != EbtVoid) { entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType()); entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut; - intermediate.addSymbolLinkageNode(linkage, *entryPointOutput); - if (function.getType().getQualifier().builtIn == EbvNone) { - entryPointOutput->getWritableType().getQualifier().layoutLocation = outCount; - outCount += intermediate.computeTypeLocationSize(function.getType()); - } - remapBuiltInType(function.getWritableType()); + remapType(function.getWritableType()); } // parameters are actually shader-scoped inputs and outputs (in or out) for (int i = 0; i < function.getParamCount(); i++) { TType& paramType = *function[i].type; - if (paramType.getQualifier().isParamInput()) { - paramType.getQualifier().storage = EvqVaryingIn; - if (paramType.getQualifier().builtIn == EbvNone) { - paramType.getQualifier().layoutLocation = inCount; - inCount += intermediate.computeTypeLocationSize(*function[i].type); - } - } else { - paramType.getQualifier().storage = EvqVaryingOut; - if (paramType.getQualifier().builtIn == EbvNone) { - paramType.getQualifier().layoutLocation = outCount; - outCount += intermediate.computeTypeLocationSize(*function[i].type); - } - } - remapBuiltInType(paramType); + paramType.getQualifier().storage = paramType.getQualifier().isParamInput() ? EvqVaryingIn : EvqVaryingOut; + remapType(paramType); } } diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h index 1e43deaa..d75b3d7c 100755 --- a/hlsl/hlslParseHelper.h +++ b/hlsl/hlslParseHelper.h @@ -86,6 +86,7 @@ public: bool shouldFlatten(const TType&); void flattenStruct(const TVariable& variable); TIntermTyped* flattenAccess(TIntermTyped* base, int member); + void assignLocations(TVariable& variable); TFunction& handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype); TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&); void handleFunctionBody(const TSourceLoc&, TFunction&, TIntermNode* functionBody, TIntermNode*& node); @@ -237,7 +238,9 @@ protected: // TVector ioArraySymbolResizeList; - TMap> flattenMap; + TUnorderedMap> flattenMap; + unsigned int nextInLocation; + unsigned int nextOutLocation; }; } // end namespace glslang