HLSL: Remove recent change to put locations on SV_TARGET*.

This put locations on members of structures, which is not allowed
in either AST or SPIR-V.

This was caught by asserts in the debug build.

diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out
index 2ae921a..0ce3e64 100644 (file)
--- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out
+++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.calculatelod.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:38            Constant:
 0:38              0 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -164,7 +164,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -285,8 +285,8 @@ gl_FragCoord origin is upper left
 0:38            Constant:
 0:38              0 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -296,15 +296,15 @@ gl_FragCoord origin is upper left
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -369,7 +369,6 @@ gl_FragCoord origin is upper left
                               Decorate 93(g_tTexcdf4a) DescriptorSet 0
                               Decorate 106(g_tTexcdi4a) DescriptorSet 0
                               Decorate 118(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 131(PS_OUTPUT) 0 Location 0
                               MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 144(g_tTex1df4) DescriptorSet 0
                               Decorate 144(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
index 0ef98d7..8dbdc57 100644 (file)
--- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
+++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
@@ -14,7 +14,7 @@ ERROR: 9 compilation errors.  No code generated.
 Shader version: 450
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -135,8 +135,8 @@ ERROR: node is still EOpNull!
 0:38            Constant:
 0:38              0 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -146,15 +146,15 @@ ERROR: node is still EOpNull!
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -176,7 +176,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -297,8 +297,8 @@ ERROR: node is still EOpNull!
 0:38            Constant:
 0:38              0 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -308,15 +308,15 @@ ERROR: node is still EOpNull!
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)

diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out
index c9fb8ed..0dab6a8 100644 (file)
--- a/Test/baseResults/hlsl.constructexpr.frag.out
+++ b/Test/baseResults/hlsl.constructexpr.frag.out
@@ -2,7 +2,7 @@ hlsl.constructexpr.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:18  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:18  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:4    Function Parameters: 
 0:?     Sequence
 0:6      Constant:
@@ -25,8 +25,8 @@ gl_FragCoord origin is upper left
 0:?           11.000000
 0:?           12.000000
 0:15      move second child to first child (temp 4-component vector of float)
-0:15        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:15          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:15        color: direct index for structure (temp 4-component vector of float)
+0:15          'ps_output' (temp structure{temp 4-component vector of float color})
 0:15          Constant:
 0:15            0 (const int)
 0:15        Constant:
@@ -35,9 +35,9 @@ gl_FragCoord origin is upper left
 0:15          1.000000
 0:15          1.000000
 0:16      Sequence
-0:16        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:16          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:16        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:16          'ps_output' (temp structure{temp 4-component vector of float color})
 0:16        Branch: Return
 0:?   Linker Objects
 
@@ -48,7 +48,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:18  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:18  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:4    Function Parameters: 
 0:?     Sequence
 0:6      Constant:
@@ -71,8 +71,8 @@ gl_FragCoord origin is upper left
 0:?           11.000000
 0:?           12.000000
 0:15      move second child to first child (temp 4-component vector of float)
-0:15        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:15          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:15        color: direct index for structure (temp 4-component vector of float)
+0:15          'ps_output' (temp structure{temp 4-component vector of float color})
 0:15          Constant:
 0:15            0 (const int)
 0:15        Constant:
@@ -81,9 +81,9 @@ gl_FragCoord origin is upper left
 0:15          1.000000
 0:15          1.000000
 0:16      Sequence
-0:16        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:16          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:16        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:16          'ps_output' (temp structure{temp 4-component vector of float color})
 0:16        Branch: Return
 0:?   Linker Objects
 
@@ -101,7 +101,6 @@ gl_FragCoord origin is upper left
                               MemberName 22(PS_OUTPUT) 0  "color"
                               Name 24  "ps_output"
                               Name 31  "@entryPointOutput"
-                              MemberDecorate 22(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1

diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out
index 27b2438..58f7a77 100644 (file)
--- a/Test/baseResults/hlsl.gather.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gather.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:29      Sequence
@@ -75,8 +75,8 @@ gl_FragCoord origin is upper left
 0:?               0.900000
 0:?               1.000000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -86,15 +86,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -116,7 +116,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:29      Sequence
@@ -189,8 +189,8 @@ gl_FragCoord origin is upper left
 0:?               0.900000
 0:?               1.000000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -200,15 +200,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -265,7 +265,6 @@ gl_FragCoord origin is upper left
                               Decorate 60(g_tTexcdf4a) DescriptorSet 0
                               Decorate 70(g_tTexcdi4a) DescriptorSet 0
                               Decorate 80(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 90(PS_OUTPUT) 0 Location 0
                               MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 104(g_tTex1df4a) DescriptorSet 0
                               Decorate 104(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out
index 98be6d5..c75a059 100644 (file)
--- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gather.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:49  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:49  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:29    Function Parameters: 
 0:?     Sequence
 0:34      Sequence
@@ -69,8 +69,8 @@ gl_FragCoord origin is upper left
 0:?               0.800000
 0:?               0.900000
 0:44      move second child to first child (temp 4-component vector of float)
-0:44        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:44          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44        Color: direct index for structure (temp 4-component vector of float)
+0:44          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:44          Constant:
 0:44            0 (const int)
 0:44        Constant:
@@ -80,15 +80,15 @@ gl_FragCoord origin is upper left
 0:44          1.000000
 0:45      move second child to first child (temp float)
 0:45        Depth: direct index for structure (temp float FragDepth)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            1 (const int)
 0:45        Constant:
 0:45          1.000000
 0:47      Sequence
-0:47        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -114,7 +114,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:49  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:49  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:29    Function Parameters: 
 0:?     Sequence
 0:34      Sequence
@@ -181,8 +181,8 @@ gl_FragCoord origin is upper left
 0:?               0.800000
 0:?               0.900000
 0:44      move second child to first child (temp 4-component vector of float)
-0:44        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:44          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44        Color: direct index for structure (temp 4-component vector of float)
+0:44          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:44          Constant:
 0:44            0 (const int)
 0:44        Constant:
@@ -192,15 +192,15 @@ gl_FragCoord origin is upper left
 0:44          1.000000
 0:45      move second child to first child (temp float)
 0:45        Depth: direct index for structure (temp float FragDepth)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            1 (const int)
 0:45        Constant:
 0:45          1.000000
 0:47      Sequence
-0:47        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -264,7 +264,6 @@ gl_FragCoord origin is upper left
                               Decorate 59(g_tTexcdf4) DescriptorSet 0
                               Decorate 70(g_tTexcdi4) DescriptorSet 0
                               Decorate 80(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 90(PS_OUTPUT) 0 Location 0
                               MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 103(g_sSamp2d) DescriptorSet 0
                               Decorate 106(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out
index 3e19e5f..2f85664 100644 (file)
--- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gather.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:33      Sequence
@@ -45,8 +45,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               -1 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -56,15 +56,15 @@ gl_FragCoord origin is upper left
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -89,7 +89,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:45  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:33      Sequence
@@ -132,8 +132,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               -1 (const int)
 0:40      move second child to first child (temp 4-component vector of float)
-0:40        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40        Color: direct index for structure (temp 4-component vector of float)
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            0 (const int)
 0:40        Constant:
@@ -143,15 +143,15 @@ gl_FragCoord origin is upper left
 0:40          1.000000
 0:41      move second child to first child (temp float)
 0:41        Depth: direct index for structure (temp float FragDepth)
-0:41          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:41          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:41          Constant:
 0:41            1 (const int)
 0:41        Constant:
 0:41          1.000000
 0:43      Sequence
-0:43        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:43          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:43          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:43        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -207,7 +207,6 @@ gl_FragCoord origin is upper left
                               Decorate 16(g_sSamp) Binding 0
                               Decorate 35(g_tTex2di4) DescriptorSet 0
                               Decorate 51(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 62(PS_OUTPUT) 0 Location 0
                               MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 76(g_tTex1df4a) DescriptorSet 0
                               Decorate 76(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
index 5e0a07e..5cfae1e 100644 (file)
--- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gather.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:37  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:25      Sequence
@@ -48,8 +48,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               -1 (const int)
 0:32      move second child to first child (temp 4-component vector of float)
-0:32        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:32          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:32        Color: direct index for structure (temp 4-component vector of float)
+0:32          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:32          Constant:
 0:32            0 (const int)
 0:32        Constant:
@@ -59,15 +59,15 @@ gl_FragCoord origin is upper left
 0:32          1.000000
 0:33      move second child to first child (temp float)
 0:33        Depth: direct index for structure (temp float FragDepth)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            1 (const int)
 0:33        Constant:
 0:33          1.000000
 0:35      Sequence
-0:35        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:35          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:35        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -86,7 +86,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:37  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:25      Sequence
@@ -132,8 +132,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               -1 (const int)
 0:32      move second child to first child (temp 4-component vector of float)
-0:32        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:32          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:32        Color: direct index for structure (temp 4-component vector of float)
+0:32          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:32          Constant:
 0:32            0 (const int)
 0:32        Constant:
@@ -143,15 +143,15 @@ gl_FragCoord origin is upper left
 0:32          1.000000
 0:33      move second child to first child (temp float)
 0:33        Depth: direct index for structure (temp float FragDepth)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            1 (const int)
 0:33        Constant:
 0:33          1.000000
 0:35      Sequence
-0:35        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:35          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:35        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -195,7 +195,6 @@ gl_FragCoord origin is upper left
                               Decorate 16(g_sSamp) Binding 0
                               Decorate 36(g_tTex2di4) DescriptorSet 0
                               Decorate 51(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 63(PS_OUTPUT) 0 Location 0
                               MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 77(g_tTex1df4a) DescriptorSet 0
                               Decorate 77(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
index ddeb525..ac59887 100644 (file)
--- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gatherRGBA.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:72  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:33      Sequence
@@ -246,8 +246,8 @@ gl_FragCoord origin is upper left
 0:65            Constant:
 0:65              3 (const int)
 0:67      move second child to first child (temp 4-component vector of float)
-0:67        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:67          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67        Color: direct index for structure (temp 4-component vector of float)
+0:67          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:67          Constant:
 0:67            0 (const int)
 0:67        Constant:
@@ -257,15 +257,15 @@ gl_FragCoord origin is upper left
 0:67          1.000000
 0:68      move second child to first child (temp float)
 0:68        Depth: direct index for structure (temp float FragDepth)
-0:68          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:68            1 (const int)
 0:68        Constant:
 0:68          1.000000
 0:70      Sequence
-0:70        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:70          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:70        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -291,7 +291,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:72  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:33      Sequence
@@ -535,8 +535,8 @@ gl_FragCoord origin is upper left
 0:65            Constant:
 0:65              3 (const int)
 0:67      move second child to first child (temp 4-component vector of float)
-0:67        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:67          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67        Color: direct index for structure (temp 4-component vector of float)
+0:67          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:67          Constant:
 0:67            0 (const int)
 0:67        Constant:
@@ -546,15 +546,15 @@ gl_FragCoord origin is upper left
 0:67          1.000000
 0:68      move second child to first child (temp float)
 0:68        Depth: direct index for structure (temp float FragDepth)
-0:68          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:68            1 (const int)
 0:68        Constant:
 0:68          1.000000
 0:70      Sequence
-0:70        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:70          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:70        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -637,7 +637,6 @@ gl_FragCoord origin is upper left
                               Decorate 112(g_tTexcdf4a) DescriptorSet 0
                               Decorate 124(g_tTexcdi4a) DescriptorSet 0
                               Decorate 134(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 195(PS_OUTPUT) 0 Location 0
                               MemberDecorate 195(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 207(g_sSamp2d) DescriptorSet 0
                               Decorate 210(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
index 79e779b..63c9946 100644 (file)
--- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gatherRGBA.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:78  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:78  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34    Function Parameters: 
 0:?     Sequence
 0:39      Sequence
@@ -246,8 +246,8 @@ gl_FragCoord origin is upper left
 0:71            Constant:
 0:71              3 (const int)
 0:73      move second child to first child (temp 4-component vector of float)
-0:73        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73        Color: direct index for structure (temp 4-component vector of float)
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            0 (const int)
 0:73        Constant:
@@ -257,15 +257,15 @@ gl_FragCoord origin is upper left
 0:73          1.000000
 0:74      move second child to first child (temp float)
 0:74        Depth: direct index for structure (temp float FragDepth)
-0:74          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:74          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:74          Constant:
 0:74            1 (const int)
 0:74        Constant:
 0:74          1.000000
 0:76      Sequence
-0:76        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:76          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:76        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:76          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:76        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -295,7 +295,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:78  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:78  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34    Function Parameters: 
 0:?     Sequence
 0:39      Sequence
@@ -539,8 +539,8 @@ gl_FragCoord origin is upper left
 0:71            Constant:
 0:71              3 (const int)
 0:73      move second child to first child (temp 4-component vector of float)
-0:73        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73        Color: direct index for structure (temp 4-component vector of float)
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            0 (const int)
 0:73        Constant:
@@ -550,15 +550,15 @@ gl_FragCoord origin is upper left
 0:73          1.000000
 0:74      move second child to first child (temp float)
 0:74        Depth: direct index for structure (temp float FragDepth)
-0:74          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:74          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:74          Constant:
 0:74            1 (const int)
 0:74        Constant:
 0:74          1.000000
 0:76      Sequence
-0:76        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:76          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:76        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:76          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:76        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -648,7 +648,6 @@ gl_FragCoord origin is upper left
                               Decorate 112(g_tTexcdf4) DescriptorSet 0
                               Decorate 125(g_tTexcdi4) DescriptorSet 0
                               Decorate 135(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 196(PS_OUTPUT) 0 Location 0
                               MemberDecorate 196(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 208(g_sSamp2d) DescriptorSet 0
                               Decorate 211(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
index 4d6fd70..5df5248 100644 (file)
--- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gatherRGBA.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:117  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:117  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39    Function Parameters: 
 0:?     Sequence
 0:46      Sequence
@@ -318,8 +318,8 @@ gl_FragCoord origin is upper left
 0:100            Constant:
 0:100              3 (const int)
 0:112      move second child to first child (temp 4-component vector of float)
-0:112        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:112          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:112        Color: direct index for structure (temp 4-component vector of float)
+0:112          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:112          Constant:
 0:112            0 (const int)
 0:112        Constant:
@@ -329,15 +329,15 @@ gl_FragCoord origin is upper left
 0:112          1.000000
 0:113      move second child to first child (temp float)
 0:113        Depth: direct index for structure (temp float FragDepth)
-0:113          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:113          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:113          Constant:
 0:113            1 (const int)
 0:113        Constant:
 0:113          1.000000
 0:115      Sequence
-0:115        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:115          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:115        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:115          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:115        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -371,7 +371,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:117  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:117  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39    Function Parameters: 
 0:?     Sequence
 0:46      Sequence
@@ -687,8 +687,8 @@ gl_FragCoord origin is upper left
 0:100            Constant:
 0:100              3 (const int)
 0:112      move second child to first child (temp 4-component vector of float)
-0:112        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:112          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:112        Color: direct index for structure (temp 4-component vector of float)
+0:112          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:112          Constant:
 0:112            0 (const int)
 0:112        Constant:
@@ -698,15 +698,15 @@ gl_FragCoord origin is upper left
 0:112          1.000000
 0:113      move second child to first child (temp float)
 0:113        Depth: direct index for structure (temp float FragDepth)
-0:113          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:113          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:113          Constant:
 0:113            1 (const int)
 0:113        Constant:
 0:113          1.000000
 0:115      Sequence
-0:115        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:115          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:115        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:115          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:115        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -802,7 +802,6 @@ gl_FragCoord origin is upper left
                               Decorate 16(g_sSamp) Binding 0
                               Decorate 36(g_tTex2di4) DescriptorSet 0
                               Decorate 50(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 258(PS_OUTPUT) 0 Location 0
                               MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 270(g_sSamp2d) DescriptorSet 0
                               Decorate 273(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
index 7d1cf67..5838f08 100644 (file)
--- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.gatherRGBA.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:111  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:111  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33    Function Parameters: 
 0:?     Sequence
 0:40      Sequence
@@ -318,8 +318,8 @@ gl_FragCoord origin is upper left
 0:94            Constant:
 0:94              3 (const int)
 0:106      move second child to first child (temp 4-component vector of float)
-0:106        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:106          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:106        Color: direct index for structure (temp 4-component vector of float)
+0:106          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:106          Constant:
 0:106            0 (const int)
 0:106        Constant:
@@ -329,15 +329,15 @@ gl_FragCoord origin is upper left
 0:106          1.000000
 0:107      move second child to first child (temp float)
 0:107        Depth: direct index for structure (temp float FragDepth)
-0:107          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:107          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:107          Constant:
 0:107            1 (const int)
 0:107        Constant:
 0:107          1.000000
 0:109      Sequence
-0:109        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:109          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:109        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:109          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:109        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -367,7 +367,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:111  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:111  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33    Function Parameters: 
 0:?     Sequence
 0:40      Sequence
@@ -683,8 +683,8 @@ gl_FragCoord origin is upper left
 0:94            Constant:
 0:94              3 (const int)
 0:106      move second child to first child (temp 4-component vector of float)
-0:106        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:106          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:106        Color: direct index for structure (temp 4-component vector of float)
+0:106          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:106          Constant:
 0:106            0 (const int)
 0:106        Constant:
@@ -694,15 +694,15 @@ gl_FragCoord origin is upper left
 0:106          1.000000
 0:107      move second child to first child (temp float)
 0:107        Depth: direct index for structure (temp float FragDepth)
-0:107          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:107          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:107          Constant:
 0:107            1 (const int)
 0:107        Constant:
 0:107          1.000000
 0:109      Sequence
-0:109        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:109          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:109        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:109          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:109        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -791,7 +791,6 @@ gl_FragCoord origin is upper left
                               Decorate 16(g_sSamp) Binding 0
                               Decorate 36(g_tTex2di4a) DescriptorSet 0
                               Decorate 50(g_tTex2du4a) DescriptorSet 0
-                              MemberDecorate 258(PS_OUTPUT) 0 Location 0
                               MemberDecorate 258(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 270(g_sSamp2d) DescriptorSet 0
                               Decorate 273(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
index 94177de..a3eba63 100644 (file)
--- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.getdimensions.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:281  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:281  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46    Function Parameters: 
 0:?     Sequence
 0:65      Sequence
@@ -1044,8 +1044,8 @@ gl_FragCoord origin is upper left
 0:164          imageQuerySamples (temp uint)
 0:164            'g_tTex2dmsu4a' (uniform utexture2DMSArray)
 0:276      move second child to first child (temp 4-component vector of float)
-0:276        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:276          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:276        Color: direct index for structure (temp 4-component vector of float)
+0:276          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:276          Constant:
 0:276            0 (const int)
 0:276        Constant:
@@ -1055,15 +1055,15 @@ gl_FragCoord origin is upper left
 0:276          1.000000
 0:277      move second child to first child (temp float)
 0:277        Depth: direct index for structure (temp float FragDepth)
-0:277          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:277          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:277          Constant:
 0:277            1 (const int)
 0:277        Constant:
 0:277          1.000000
 0:279      Sequence
-0:279        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:279          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:279        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:279          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:279        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -1102,7 +1102,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:281  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:281  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46    Function Parameters: 
 0:?     Sequence
 0:65      Sequence
@@ -2144,8 +2144,8 @@ gl_FragCoord origin is upper left
 0:164          imageQuerySamples (temp uint)
 0:164            'g_tTex2dmsu4a' (uniform utexture2DMSArray)
 0:276      move second child to first child (temp 4-component vector of float)
-0:276        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:276          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:276        Color: direct index for structure (temp 4-component vector of float)
+0:276          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:276          Constant:
 0:276            0 (const int)
 0:276        Constant:
@@ -2155,15 +2155,15 @@ gl_FragCoord origin is upper left
 0:276          1.000000
 0:277      move second child to first child (temp float)
 0:277        Depth: direct index for structure (temp float FragDepth)
-0:277          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:277          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:277          Constant:
 0:277            1 (const int)
 0:277        Constant:
 0:277          1.000000
 0:279      Sequence
-0:279        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:279          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:279        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:279          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:279        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -2324,7 +2324,6 @@ gl_FragCoord origin is upper left
                               Decorate 482(g_tTex2dmsf4a) DescriptorSet 0
                               Decorate 496(g_tTex2dmsi4a) DescriptorSet 0
                               Decorate 510(g_tTex2dmsu4a) DescriptorSet 0
-                              MemberDecorate 522(PS_OUTPUT) 0 Location 0
                               MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 539(g_sSamp) DescriptorSet 0
                               Decorate 539(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
index 3c90fab..d120c31 100644 (file)
--- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
+++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
@@ -7,7 +7,7 @@ ERROR: 2 compilation errors.  No code generated.
 Shader version: 450
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
-0:24  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:13    Function Parameters: 
 0:?     Sequence
 0:16      Sequence
@@ -27,8 +27,8 @@ ERROR: node is still EOpNull!
 0:17            Constant:
 0:17              2 (const int)
 0:19      move second child to first child (temp 4-component vector of float)
-0:19        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:19          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:19        Color: direct index for structure (temp 4-component vector of float)
+0:19          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:19          Constant:
 0:19            0 (const int)
 0:19        Constant:
@@ -38,15 +38,15 @@ ERROR: node is still EOpNull!
 0:19          1.000000
 0:20      move second child to first child (temp float)
 0:20        Depth: direct index for structure (temp float FragDepth)
-0:20          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:20          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20          Constant:
 0:20            1 (const int)
 0:20        Constant:
 0:20          1.000000
 0:22      Sequence
-0:22        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:22          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:22        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0: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)
@@ -60,7 +60,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
-0:24  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:13    Function Parameters: 
 0:?     Sequence
 0:16      Sequence
@@ -80,8 +80,8 @@ ERROR: node is still EOpNull!
 0:17            Constant:
 0:17              2 (const int)
 0:19      move second child to first child (temp 4-component vector of float)
-0:19        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:19          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:19        Color: direct index for structure (temp 4-component vector of float)
+0:19          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:19          Constant:
 0:19            0 (const int)
 0:19        Constant:
@@ -91,15 +91,15 @@ ERROR: node is still EOpNull!
 0:19          1.000000
 0:20      move second child to first child (temp float)
 0:20        Depth: direct index for structure (temp float FragDepth)
-0:20          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:20          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20          Constant:
 0:20            1 (const int)
 0:20        Constant:
 0:20          1.000000
 0:22      Sequence
-0:22        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:22          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:22        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0: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)

diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out
index f175991..03ce8b5 100644 (file)
--- a/Test/baseResults/hlsl.init2.frag.out
+++ b/Test/baseResults/hlsl.init2.frag.out
@@ -29,13 +29,13 @@ gl_FragCoord origin is upper left
 0:20            8.000000
 0:20            9.000000
 0:20            10.000000
-0:33  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:33  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:26    Function Parameters: 
 0:?     Sequence
 0:27      Function Call: Test1( (global void)
 0:30      move second child to first child (temp 4-component vector of float)
-0:30        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:30          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:30        color: direct index for structure (temp 4-component vector of float)
+0:30          'ps_output' (temp structure{temp 4-component vector of float color})
 0:30          Constant:
 0:30            0 (const int)
 0:30        Constant:
@@ -44,9 +44,9 @@ gl_FragCoord origin is upper left
 0:30          1.000000
 0:30          1.000000
 0:31      Sequence
-0:31        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:31          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:31        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:31          'ps_output' (temp structure{temp 4-component vector of float color})
 0:31        Branch: Return
 0:?   Linker Objects
 
@@ -84,13 +84,13 @@ gl_FragCoord origin is upper left
 0:20            8.000000
 0:20            9.000000
 0:20            10.000000
-0:33  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:33  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:26    Function Parameters: 
 0:?     Sequence
 0:27      Function Call: Test1( (global void)
 0:30      move second child to first child (temp 4-component vector of float)
-0:30        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:30          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:30        color: direct index for structure (temp 4-component vector of float)
+0:30          'ps_output' (temp structure{temp 4-component vector of float color})
 0:30          Constant:
 0:30            0 (const int)
 0:30        Constant:
@@ -99,9 +99,9 @@ gl_FragCoord origin is upper left
 0:30          1.000000
 0:30          1.000000
 0:31      Sequence
-0:31        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:31          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:31        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:31          'ps_output' (temp structure{temp 4-component vector of float color})
 0:31        Branch: Return
 0:?   Linker Objects
 
@@ -130,7 +130,6 @@ gl_FragCoord origin is upper left
                               MemberName 34(PS_OUTPUT) 0  "color"
                               Name 36  "ps_output"
                               Name 43  "@entryPointOutput"
-                              MemberDecorate 34(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32

diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out
index 083d8cf..044943d 100644 (file)
--- a/Test/baseResults/hlsl.inoutquals.frag.out
+++ b/Test/baseResults/hlsl.inoutquals.frag.out
@@ -18,7 +18,7 @@ gl_FragCoord origin is upper left
 0:11        'x' (in float)
 0:11        Constant:
 0:11          -1.000000
-0:26  Function Definition: main(vf4; (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:26  Function Definition: main(vf4; (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:15    Function Parameters: 
 0:15      'inpos' (noperspective in 4-component vector of float FragCoord)
 0:?     Sequence
@@ -36,8 +36,8 @@ gl_FragCoord origin is upper left
 0:19        'y' (temp float)
 0:19        'z' (temp float)
 0:21      move second child to first child (temp 4-component vector of float)
-0:21        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:21          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:21        Color: direct index for structure (temp 4-component vector of float)
+0:21          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:21          Constant:
 0:21            0 (const int)
 0:?         Construct vec4 (temp 4-component vector of float)
@@ -48,7 +48,7 @@ gl_FragCoord origin is upper left
 0:21            1.000000
 0:22      move second child to first child (temp float)
 0:22        Depth: direct index for structure (temp float FragDepth)
-0:22          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:22            1 (const int)
 0:22        direct index (temp float)
@@ -56,9 +56,9 @@ gl_FragCoord origin is upper left
 0:22          Constant:
 0:22            3 (const int)
 0:24      Sequence
-0:24        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:24          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24        Branch: Return
 0:?   Linker Objects
 
@@ -85,7 +85,7 @@ gl_FragCoord origin is upper left
 0:11        'x' (in float)
 0:11        Constant:
 0:11          -1.000000
-0:26  Function Definition: main(vf4; (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:26  Function Definition: main(vf4; (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:15    Function Parameters: 
 0:15      'inpos' (noperspective in 4-component vector of float FragCoord)
 0:?     Sequence
@@ -103,8 +103,8 @@ gl_FragCoord origin is upper left
 0:19        'y' (temp float)
 0:19        'z' (temp float)
 0:21      move second child to first child (temp 4-component vector of float)
-0:21        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:21          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:21        Color: direct index for structure (temp 4-component vector of float)
+0:21          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:21          Constant:
 0:21            0 (const int)
 0:?         Construct vec4 (temp 4-component vector of float)
@@ -115,7 +115,7 @@ gl_FragCoord origin is upper left
 0:21            1.000000
 0:22      move second child to first child (temp float)
 0:22        Depth: direct index for structure (temp float FragDepth)
-0:22          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:22            1 (const int)
 0:22        direct index (temp float)
@@ -123,9 +123,9 @@ gl_FragCoord origin is upper left
 0:22          Constant:
 0:22            3 (const int)
 0:24      Sequence
-0:24        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:24          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:24          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24        Branch: Return
 0:?   Linker Objects
 
@@ -155,7 +155,6 @@ gl_FragCoord origin is upper left
                               Name 33  "psout"
                               Name 45  "inpos"
                               Name 53  "@entryPointOutput"
-                              MemberDecorate 31(PS_OUTPUT) 0 Location 0
                               MemberDecorate 31(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 45(inpos) NoPerspective
                               Decorate 45(inpos) BuiltIn FragCoord

diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
index 57ef9a5..bff38d8 100644 (file)
--- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.2dms.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:57  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:32      textureFetch (global 4-component vector of float)
@@ -72,8 +72,8 @@ gl_FragCoord origin is upper left
 0:49          3 (const int)
 0:49        'o2' (uniform 2-component vector of int)
 0:51      move second child to first child (temp 4-component vector of float)
-0:51        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:51          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51        Color: direct index for structure (temp 4-component vector of float)
+0:51          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:51          Constant:
 0:51            0 (const int)
 0:51        Constant:
@@ -83,15 +83,15 @@ gl_FragCoord origin is upper left
 0:51          1.000000
 0:52      move second child to first child (temp float)
 0:52        Depth: direct index for structure (temp float FragDepth)
-0:52          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:52          Constant:
 0:52            1 (const int)
 0:52        Constant:
 0:52          1.000000
 0:54      Sequence
-0:54        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:54          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:54        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:54          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:54        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -117,7 +117,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:57  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:32      textureFetch (global 4-component vector of float)
@@ -187,8 +187,8 @@ gl_FragCoord origin is upper left
 0:49          3 (const int)
 0:49        'o2' (uniform 2-component vector of int)
 0:51      move second child to first child (temp 4-component vector of float)
-0:51        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:51          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51        Color: direct index for structure (temp 4-component vector of float)
+0:51          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:51          Constant:
 0:51            0 (const int)
 0:51        Constant:
@@ -198,15 +198,15 @@ gl_FragCoord origin is upper left
 0:51          1.000000
 0:52      move second child to first child (temp float)
 0:52        Depth: direct index for structure (temp float FragDepth)
-0:52          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:52          Constant:
 0:52            1 (const int)
 0:52        Constant:
 0:52          1.000000
 0:54      Sequence
-0:54        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:54          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:54        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:54          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:54        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -263,7 +263,6 @@ gl_FragCoord origin is upper left
                               Decorate 49(g_tTex2dmsf4a) DescriptorSet 0
                               Decorate 58(g_tTex2dmsi4a) DescriptorSet 0
                               Decorate 64(g_tTex2dmsu4a) DescriptorSet 0
-                              MemberDecorate 80(PS_OUTPUT) 0 Location 0
                               MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 97(g_sSamp) DescriptorSet 0
                               Decorate 97(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out
index 5c47fdb..b18bec5 100644 (file)
--- a/Test/baseResults/hlsl.load.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:72  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetch (global 4-component vector of float)
@@ -90,8 +90,8 @@ gl_FragCoord origin is upper left
 0:59          Constant:
 0:59            3 (const int)
 0:67      move second child to first child (temp 4-component vector of float)
-0:67        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:67          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67        Color: direct index for structure (temp 4-component vector of float)
+0:67          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:67          Constant:
 0:67            0 (const int)
 0:67        Constant:
@@ -101,15 +101,15 @@ gl_FragCoord origin is upper left
 0:67          1.000000
 0:68      move second child to first child (temp float)
 0:68        Depth: direct index for structure (temp float FragDepth)
-0:68          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:68            1 (const int)
 0:68        Constant:
 0:68          1.000000
 0:70      Sequence
-0:70        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:70          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:70        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -150,7 +150,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:72  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetch (global 4-component vector of float)
@@ -238,8 +238,8 @@ gl_FragCoord origin is upper left
 0:59          Constant:
 0:59            3 (const int)
 0:67      move second child to first child (temp 4-component vector of float)
-0:67        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:67          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67        Color: direct index for structure (temp 4-component vector of float)
+0:67          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:67          Constant:
 0:67            0 (const int)
 0:67        Constant:
@@ -249,15 +249,15 @@ gl_FragCoord origin is upper left
 0:67          1.000000
 0:68      move second child to first child (temp float)
 0:68        Depth: direct index for structure (temp float FragDepth)
-0:68          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:68            1 (const int)
 0:68        Constant:
 0:68          1.000000
 0:70      Sequence
-0:70        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:70          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:70        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -344,7 +344,6 @@ gl_FragCoord origin is upper left
                               Decorate 47(g_tTex2df4a) DescriptorSet 0
                               Decorate 59(g_tTex2di4a) DescriptorSet 0
                               Decorate 68(g_tTex2du4a) DescriptorSet 0
-                              MemberDecorate 75(PS_OUTPUT) 0 Location 0
                               MemberDecorate 75(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 92(g_sSamp) DescriptorSet 0
                               Decorate 92(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out
index cf1dbcc..1016ba4 100644 (file)
--- a/Test/baseResults/hlsl.load.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:77  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:77  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetch (global 4-component vector of float)
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:64          Constant:
 0:64            3 (const int)
 0:72      move second child to first child (temp 4-component vector of float)
-0:72        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:72          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72        Color: direct index for structure (temp 4-component vector of float)
+0:72          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:72          Constant:
 0:72            0 (const int)
 0:72        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:72          1.000000
 0:73      move second child to first child (temp float)
 0:73        Depth: direct index for structure (temp float FragDepth)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            1 (const int)
 0:73        Constant:
 0:73          1.000000
 0:75      Sequence
-0:75        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:75          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:75        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -183,7 +183,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:77  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:77  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetch (global 4-component vector of float)
@@ -304,8 +304,8 @@ gl_FragCoord origin is upper left
 0:64          Constant:
 0:64            3 (const int)
 0:72      move second child to first child (temp 4-component vector of float)
-0:72        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:72          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72        Color: direct index for structure (temp 4-component vector of float)
+0:72          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:72          Constant:
 0:72            0 (const int)
 0:72        Constant:
@@ -315,15 +315,15 @@ gl_FragCoord origin is upper left
 0:72          1.000000
 0:73      move second child to first child (temp float)
 0:73        Depth: direct index for structure (temp float FragDepth)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            1 (const int)
 0:73        Constant:
 0:73          1.000000
 0:75      Sequence
-0:75        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:75          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:75        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -414,7 +414,6 @@ gl_FragCoord origin is upper left
                               Decorate 78(g_tTex3df4) DescriptorSet 0
                               Decorate 90(g_tTex3di4) DescriptorSet 0
                               Decorate 99(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 106(PS_OUTPUT) 0 Location 0
                               MemberDecorate 106(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 123(g_sSamp) DescriptorSet 0
                               Decorate 123(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
index 8c005b8..16e5187 100644 (file)
--- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.buffer.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:39  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -24,8 +24,8 @@ gl_FragCoord origin is upper left
 0:30            'g_tTexbu4' (uniform usamplerBuffer)
 0:30            'c1' (uniform int)
 0:34      move second child to first child (temp 4-component vector of float)
-0:34        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34        Color: direct index for structure (temp 4-component vector of float)
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            0 (const int)
 0:34        Constant:
@@ -35,15 +35,15 @@ gl_FragCoord origin is upper left
 0:34          1.000000
 0:35      move second child to first child (temp float)
 0:35        Depth: direct index for structure (temp float FragDepth)
-0:35          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:35            1 (const int)
 0:35        Constant:
 0:35          1.000000
 0:37      Sequence
-0:37        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:37          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:37        Branch: Return
 0:?   Linker Objects
 0:?     'g_tTexbf4_test' (layout(binding=0 ) uniform samplerBuffer)
@@ -66,7 +66,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:39  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:28      Sequence
@@ -88,8 +88,8 @@ gl_FragCoord origin is upper left
 0:30            'g_tTexbu4' (uniform usamplerBuffer)
 0:30            'c1' (uniform int)
 0:34      move second child to first child (temp 4-component vector of float)
-0:34        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34        Color: direct index for structure (temp 4-component vector of float)
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            0 (const int)
 0:34        Constant:
@@ -99,15 +99,15 @@ gl_FragCoord origin is upper left
 0:34          1.000000
 0:35      move second child to first child (temp float)
 0:35        Depth: direct index for structure (temp float FragDepth)
-0:35          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:35            1 (const int)
 0:35        Constant:
 0:35          1.000000
 0:37      Sequence
-0:37        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:37          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:37          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:37        Branch: Return
 0:?   Linker Objects
 0:?     'g_tTexbf4_test' (layout(binding=0 ) uniform samplerBuffer)
@@ -157,7 +157,6 @@ gl_FragCoord origin is upper left
                               Decorate 13(g_tTexbf4) DescriptorSet 0
                               Decorate 27(g_tTexbi4) DescriptorSet 0
                               Decorate 39(g_tTexbu4) DescriptorSet 0
-                              MemberDecorate 44(PS_OUTPUT) 0 Location 0
                               MemberDecorate 44(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 58(g_tTexbf4_test) DescriptorSet 0
                               Decorate 58(g_tTexbf4_test) Binding 0

diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out
index 6d215e4..acb97a4 100644 (file)
--- a/Test/baseResults/hlsl.load.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:77  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:77  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetchOffset (global 4-component vector of float)
@@ -132,8 +132,8 @@ gl_FragCoord origin is upper left
 0:64            3 (const int)
 0:64        'o3' (uniform 3-component vector of int)
 0:72      move second child to first child (temp 4-component vector of float)
-0:72        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:72          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72        Color: direct index for structure (temp 4-component vector of float)
+0:72          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:72          Constant:
 0:72            0 (const int)
 0:72        Constant:
@@ -143,15 +143,15 @@ gl_FragCoord origin is upper left
 0:72          1.000000
 0:73      move second child to first child (temp float)
 0:73        Depth: direct index for structure (temp float FragDepth)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            1 (const int)
 0:73        Constant:
 0:73          1.000000
 0:75      Sequence
-0:75        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:75          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:75        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -192,7 +192,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:77  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:77  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetchOffset (global 4-component vector of float)
@@ -322,8 +322,8 @@ gl_FragCoord origin is upper left
 0:64            3 (const int)
 0:64        'o3' (uniform 3-component vector of int)
 0:72      move second child to first child (temp 4-component vector of float)
-0:72        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:72          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:72        Color: direct index for structure (temp 4-component vector of float)
+0:72          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:72          Constant:
 0:72            0 (const int)
 0:72        Constant:
@@ -333,15 +333,15 @@ gl_FragCoord origin is upper left
 0:72          1.000000
 0:73      move second child to first child (temp float)
 0:73        Depth: direct index for structure (temp float FragDepth)
-0:73          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:73          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:73          Constant:
 0:73            1 (const int)
 0:73        Constant:
 0:73          1.000000
 0:75      Sequence
-0:75        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:75          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:75          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:75        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -433,7 +433,6 @@ gl_FragCoord origin is upper left
                               Decorate 86(g_tTex3df4) DescriptorSet 0
                               Decorate 100(g_tTex3di4) DescriptorSet 0
                               Decorate 110(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 118(PS_OUTPUT) 0 Location 0
                               MemberDecorate 118(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 135(g_sSamp) DescriptorSet 0
                               Decorate 135(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
index b5226ad..1751db8 100644 (file)
--- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.load.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:70  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetchOffset (global 4-component vector of float)
@@ -96,8 +96,8 @@ gl_FragCoord origin is upper left
 0:59            3 (const int)
 0:59        'o2' (uniform 2-component vector of int)
 0:65      move second child to first child (temp 4-component vector of float)
-0:65        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        Color: direct index for structure (temp 4-component vector of float)
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65          Constant:
 0:65            0 (const int)
 0:65        Constant:
@@ -107,15 +107,15 @@ gl_FragCoord origin is upper left
 0:65          1.000000
 0:66      move second child to first child (temp float)
 0:66        Depth: direct index for structure (temp float FragDepth)
-0:66          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:66            1 (const int)
 0:66        Constant:
 0:66          1.000000
 0:68      Sequence
-0:68        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:68          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:68        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -156,7 +156,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:70  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:70  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48    Function Parameters: 
 0:?     Sequence
 0:52      textureFetchOffset (global 4-component vector of float)
@@ -250,8 +250,8 @@ gl_FragCoord origin is upper left
 0:59            3 (const int)
 0:59        'o2' (uniform 2-component vector of int)
 0:65      move second child to first child (temp 4-component vector of float)
-0:65        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        Color: direct index for structure (temp 4-component vector of float)
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65          Constant:
 0:65            0 (const int)
 0:65        Constant:
@@ -261,15 +261,15 @@ gl_FragCoord origin is upper left
 0:65          1.000000
 0:66      move second child to first child (temp float)
 0:66        Depth: direct index for structure (temp float FragDepth)
-0:66          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:66            1 (const int)
 0:66        Constant:
 0:66          1.000000
 0:68      Sequence
-0:68        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:68          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:68        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -357,7 +357,6 @@ gl_FragCoord origin is upper left
                               Decorate 51(g_tTex2df4a) DescriptorSet 0
                               Decorate 66(g_tTex2di4a) DescriptorSet 0
                               Decorate 76(g_tTex2du4a) DescriptorSet 0
-                              MemberDecorate 84(PS_OUTPUT) 0 Location 0
                               MemberDecorate 84(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 101(g_sSamp) DescriptorSet 0
                               Decorate 101(g_sSamp) Binding 0

diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out
index e09256c..721b0d3 100644 (file)
--- a/Test/baseResults/hlsl.numericsuffixes.frag.out
+++ b/Test/baseResults/hlsl.numericsuffixes.frag.out
@@ -2,7 +2,7 @@ hlsl.numericsuffixes.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:21  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:21  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:5    Function Parameters: 
 0:?     Sequence
 0:7      Sequence
@@ -51,17 +51,17 @@ gl_FragCoord origin is upper left
 0:15          Constant:
 0:15            58 (const uint)
 0:18      move second child to first child (temp 4-component vector of float)
-0:18        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:18          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:18        color: direct index for structure (temp 4-component vector of float)
+0:18          'ps_output' (temp structure{temp 4-component vector of float color})
 0:18          Constant:
 0:18            0 (const int)
-0:18        Construct vec4 (layout(location=0 ) temp 4-component vector of float)
+0:18        Construct vec4 (temp 4-component vector of float)
 0:18          Convert int to float (temp float)
 0:18            'r07' (temp int)
 0:19      Sequence
-0:19        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:19          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:19        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:19          'ps_output' (temp structure{temp 4-component vector of float color})
 0:19        Branch: Return
 0:?   Linker Objects
 
@@ -72,7 +72,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:21  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:21  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:5    Function Parameters: 
 0:?     Sequence
 0:7      Sequence
@@ -121,17 +121,17 @@ gl_FragCoord origin is upper left
 0:15          Constant:
 0:15            58 (const uint)
 0:18      move second child to first child (temp 4-component vector of float)
-0:18        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:18          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:18        color: direct index for structure (temp 4-component vector of float)
+0:18          'ps_output' (temp structure{temp 4-component vector of float color})
 0:18          Constant:
 0:18            0 (const int)
-0:18        Construct vec4 (layout(location=0 ) temp 4-component vector of float)
+0:18        Construct vec4 (temp 4-component vector of float)
 0:18          Convert int to float (temp float)
 0:18            'r07' (temp int)
 0:19      Sequence
-0:19        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:19          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:19        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:19          'ps_output' (temp structure{temp 4-component vector of float color})
 0:19        Branch: Return
 0:?   Linker Objects
 
@@ -158,7 +158,6 @@ gl_FragCoord origin is upper left
                               MemberName 30(PS_OUTPUT) 0  "color"
                               Name 32  "ps_output"
                               Name 40  "@entryPointOutput"
-                              MemberDecorate 30(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32

diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out
index 27db921..4c70ea8 100644 (file)
--- a/Test/baseResults/hlsl.pp.line.frag.out
+++ b/Test/baseResults/hlsl.pp.line.frag.out
@@ -2,7 +2,7 @@ hlsl.pp.line.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:131  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:131  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:4    Function Parameters: 
 0:?     Sequence
 0:124      Sequence
@@ -11,8 +11,8 @@ gl_FragCoord origin is upper left
 0:124          Constant:
 0:124            124 (const int)
 0:126      move second child to first child (temp 4-component vector of float)
-0:126        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:126          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:126        Color: direct index for structure (temp 4-component vector of float)
+0:126          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:126          Constant:
 0:126            0 (const int)
 0:?         Construct vec4 (temp 4-component vector of float)
@@ -26,15 +26,15 @@ gl_FragCoord origin is upper left
 0:126            1.000000
 0:127      move second child to first child (temp float)
 0:127        Depth: direct index for structure (temp float FragDepth)
-0:127          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:127          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:127          Constant:
 0:127            1 (const int)
 0:127        Constant:
 0:127          1.000000
 0:129      Sequence
-0:129        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:129          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:129        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:129          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:129        Branch: Return
 0:?   Linker Objects
 
@@ -45,7 +45,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:131  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:131  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:4    Function Parameters: 
 0:?     Sequence
 0:124      Sequence
@@ -54,8 +54,8 @@ gl_FragCoord origin is upper left
 0:124          Constant:
 0:124            124 (const int)
 0:126      move second child to first child (temp 4-component vector of float)
-0:126        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:126          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:126        Color: direct index for structure (temp 4-component vector of float)
+0:126          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:126          Constant:
 0:126            0 (const int)
 0:?         Construct vec4 (temp 4-component vector of float)
@@ -69,15 +69,15 @@ gl_FragCoord origin is upper left
 0:126            1.000000
 0:127      move second child to first child (temp float)
 0:127        Depth: direct index for structure (temp float FragDepth)
-0:127          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:127          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:127          Constant:
 0:127            1 (const int)
 0:127        Constant:
 0:127          1.000000
 0:129      Sequence
-0:129        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:129          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:129        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:129          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:129        Branch: Return
 0:?   Linker Objects
 
@@ -97,7 +97,6 @@ gl_FragCoord origin is upper left
                               MemberName 12(PS_OUTPUT) 1  "Depth"
                               Name 14  "psout"
                               Name 27  "@entryPointOutput"
-                              MemberDecorate 12(PS_OUTPUT) 0 Location 0
                               MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth
                2:             TypeVoid
                3:             TypeFunction 2

diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out
index 252205d..e2577c7 100644 (file)
--- a/Test/baseResults/hlsl.precise.frag.out
+++ b/Test/baseResults/hlsl.precise.frag.out
@@ -6,12 +6,12 @@ gl_FragCoord origin is upper left
 0:6    Function Parameters: 
 0:6      'myfloat' (noContraction in float)
 0:6      'myfloat3' (noContraction out 3-component vector of float)
-0:15  Function Definition: main( (global structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:15  Function Definition: main( (global structure{noContraction temp 4-component vector of float color})
 0:9    Function Parameters: 
 0:?     Sequence
 0:11      move second child to first child (noContraction temp 4-component vector of float)
-0:11        color: direct index for structure (layout(location=0 ) noContraction temp 4-component vector of float)
-0:11          'ps_output' (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:11        color: direct index for structure (noContraction temp 4-component vector of float)
+0:11          'ps_output' (temp structure{noContraction temp 4-component vector of float color})
 0:11          Constant:
 0:11            0 (const int)
 0:11        Constant:
@@ -20,9 +20,9 @@ gl_FragCoord origin is upper left
 0:11          1.000000
 0:11          1.000000
 0:12      Sequence
-0:12        move second child to first child (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) noContraction temp 4-component vector of float color})
-0:12          'ps_output' (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:12        move second child to first child (temp structure{noContraction temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color})
+0: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)
@@ -38,12 +38,12 @@ gl_FragCoord origin is upper left
 0:6    Function Parameters: 
 0:6      'myfloat' (noContraction in float)
 0:6      'myfloat3' (noContraction out 3-component vector of float)
-0:15  Function Definition: main( (global structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:15  Function Definition: main( (global structure{noContraction temp 4-component vector of float color})
 0:9    Function Parameters: 
 0:?     Sequence
 0:11      move second child to first child (noContraction temp 4-component vector of float)
-0:11        color: direct index for structure (layout(location=0 ) noContraction temp 4-component vector of float)
-0:11          'ps_output' (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:11        color: direct index for structure (noContraction temp 4-component vector of float)
+0:11          'ps_output' (temp structure{noContraction temp 4-component vector of float color})
 0:11          Constant:
 0:11            0 (const int)
 0:11        Constant:
@@ -52,9 +52,9 @@ gl_FragCoord origin is upper left
 0:11          1.000000
 0:11          1.000000
 0:12      Sequence
-0:12        move second child to first child (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) noContraction temp 4-component vector of float color})
-0:12          'ps_output' (temp structure{layout(location=0 ) noContraction temp 4-component vector of float color})
+0:12        move second child to first child (temp structure{noContraction temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color})
+0: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)
@@ -77,7 +77,6 @@ gl_FragCoord origin is upper left
                               Name 18  "ps_output"
                               Name 26  "@entryPointOutput"
                               Name 30  "precisefloat"
-                              MemberDecorate 16(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32

diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out
index e6387e5..413a4f0 100644 (file)
--- a/Test/baseResults/hlsl.promotions.frag.out
+++ b/Test/baseResults/hlsl.promotions.frag.out
@@ -237,7 +237,7 @@ gl_FragCoord origin is upper left
 0:49      Branch: Return with expression
 0:49        Convert float to double (temp 3-component vector of double)
 0:49          'f3' (uniform 3-component vector of float)
-0:202  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
+0:202  Function Definition: main( (global structure{temp 4-component vector of float Color})
 0:52    Function Parameters: 
 0:?     Sequence
 0:54      Sequence
@@ -491,15 +491,15 @@ gl_FragCoord origin is upper left
 0:196            Convert int to float (temp float)
 0:196              'c2' (temp int)
 0:199      move second child to first child (temp 4-component vector of float)
-0:199        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:199          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:199        Color: direct index for structure (temp 4-component vector of float)
+0:199          'psout' (temp structure{temp 4-component vector of float Color})
 0:199          Constant:
 0:199            0 (const int)
 0:199        'outval' (temp 4-component vector of float)
 0:200      Sequence
-0:200        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color})
-0:200          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:200        move second child to first child (temp structure{temp 4-component vector of float Color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color})
+0:200          'psout' (temp structure{temp 4-component vector of float Color})
 0:200        Branch: Return
 0:?   Linker Objects
 0:?     'i3' (uniform 3-component vector of int)
@@ -755,7 +755,7 @@ gl_FragCoord origin is upper left
 0:49      Branch: Return with expression
 0:49        Convert float to double (temp 3-component vector of double)
 0:49          'f3' (uniform 3-component vector of float)
-0:202  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
+0:202  Function Definition: main( (global structure{temp 4-component vector of float Color})
 0:52    Function Parameters: 
 0:?     Sequence
 0:54      Sequence
@@ -1009,15 +1009,15 @@ gl_FragCoord origin is upper left
 0:196            Convert int to float (temp float)
 0:196              'c2' (temp int)
 0:199      move second child to first child (temp 4-component vector of float)
-0:199        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:199          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:199        Color: direct index for structure (temp 4-component vector of float)
+0:199          'psout' (temp structure{temp 4-component vector of float Color})
 0:199          Constant:
 0:199            0 (const int)
 0:199        'outval' (temp 4-component vector of float)
 0:200      Sequence
-0:200        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color})
-0:200          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:200        move second child to first child (temp structure{temp 4-component vector of float Color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color})
+0:200          'psout' (temp structure{temp 4-component vector of float Color})
 0:200        Branch: Return
 0:?   Linker Objects
 0:?     'i3' (uniform 3-component vector of int)
@@ -1129,7 +1129,6 @@ gl_FragCoord origin is upper left
                               MemberName 471(PS_OUTPUT) 0  "Color"
                               Name 473  "psout"
                               Name 477  "@entryPointOutput"
-                              MemberDecorate 471(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32

diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out
index 304ff5e..5413a6f 100644 (file)
--- a/Test/baseResults/hlsl.sample.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.sample.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -105,8 +105,8 @@ gl_FragCoord origin is upper left
 0:?               0.900000
 0:?               1.000000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -116,15 +116,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -146,7 +146,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -249,8 +249,8 @@ gl_FragCoord origin is upper left
 0:?               0.900000
 0:?               1.000000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -260,15 +260,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -332,7 +332,6 @@ gl_FragCoord origin is upper left
                               Decorate 90(g_tTexcdf4) DescriptorSet 0
                               Decorate 100(g_tTexcdi4) DescriptorSet 0
                               Decorate 110(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 120(PS_OUTPUT) 0 Location 0
                               MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 133(g_tTex1df4a) DescriptorSet 0
                               Decorate 133(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
index e015671..9cd4ebd 100644 (file)
--- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
@@ -4,7 +4,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:91  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:91  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:53    Function Parameters: 
 0:?     Sequence
 0:57      move second child to first child (temp int)
@@ -215,8 +215,8 @@ gl_FragCoord origin is upper left
 0:?               0.800000
 0:?               0.900000
 0:86      move second child to first child (temp 4-component vector of float)
-0:86        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:86          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:86        Color: direct index for structure (temp 4-component vector of float)
+0:86          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:86          Constant:
 0:86            0 (const int)
 0:86        Constant:
@@ -226,15 +226,15 @@ gl_FragCoord origin is upper left
 0:86          1.000000
 0:87      move second child to first child (temp float)
 0:87        Depth: direct index for structure (temp float FragDepth)
-0:87          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:87          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:87          Constant:
 0:87            1 (const int)
 0:87        Constant:
 0:87          1.000000
 0:89      Sequence
-0:89        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:89          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:89        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:89          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:89        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -261,7 +261,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:91  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:91  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:53    Function Parameters: 
 0:?     Sequence
 0:57      move second child to first child (temp int)
@@ -472,8 +472,8 @@ gl_FragCoord origin is upper left
 0:?               0.800000
 0:?               0.900000
 0:86      move second child to first child (temp 4-component vector of float)
-0:86        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:86          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:86        Color: direct index for structure (temp 4-component vector of float)
+0:86          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:86          Constant:
 0:86            0 (const int)
 0:86        Constant:
@@ -483,15 +483,15 @@ gl_FragCoord origin is upper left
 0:86          1.000000
 0:87      move second child to first child (temp float)
 0:87        Depth: direct index for structure (temp float FragDepth)
-0:87          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:87          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:87          Constant:
 0:87            1 (const int)
 0:87        Constant:
 0:87          1.000000
 0:89      Sequence
-0:89        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:89          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:89        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:89          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:89        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -584,7 +584,6 @@ gl_FragCoord origin is upper left
                               Decorate 147(g_tTexcdf4) DescriptorSet 0
                               Decorate 156(g_tTexcdi4) DescriptorSet 0
                               Decorate 165(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 171(PS_OUTPUT) 0 Location 0
                               MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 183(g_sSamp2d) DescriptorSet 0
                               Decorate 184(g_sSamp2D_b) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
index 12deed4..d11d16f 100644 (file)
--- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.sample.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -167,7 +167,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -288,8 +288,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -299,15 +299,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -376,7 +376,6 @@ gl_FragCoord origin is upper left
                               Decorate 92(g_tTex3df4) DescriptorSet 0
                               Decorate 105(g_tTex3di4) DescriptorSet 0
                               Decorate 116(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 127(PS_OUTPUT) 0 Location 0
                               MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 139(g_tTex1df4a) DescriptorSet 0
                               Decorate 139(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
index 939595a..7631529 100644 (file)
--- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.sample.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -84,8 +84,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -95,15 +95,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -122,7 +122,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -204,8 +204,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -215,15 +215,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -274,7 +274,6 @@ gl_FragCoord origin is upper left
                               Decorate 59(g_tTex2df4) DescriptorSet 0
                               Decorate 72(g_tTex2di4) DescriptorSet 0
                               Decorate 83(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 93(PS_OUTPUT) 0 Location 0
                               MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 105(g_tTex1df4a) DescriptorSet 0
                               Decorate 105(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
index d81c4a7..e735d34 100644 (file)
--- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplebias.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:37            Constant:
 0:37              0.500000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -164,7 +164,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -285,8 +285,8 @@ gl_FragCoord origin is upper left
 0:37            Constant:
 0:37              0.500000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -296,15 +296,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -368,7 +368,6 @@ gl_FragCoord origin is upper left
                               Decorate 90(g_tTexcdf4) DescriptorSet 0
                               Decorate 100(g_tTexcdi4) DescriptorSet 0
                               Decorate 110(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 120(PS_OUTPUT) 0 Location 0
                               MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 133(g_tTex1df4a) DescriptorSet 0
                               Decorate 133(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
index 99e63c9..d61eda9 100644 (file)
--- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplebias.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:52  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -153,8 +153,8 @@ gl_FragCoord origin is upper left
 0:45            Constant:
 0:45              0.500000
 0:47      move second child to first child (temp 4-component vector of float)
-0:47        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        Color: direct index for structure (temp 4-component vector of float)
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47          Constant:
 0:47            0 (const int)
 0:47        Constant:
@@ -164,15 +164,15 @@ gl_FragCoord origin is upper left
 0:47          1.000000
 0:48      move second child to first child (temp float)
 0:48        Depth: direct index for structure (temp float FragDepth)
-0:48          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:48            1 (const int)
 0:48        Constant:
 0:48          1.000000
 0:50      Sequence
-0:50        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:50          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:50        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -197,7 +197,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:52  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -348,8 +348,8 @@ gl_FragCoord origin is upper left
 0:45            Constant:
 0:45              0.500000
 0:47      move second child to first child (temp 4-component vector of float)
-0:47        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        Color: direct index for structure (temp 4-component vector of float)
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47          Constant:
 0:47            0 (const int)
 0:47        Constant:
@@ -359,15 +359,15 @@ gl_FragCoord origin is upper left
 0:47          1.000000
 0:48      move second child to first child (temp float)
 0:48        Depth: direct index for structure (temp float FragDepth)
-0:48          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:48            1 (const int)
 0:48        Constant:
 0:48          1.000000
 0:50      Sequence
-0:50        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:50          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:50        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -442,7 +442,6 @@ gl_FragCoord origin is upper left
                               Decorate 119(g_tTexcdf4) DescriptorSet 0
                               Decorate 128(g_tTexcdi4) DescriptorSet 0
                               Decorate 137(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 143(PS_OUTPUT) 0 Location 0
                               MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 157(g_tTex1df4a) DescriptorSet 0
                               Decorate 157(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
index 0165eb3..b2e77ef 100644 (file)
--- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplebias.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -141,8 +141,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -152,15 +152,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -185,7 +185,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -324,8 +324,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -335,15 +335,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -412,7 +412,6 @@ gl_FragCoord origin is upper left
                               Decorate 92(g_tTex3df4) DescriptorSet 0
                               Decorate 105(g_tTex3di4) DescriptorSet 0
                               Decorate 116(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 127(PS_OUTPUT) 0 Location 0
                               MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 139(g_tTex1df4a) DescriptorSet 0
                               Decorate 139(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
index da8f895..52263c4 100644 (file)
--- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplebias.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -96,8 +96,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -107,15 +107,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -134,7 +134,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -228,8 +228,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -239,15 +239,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -298,7 +298,6 @@ gl_FragCoord origin is upper left
                               Decorate 60(g_tTex2df4) DescriptorSet 0
                               Decorate 73(g_tTex2di4) DescriptorSet 0
                               Decorate 83(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 93(PS_OUTPUT) 0 Location 0
                               MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 105(g_tTex1df4a) DescriptorSet 0
                               Decorate 105(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
index 4a4d5f4..a61aa29 100644 (file)
--- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmp.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:61  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:61  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -132,8 +132,8 @@ gl_FragCoord origin is upper left
 0:54            Constant:
 0:54              0.750000
 0:56      move second child to first child (temp 4-component vector of float)
-0:56        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:56          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:56        Color: direct index for structure (temp 4-component vector of float)
+0:56          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:56          Constant:
 0:56            0 (const int)
 0:56        Constant:
@@ -143,15 +143,15 @@ gl_FragCoord origin is upper left
 0:56          1.000000
 0:57      move second child to first child (temp float)
 0:57        Depth: direct index for structure (temp float FragDepth)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            1 (const int)
 0:57        Constant:
 0:57          1.000000
 0:59      Sequence
-0:59        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:59          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:59        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -184,7 +184,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:61  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:61  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -314,8 +314,8 @@ gl_FragCoord origin is upper left
 0:54            Constant:
 0:54              0.750000
 0:56      move second child to first child (temp 4-component vector of float)
-0:56        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:56          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:56        Color: direct index for structure (temp 4-component vector of float)
+0:56          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:56          Constant:
 0:56            0 (const int)
 0:56        Constant:
@@ -325,15 +325,15 @@ gl_FragCoord origin is upper left
 0:56          1.000000
 0:57      move second child to first child (temp float)
 0:57        Depth: direct index for structure (temp float FragDepth)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            1 (const int)
 0:57        Constant:
 0:57          1.000000
 0:59      Sequence
-0:59        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:59          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:59        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -418,7 +418,6 @@ gl_FragCoord origin is upper left
                               Decorate 96(g_tTexcdf4a) DescriptorSet 0
                               Decorate 110(g_tTexcdi4a) DescriptorSet 0
                               Decorate 121(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 129(PS_OUTPUT) 0 Location 0
                               MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 145(g_tTex1df4) DescriptorSet 0
                               Decorate 145(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
index 1779e8d..93fe73c 100644 (file)
--- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmp.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:62  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:55              Constant:
 0:55                0.750000
 0:57      move second child to first child (temp 4-component vector of float)
-0:57        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57        Color: direct index for structure (temp 4-component vector of float)
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            0 (const int)
 0:57        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:57          1.000000
 0:58      move second child to first child (temp float)
 0:58        Depth: direct index for structure (temp float FragDepth)
-0:58          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:58          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:58          Constant:
 0:58            1 (const int)
 0:58        Constant:
 0:58          1.000000
 0:60      Sequence
-0:60        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:60          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:60        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -175,7 +175,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:62  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -296,8 +296,8 @@ gl_FragCoord origin is upper left
 0:55              Constant:
 0:55                0.750000
 0:57      move second child to first child (temp 4-component vector of float)
-0:57        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57        Color: direct index for structure (temp 4-component vector of float)
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            0 (const int)
 0:57        Constant:
@@ -307,15 +307,15 @@ gl_FragCoord origin is upper left
 0:57          1.000000
 0:58      move second child to first child (temp float)
 0:58        Depth: direct index for structure (temp float FragDepth)
-0:58          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:58          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:58          Constant:
 0:58            1 (const int)
 0:58        Constant:
 0:58          1.000000
 0:60      Sequence
-0:60        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:60          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:60        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -401,7 +401,6 @@ gl_FragCoord origin is upper left
                               Decorate 90(g_tTexcdf4) DescriptorSet 0
                               Decorate 105(g_tTexcdi4) DescriptorSet 0
                               Decorate 117(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 127(PS_OUTPUT) 0 Location 0
                               MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 143(g_tTex3df4) DescriptorSet 0
                               Decorate 146(g_tTex3di4) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
index f659c7f..71eb520 100644 (file)
--- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmp.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:67  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -96,8 +96,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:62      move second child to first child (temp 4-component vector of float)
-0:62        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:62          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62        Color: direct index for structure (temp 4-component vector of float)
+0:62          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:62          Constant:
 0:62            0 (const int)
 0:62        Constant:
@@ -107,15 +107,15 @@ gl_FragCoord origin is upper left
 0:62          1.000000
 0:63      move second child to first child (temp float)
 0:63        Depth: direct index for structure (temp float FragDepth)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            1 (const int)
 0:63        Constant:
 0:63          1.000000
 0:65      Sequence
-0:65        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -148,7 +148,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:67  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -242,8 +242,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:62      move second child to first child (temp 4-component vector of float)
-0:62        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:62          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62        Color: direct index for structure (temp 4-component vector of float)
+0:62          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:62          Constant:
 0:62            0 (const int)
 0:62        Constant:
@@ -253,15 +253,15 @@ gl_FragCoord origin is upper left
 0:62          1.000000
 0:63      move second child to first child (temp float)
 0:63        Depth: direct index for structure (temp float FragDepth)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            1 (const int)
 0:63        Constant:
 0:63          1.000000
 0:65      Sequence
-0:65        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -341,7 +341,6 @@ gl_FragCoord origin is upper left
                               Decorate 52(g_tTex2df4) DescriptorSet 0
                               Decorate 70(g_tTex2di4) DescriptorSet 0
                               Decorate 82(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 92(PS_OUTPUT) 0 Location 0
                               MemberDecorate 92(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 108(g_tTex3df4) DescriptorSet 0
                               Decorate 111(g_tTex3di4) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
index caf9357..c2cdb4d 100644 (file)
--- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmp.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:68  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -102,8 +102,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:63      move second child to first child (temp 4-component vector of float)
-0:63        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63        Color: direct index for structure (temp 4-component vector of float)
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            0 (const int)
 0:63        Constant:
@@ -113,15 +113,15 @@ gl_FragCoord origin is upper left
 0:63          1.000000
 0:64      move second child to first child (temp float)
 0:64        Depth: direct index for structure (temp float FragDepth)
-0:64          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:64          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:64          Constant:
 0:64            1 (const int)
 0:64        Constant:
 0:64          1.000000
 0:66      Sequence
-0:66        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:66          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:66        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -154,7 +154,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:68  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -254,8 +254,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:63      move second child to first child (temp 4-component vector of float)
-0:63        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63        Color: direct index for structure (temp 4-component vector of float)
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            0 (const int)
 0:63        Constant:
@@ -265,15 +265,15 @@ gl_FragCoord origin is upper left
 0:63          1.000000
 0:64      move second child to first child (temp float)
 0:64        Depth: direct index for structure (temp float FragDepth)
-0:64          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:64          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:64          Constant:
 0:64            1 (const int)
 0:64        Constant:
 0:64          1.000000
 0:66      Sequence
-0:66        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:66          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:66        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -352,7 +352,6 @@ gl_FragCoord origin is upper left
                               Decorate 58(g_tTex2df4a) DescriptorSet 0
                               Decorate 76(g_tTex2di4a) DescriptorSet 0
                               Decorate 88(g_tTex2du4a) DescriptorSet 0
-                              MemberDecorate 98(PS_OUTPUT) 0 Location 0
                               MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 114(g_tTex1df4) DescriptorSet 0
                               Decorate 114(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
index 0d60dda..5a7b740 100644 (file)
--- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmplevelzero.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:61  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:61  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -150,8 +150,8 @@ gl_FragCoord origin is upper left
 0:54            Constant:
 0:54              0.000000
 0:56      move second child to first child (temp 4-component vector of float)
-0:56        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:56          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:56        Color: direct index for structure (temp 4-component vector of float)
+0:56          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:56          Constant:
 0:56            0 (const int)
 0:56        Constant:
@@ -161,15 +161,15 @@ gl_FragCoord origin is upper left
 0:56          1.000000
 0:57      move second child to first child (temp float)
 0:57        Depth: direct index for structure (temp float FragDepth)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            1 (const int)
 0:57        Constant:
 0:57          1.000000
 0:59      Sequence
-0:59        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:59          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:59        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -202,7 +202,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:61  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:61  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -350,8 +350,8 @@ gl_FragCoord origin is upper left
 0:54            Constant:
 0:54              0.000000
 0:56      move second child to first child (temp 4-component vector of float)
-0:56        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:56          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:56        Color: direct index for structure (temp 4-component vector of float)
+0:56          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:56          Constant:
 0:56            0 (const int)
 0:56        Constant:
@@ -361,15 +361,15 @@ gl_FragCoord origin is upper left
 0:56          1.000000
 0:57      move second child to first child (temp float)
 0:57        Depth: direct index for structure (temp float FragDepth)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            1 (const int)
 0:57        Constant:
 0:57          1.000000
 0:59      Sequence
-0:59        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:59          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:59          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:59        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -454,7 +454,6 @@ gl_FragCoord origin is upper left
                               Decorate 97(g_tTexcdf4a) DescriptorSet 0
                               Decorate 111(g_tTexcdi4a) DescriptorSet 0
                               Decorate 122(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 130(PS_OUTPUT) 0 Location 0
                               MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 146(g_tTex1df4) DescriptorSet 0
                               Decorate 146(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
index 42ced8c..ba84224 100644 (file)
--- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmplevelzero.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:62  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -141,8 +141,8 @@ gl_FragCoord origin is upper left
 0:55            Constant:
 0:55              0.000000
 0:57      move second child to first child (temp 4-component vector of float)
-0:57        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57        Color: direct index for structure (temp 4-component vector of float)
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            0 (const int)
 0:57        Constant:
@@ -152,15 +152,15 @@ gl_FragCoord origin is upper left
 0:57          1.000000
 0:58      move second child to first child (temp float)
 0:58        Depth: direct index for structure (temp float FragDepth)
-0:58          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:58          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:58          Constant:
 0:58            1 (const int)
 0:58        Constant:
 0:58          1.000000
 0:60      Sequence
-0:60        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:60          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:60        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -193,7 +193,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:62  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -332,8 +332,8 @@ gl_FragCoord origin is upper left
 0:55            Constant:
 0:55              0.000000
 0:57      move second child to first child (temp 4-component vector of float)
-0:57        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:57          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:57        Color: direct index for structure (temp 4-component vector of float)
+0:57          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:57          Constant:
 0:57            0 (const int)
 0:57        Constant:
@@ -343,15 +343,15 @@ gl_FragCoord origin is upper left
 0:57          1.000000
 0:58      move second child to first child (temp float)
 0:58        Depth: direct index for structure (temp float FragDepth)
-0:58          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:58          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:58          Constant:
 0:58            1 (const int)
 0:58        Constant:
 0:58          1.000000
 0:60      Sequence
-0:60        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:60          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:60          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:60        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -437,7 +437,6 @@ gl_FragCoord origin is upper left
                               Decorate 91(g_tTexcdf4) DescriptorSet 0
                               Decorate 106(g_tTexcdi4) DescriptorSet 0
                               Decorate 118(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 128(PS_OUTPUT) 0 Location 0
                               MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 144(g_tTex3df4) DescriptorSet 0
                               Decorate 147(g_tTex3di4) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
index 467013f..9bed796 100644 (file)
--- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmplevelzero.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:67  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -108,8 +108,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:62      move second child to first child (temp 4-component vector of float)
-0:62        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:62          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62        Color: direct index for structure (temp 4-component vector of float)
+0:62          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:62          Constant:
 0:62            0 (const int)
 0:62        Constant:
@@ -119,15 +119,15 @@ gl_FragCoord origin is upper left
 0:62          1.000000
 0:63      move second child to first child (temp float)
 0:63        Depth: direct index for structure (temp float FragDepth)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            1 (const int)
 0:63        Constant:
 0:63          1.000000
 0:65      Sequence
-0:65        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -160,7 +160,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:67  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:67  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -266,8 +266,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:62      move second child to first child (temp 4-component vector of float)
-0:62        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:62          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:62        Color: direct index for structure (temp 4-component vector of float)
+0:62          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:62          Constant:
 0:62            0 (const int)
 0:62        Constant:
@@ -277,15 +277,15 @@ gl_FragCoord origin is upper left
 0:62          1.000000
 0:63      move second child to first child (temp float)
 0:63        Depth: direct index for structure (temp float FragDepth)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            1 (const int)
 0:63        Constant:
 0:63          1.000000
 0:65      Sequence
-0:65        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:65          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:65          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:65        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -365,7 +365,6 @@ gl_FragCoord origin is upper left
                               Decorate 53(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 83(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 93(PS_OUTPUT) 0 Location 0
                               MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 109(g_tTex3df4) DescriptorSet 0
                               Decorate 112(g_tTex3di4) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
index ffcc6d7..b2dcaec 100644 (file)
--- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplecmplevelzero.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:68  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -114,8 +114,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:63      move second child to first child (temp 4-component vector of float)
-0:63        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63        Color: direct index for structure (temp 4-component vector of float)
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            0 (const int)
 0:63        Constant:
@@ -125,15 +125,15 @@ gl_FragCoord origin is upper left
 0:63          1.000000
 0:64      move second child to first child (temp float)
 0:64        Depth: direct index for structure (temp float FragDepth)
-0:64          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:64          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:64          Constant:
 0:64            1 (const int)
 0:64        Constant:
 0:64          1.000000
 0:66      Sequence
-0:66        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:66          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:66        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -166,7 +166,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:68  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:68  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38    Function Parameters: 
 0:?     Sequence
 0:42      Sequence
@@ -278,8 +278,8 @@ gl_FragCoord origin is upper left
 0:?               2 (const int)
 0:?               3 (const int)
 0:63      move second child to first child (temp 4-component vector of float)
-0:63        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:63          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:63        Color: direct index for structure (temp 4-component vector of float)
+0:63          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:63          Constant:
 0:63            0 (const int)
 0:63        Constant:
@@ -289,15 +289,15 @@ gl_FragCoord origin is upper left
 0:63          1.000000
 0:64      move second child to first child (temp float)
 0:64        Depth: direct index for structure (temp float FragDepth)
-0:64          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:64          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:64          Constant:
 0:64            1 (const int)
 0:64        Constant:
 0:64          1.000000
 0:66      Sequence
-0:66        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:66          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:66          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:66        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -376,7 +376,6 @@ gl_FragCoord origin is upper left
                               Decorate 59(g_tTex2df4a) DescriptorSet 0
                               Decorate 77(g_tTex2di4a) DescriptorSet 0
                               Decorate 89(g_tTex2du4a) DescriptorSet 0
-                              MemberDecorate 99(PS_OUTPUT) 0 Location 0
                               MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 115(g_tTex1df4) DescriptorSet 0
                               Decorate 115(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
index 49e6b72..f42074b 100644 (file)
--- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplegrad.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -159,8 +159,8 @@ gl_FragCoord origin is upper left
 0:?               1.200000
 0:?               1.300000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -170,15 +170,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -200,7 +200,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -357,8 +357,8 @@ gl_FragCoord origin is upper left
 0:?               1.200000
 0:?               1.300000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -368,15 +368,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -440,7 +440,6 @@ gl_FragCoord origin is upper left
                               Decorate 85(g_tTexcdf4) DescriptorSet 0
                               Decorate 98(g_tTexcdi4) DescriptorSet 0
                               Decorate 107(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 113(PS_OUTPUT) 0 Location 0
                               MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 127(g_tTex1df4a) DescriptorSet 0
                               Decorate 127(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
index 80be646..403bfca 100644 (file)
--- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplegrad.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:52  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -207,8 +207,8 @@ gl_FragCoord origin is upper left
 0:?               1.200000
 0:?               1.300000
 0:47      move second child to first child (temp 4-component vector of float)
-0:47        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        Color: direct index for structure (temp 4-component vector of float)
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47          Constant:
 0:47            0 (const int)
 0:47        Constant:
@@ -218,15 +218,15 @@ gl_FragCoord origin is upper left
 0:47          1.000000
 0:48      move second child to first child (temp float)
 0:48        Depth: direct index for structure (temp float FragDepth)
-0:48          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:48            1 (const int)
 0:48        Constant:
 0:48          1.000000
 0:50      Sequence
-0:50        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:50          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:50        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -251,7 +251,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:52  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:52  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -456,8 +456,8 @@ gl_FragCoord origin is upper left
 0:?               1.200000
 0:?               1.300000
 0:47      move second child to first child (temp 4-component vector of float)
-0:47        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:47          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:47        Color: direct index for structure (temp 4-component vector of float)
+0:47          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:47          Constant:
 0:47            0 (const int)
 0:47        Constant:
@@ -467,15 +467,15 @@ gl_FragCoord origin is upper left
 0:47          1.000000
 0:48      move second child to first child (temp float)
 0:48        Depth: direct index for structure (temp float FragDepth)
-0:48          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:48            1 (const int)
 0:48        Constant:
 0:48          1.000000
 0:50      Sequence
-0:50        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:50          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:50        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -550,7 +550,6 @@ gl_FragCoord origin is upper left
                               Decorate 124(g_tTexcdf4) DescriptorSet 0
                               Decorate 133(g_tTexcdi4) DescriptorSet 0
                               Decorate 142(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 148(PS_OUTPUT) 0 Location 0
                               MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 162(g_tTex1df4a) DescriptorSet 0
                               Decorate 162(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
index 732e731..f73d8cf 100644 (file)
--- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplegrad.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -177,8 +177,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -188,15 +188,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -221,7 +221,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -396,8 +396,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -407,15 +407,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -484,7 +484,6 @@ gl_FragCoord origin is upper left
                               Decorate 95(g_tTex3df4) DescriptorSet 0
                               Decorate 110(g_tTex3di4) DescriptorSet 0
                               Decorate 121(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 132(PS_OUTPUT) 0 Location 0
                               MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 144(g_tTex1df4a) DescriptorSet 0
                               Decorate 144(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
index 290296e..d6bc764 100644 (file)
--- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplegrad.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:40  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -114,8 +114,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               0 (const int)
 0:35      move second child to first child (temp 4-component vector of float)
-0:35        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:35          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35        Color: direct index for structure (temp 4-component vector of float)
+0:35          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:35          Constant:
 0:35            0 (const int)
 0:35        Constant:
@@ -125,15 +125,15 @@ gl_FragCoord origin is upper left
 0:35          1.000000
 0:36      move second child to first child (temp float)
 0:36        Depth: direct index for structure (temp float FragDepth)
-0:36          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:36            1 (const int)
 0:36        Constant:
 0:36          1.000000
 0:38      Sequence
-0:38        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:38          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -155,7 +155,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:40  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -267,8 +267,8 @@ gl_FragCoord origin is upper left
 0:?               1 (const int)
 0:?               0 (const int)
 0:35      move second child to first child (temp 4-component vector of float)
-0:35        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:35          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:35        Color: direct index for structure (temp 4-component vector of float)
+0:35          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:35          Constant:
 0:35            0 (const int)
 0:35        Constant:
@@ -278,15 +278,15 @@ gl_FragCoord origin is upper left
 0:35          1.000000
 0:36      move second child to first child (temp float)
 0:36        Depth: direct index for structure (temp float FragDepth)
-0:36          'psout' (temp structure{layout(location=0 ) 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          Constant:
 0:36            1 (const int)
 0:36        Constant:
 0:36          1.000000
 0:38      Sequence
-0:38        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:38          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:38        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -344,7 +344,6 @@ gl_FragCoord origin is upper left
                               Decorate 55(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 80(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 86(PS_OUTPUT) 0 Location 0
                               MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 98(g_tTex1df4a) DescriptorSet 0
                               Decorate 98(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
index b47e5e0..9ed0650 100644 (file)
--- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplelevel.array.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -123,8 +123,8 @@ gl_FragCoord origin is upper left
 0:37            Constant:
 0:37              0.750000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -134,15 +134,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -164,7 +164,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:44  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:44  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:24    Function Parameters: 
 0:?     Sequence
 0:27      Sequence
@@ -285,8 +285,8 @@ gl_FragCoord origin is upper left
 0:37            Constant:
 0:37              0.750000
 0:39      move second child to first child (temp 4-component vector of float)
-0:39        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:39          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:39        Color: direct index for structure (temp 4-component vector of float)
+0:39          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:39          Constant:
 0:39            0 (const int)
 0:39        Constant:
@@ -296,15 +296,15 @@ gl_FragCoord origin is upper left
 0:39          1.000000
 0:40      move second child to first child (temp float)
 0:40        Depth: direct index for structure (temp float FragDepth)
-0:40          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:40          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:40          Constant:
 0:40            1 (const int)
 0:40        Constant:
 0:40          1.000000
 0:42      Sequence
-0:42        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:42          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:42          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:42        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -368,7 +368,6 @@ gl_FragCoord origin is upper left
                               Decorate 91(g_tTexcdf4a) DescriptorSet 0
                               Decorate 101(g_tTexcdi4a) DescriptorSet 0
                               Decorate 111(g_tTexcdu4a) DescriptorSet 0
-                              MemberDecorate 121(PS_OUTPUT) 0 Location 0
                               MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 134(g_tTex1df4) DescriptorSet 0
                               Decorate 134(g_tTex1df4) Binding 0

diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
index f91f8c1..3867672 100644 (file)
--- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplelevel.basic.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:53  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:53  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:29    Function Parameters: 
 0:?     Sequence
 0:32      Sequence
@@ -153,8 +153,8 @@ gl_FragCoord origin is upper left
 0:46            Constant:
 0:46              0.750000
 0:48      move second child to first child (temp 4-component vector of float)
-0:48        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        Color: direct index for structure (temp 4-component vector of float)
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48          Constant:
 0:48            0 (const int)
 0:48        Constant:
@@ -164,15 +164,15 @@ gl_FragCoord origin is upper left
 0:48          1.000000
 0:49      move second child to first child (temp float)
 0:49        Depth: direct index for structure (temp float FragDepth)
-0:49          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:49          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:49          Constant:
 0:49            1 (const int)
 0:49        Constant:
 0:49          1.000000
 0:51      Sequence
-0:51        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:51          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:51        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -198,7 +198,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:53  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:53  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:29    Function Parameters: 
 0:?     Sequence
 0:32      Sequence
@@ -349,8 +349,8 @@ gl_FragCoord origin is upper left
 0:46            Constant:
 0:46              0.750000
 0:48      move second child to first child (temp 4-component vector of float)
-0:48        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        Color: direct index for structure (temp 4-component vector of float)
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48          Constant:
 0:48            0 (const int)
 0:48        Constant:
@@ -360,15 +360,15 @@ gl_FragCoord origin is upper left
 0:48          1.000000
 0:49      move second child to first child (temp float)
 0:49        Depth: direct index for structure (temp float FragDepth)
-0:49          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:49          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:49          Constant:
 0:49            1 (const int)
 0:49        Constant:
 0:49          1.000000
 0:51      Sequence
-0:51        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:51          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:51          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:51        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -445,7 +445,6 @@ gl_FragCoord origin is upper left
                               Decorate 120(g_tTexcdf4) DescriptorSet 0
                               Decorate 129(g_tTexcdi4) DescriptorSet 0
                               Decorate 138(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 144(PS_OUTPUT) 0 Location 0
                               MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 158(g_sSamp2d) DescriptorSet 0
                               Decorate 159(g_tTex1df4a) DescriptorSet 0

diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
index ddda3b3..2dc61c7 100644 (file)
--- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplelevel.offset.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -141,8 +141,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -152,15 +152,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -185,7 +185,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:50  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:50  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:28    Function Parameters: 
 0:?     Sequence
 0:31      Sequence
@@ -324,8 +324,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               -1 (const int)
 0:45      move second child to first child (temp 4-component vector of float)
-0:45        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:45          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:45        Color: direct index for structure (temp 4-component vector of float)
+0:45          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:45          Constant:
 0:45            0 (const int)
 0:45        Constant:
@@ -335,15 +335,15 @@ gl_FragCoord origin is upper left
 0:45          1.000000
 0:46      move second child to first child (temp float)
 0:46        Depth: direct index for structure (temp float FragDepth)
-0:46          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:46          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:46          Constant:
 0:46            1 (const int)
 0:46        Constant:
 0:46          1.000000
 0:48      Sequence
-0:48        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:48          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:48          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:48        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -412,7 +412,6 @@ gl_FragCoord origin is upper left
                               Decorate 93(g_tTex3df4) DescriptorSet 0
                               Decorate 106(g_tTex3di4) DescriptorSet 0
                               Decorate 117(g_tTex3du4) DescriptorSet 0
-                              MemberDecorate 128(PS_OUTPUT) 0 Location 0
                               MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 140(g_tTex1df4a) DescriptorSet 0
                               Decorate 140(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
index 69b6544..bc3c4ae 100644 (file)
--- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
@@ -2,7 +2,7 @@ hlsl.samplelevel.offsetarray.dx10.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -96,8 +96,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -107,15 +107,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -134,7 +134,7 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:38  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:38  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:20    Function Parameters: 
 0:?     Sequence
 0:23      Sequence
@@ -228,8 +228,8 @@ gl_FragCoord origin is upper left
 0:?               0 (const int)
 0:?               1 (const int)
 0:33      move second child to first child (temp 4-component vector of float)
-0:33        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:33          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:33        Color: direct index for structure (temp 4-component vector of float)
+0:33          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:33          Constant:
 0:33            0 (const int)
 0:33        Constant:
@@ -239,15 +239,15 @@ gl_FragCoord origin is upper left
 0:33          1.000000
 0:34      move second child to first child (temp float)
 0:34        Depth: direct index for structure (temp float FragDepth)
-0:34          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:34          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:34          Constant:
 0:34            1 (const int)
 0:34        Constant:
 0:34          1.000000
 0:36      Sequence
-0:36        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
-0:36          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36        move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:36          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
 0:36        Branch: Return
 0:?   Linker Objects
 0:?     'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -298,7 +298,6 @@ gl_FragCoord origin is upper left
                               Decorate 60(g_tTex2df4) DescriptorSet 0
                               Decorate 73(g_tTex2di4) DescriptorSet 0
                               Decorate 84(g_tTex2du4) DescriptorSet 0
-                              MemberDecorate 94(PS_OUTPUT) 0 Location 0
                               MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 106(g_tTex1df4a) DescriptorSet 0
                               Decorate 106(g_tTex1df4a) Binding 1

diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out
index ce7ae91..470556e 100644 (file)
--- a/Test/baseResults/hlsl.semicolons.frag.out
+++ b/Test/baseResults/hlsl.semicolons.frag.out
@@ -6,12 +6,12 @@ gl_FragCoord origin is upper left
 0:2    Function Parameters: 
 0:8  Function Definition: MyFunc2( (global void)
 0:8    Function Parameters: 
-0:18  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:18  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:13    Function Parameters: 
 0:?     Sequence
 0:16      move second child to first child (temp 4-component vector of float)
-0:16        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:16          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:16        color: direct index for structure (temp 4-component vector of float)
+0:16          'ps_output' (temp structure{temp 4-component vector of float color})
 0:16          Constant:
 0:16            0 (const int)
 0:16        Constant:
@@ -20,9 +20,9 @@ gl_FragCoord origin is upper left
 0:16          1.000000
 0:16          1.000000
 0:17      Sequence
-0:17        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:17          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:17        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:17          'ps_output' (temp structure{temp 4-component vector of float color})
 0:17        Branch: Return
 0:?   Linker Objects
 
@@ -37,12 +37,12 @@ gl_FragCoord origin is upper left
 0:2    Function Parameters: 
 0:8  Function Definition: MyFunc2( (global void)
 0:8    Function Parameters: 
-0:18  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
+0:18  Function Definition: main( (global structure{temp 4-component vector of float color})
 0:13    Function Parameters: 
 0:?     Sequence
 0:16      move second child to first child (temp 4-component vector of float)
-0:16        color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:16          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:16        color: direct index for structure (temp 4-component vector of float)
+0:16          'ps_output' (temp structure{temp 4-component vector of float color})
 0:16          Constant:
 0:16            0 (const int)
 0:16        Constant:
@@ -51,9 +51,9 @@ gl_FragCoord origin is upper left
 0:16          1.000000
 0:16          1.000000
 0:17      Sequence
-0:17        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
-0:17          'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
+0:17        move second child to first child (temp structure{temp 4-component vector of float color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float color})
+0:17          'ps_output' (temp structure{temp 4-component vector of float color})
 0:17        Branch: Return
 0:?   Linker Objects
 
@@ -73,7 +73,6 @@ gl_FragCoord origin is upper left
                               MemberName 12(PS_OUTPUT) 0  "color"
                               Name 14  "ps_output"
                               Name 22  "@entryPointOutput"
-                              MemberDecorate 12(PS_OUTPUT) 0 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
               10:             TypeFloat 32

diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out
index 16e1fba..e5fbf65 100644 (file)
--- a/Test/baseResults/hlsl.stringtoken.frag.out
+++ b/Test/baseResults/hlsl.stringtoken.frag.out
@@ -2,12 +2,12 @@ hlsl.stringtoken.frag
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:21  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
+0:21  Function Definition: main( (global structure{temp 4-component vector of float Color})
 0:16    Function Parameters: 
 0:?     Sequence
 0:18      move second child to first child (temp 4-component vector of float)
-0:18        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:18          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:18        Color: direct index for structure (temp 4-component vector of float)
+0:18          'psout' (temp structure{temp 4-component vector of float Color})
 0:18          Constant:
 0:18            0 (const int)
 0:?         Constant:
@@ -16,9 +16,9 @@ gl_FragCoord origin is upper left
 0:?           0.000000
 0:?           1.000000
 0:19      Sequence
-0:19        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color})
-0:19          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:19        move second child to first child (temp structure{temp 4-component vector of float Color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color})
+0:19          'psout' (temp structure{temp 4-component vector of float Color})
 0:19        Branch: Return
 0:?   Linker Objects
 0:?     'TestTexture' (uniform texture2D)
@@ -31,12 +31,12 @@ Linked fragment stage:
 Shader version: 450
 gl_FragCoord origin is upper left
 0:? Sequence
-0:21  Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
+0:21  Function Definition: main( (global structure{temp 4-component vector of float Color})
 0:16    Function Parameters: 
 0:?     Sequence
 0:18      move second child to first child (temp 4-component vector of float)
-0:18        Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
-0:18          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:18        Color: direct index for structure (temp 4-component vector of float)
+0:18          'psout' (temp structure{temp 4-component vector of float Color})
 0:18          Constant:
 0:18            0 (const int)
 0:?         Constant:
@@ -45,9 +45,9 @@ gl_FragCoord origin is upper left
 0:?           0.000000
 0:?           1.000000
 0:19      Sequence
-0:19        move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color})
-0:?           '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color})
-0:19          'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
+0:19        move second child to first child (temp structure{temp 4-component vector of float Color})
+0:?           '@entryPointOutput' (out structure{temp 4-component vector of float Color})
+0:19          'psout' (temp structure{temp 4-component vector of float Color})
 0:19        Branch: Return
 0:?   Linker Objects
 0:?     'TestTexture' (uniform texture2D)
@@ -69,7 +69,6 @@ gl_FragCoord origin is upper left
                               Name 19  "@entryPointOutput"
                               Name 24  "TestTexture"
                               Name 26  "TestUF"
-                              MemberDecorate 8(PS_OUTPUT) 0 Location 0
                               Decorate 24(TestTexture) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2

diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
index fdb0d34..297730e 100644 (file)
--- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
@@ -30,7 +30,6 @@ Linked fragment stage:
                               Decorate 3789 DescriptorSet 0
                               Decorate 3805 DescriptorSet 0
                               Decorate 3869 DescriptorSet 0
-                              MemberDecorate 1032 0 Location 0
                               MemberDecorate 1032 1 BuiltIn FragDepth
                8:             TypeVoid
             1282:             TypeFunction 8

diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
index db03ad9..fe4d1b0 100644 (file)
--- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
@@ -78,7 +78,6 @@ Linked fragment stage:
                               Decorate 147(g_tTexcdf4) DescriptorSet 0
                               Decorate 156(g_tTexcdi4) DescriptorSet 0
                               Decorate 165(g_tTexcdu4) DescriptorSet 0
-                              MemberDecorate 171(PS_OUTPUT) 0 Location 0
                               MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
                               Decorate 182(g_sSamp2d) DescriptorSet 0
                               Decorate 183(g_sSamp2D_b) DescriptorSet 0

diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
index fe865a1..d7f3003 100644 (file)
--- a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
@@ -30,7 +30,6 @@ Linked fragment stage:
                               Decorate 147 DescriptorSet 0
                               Decorate 156 DescriptorSet 0
                               Decorate 165 DescriptorSet 0
-                              MemberDecorate 171 0 Location 0
                               MemberDecorate 171 1 BuiltIn FragDepth
                               Decorate 182 DescriptorSet 0
                               Decorate 183 DescriptorSet 0

diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 31e43ca..2248b47 100644 (file)
--- 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.1452"
+#define GLSLANG_REVISION "Overload400-PrecQual.1453"
 #define GLSLANG_DATE "29-Aug-2016"

diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index 02ff514..9f957a6 100755 (executable)
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -2343,31 +2343,31 @@ void HlslParseContext::handleSemantic(TSourceLoc loc, TType& type, const TString
     //Targets are defined 0-7
     else if (semanticUpperCase == "SV_TARGET") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 0;
+        //type.getQualifier().layoutLocation = 0;
     } else if (semanticUpperCase == "SV_TARGET0") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 0;
+        //type.getQualifier().layoutLocation = 0;
     } else if (semanticUpperCase == "SV_TARGET1") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 1;
+        //type.getQualifier().layoutLocation = 1;
     } else if (semanticUpperCase == "SV_TARGET2") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 2;
+        //type.getQualifier().layoutLocation = 2;
     } else if (semanticUpperCase == "SV_TARGET3") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 3;
+        //type.getQualifier().layoutLocation = 3;
     } else if (semanticUpperCase == "SV_TARGET4") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 4;
+        //type.getQualifier().layoutLocation = 4;
     } else if (semanticUpperCase == "SV_TARGET5") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 5;
+        //type.getQualifier().layoutLocation = 5;
     } else if (semanticUpperCase == "SV_TARGET6") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 6;
+        //type.getQualifier().layoutLocation = 6;
     } else if (semanticUpperCase == "SV_TARGET7") {
         type.getQualifier().builtIn = EbvNone;
-        type.getQualifier().layoutLocation = 7;
+        //type.getQualifier().layoutLocation = 7;
     } else if (semanticUpperCase == "SV_SAMPLEINDEX")
         type.getQualifier().builtIn = EbvSampleId;
     else if (semanticUpperCase == "SV_RENDERTARGETARRAYINDEX")