diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out index bcd28d3f..feb5c753 100755 --- a/Test/baseResults/hlsl.array.frag.out +++ b/Test/baseResults/hlsl.array.frag.out @@ -49,6 +49,9 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'a' (global 4-element array of 4-component vector of float) 0:? 's' (global 11-element array of structure{temp 7-element array of 4-component vector of float m}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'i' (layout(location=0 ) in int) +0:? 'input' (layout(location=1 ) in 3-element array of 4-component vector of float) Linked fragment stage: @@ -104,6 +107,9 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'a' (global 4-element array of 4-component vector of float) 0:? 's' (global 11-element array of structure{temp 7-element array of 4-component vector of float m}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'i' (layout(location=0 ) in int) +0:? 'input' (layout(location=1 ) in 3-element array of 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.assoc.frag.out b/Test/baseResults/hlsl.assoc.frag.out index a99be597..883aac26 100755 --- a/Test/baseResults/hlsl.assoc.frag.out +++ b/Test/baseResults/hlsl.assoc.frag.out @@ -33,6 +33,12 @@ gl_FragCoord origin is upper left 0:10 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'a1' (layout(location=0 ) in 4-component vector of float) +0:? 'a2' (layout(location=1 ) in 4-component vector of float) +0:? 'a3' (layout(location=2 ) in 4-component vector of float) +0:? 'a4' (layout(location=3 ) in 4-component vector of float) +0:? 'a5' (layout(location=4 ) in 4-component vector of float) Linked fragment stage: @@ -72,6 +78,12 @@ gl_FragCoord origin is upper left 0:10 'a5' (layout(location=4 ) in 4-component vector of float) 0:10 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'a1' (layout(location=0 ) in 4-component vector of float) +0:? 'a2' (layout(location=1 ) in 4-component vector of float) +0:? 'a3' (layout(location=2 ) in 4-component vector of float) +0:? 'a4' (layout(location=3 ) in 4-component vector of float) +0:? 'a5' (layout(location=4 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.attribute.frag.out b/Test/baseResults/hlsl.attribute.frag.out index efcc643f..38421a88 100755 --- a/Test/baseResults/hlsl.attribute.frag.out +++ b/Test/baseResults/hlsl.attribute.frag.out @@ -12,6 +12,7 @@ gl_FragCoord origin is upper left 0:11 0 (const int) 0:11 true case is null 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -30,21 +31,28 @@ gl_FragCoord origin is upper left 0:11 0 (const int) 0:11 true case is null 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 10 +// Id's are bound by 14 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "PixelShaderFunction" + EntryPoint Fragment 4 "PixelShaderFunction" 13 ExecutionMode 4 OriginUpperLeft Name 4 "PixelShaderFunction" + Name 13 "input" + Decorate 13(input) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 7: 6(int) Constant 0 + 10: TypeFloat 32 + 11: TypeVector 10(float) 4 + 12: TypePointer Input 11(fvec4) + 13(input): 12(ptr) Variable Input 4(PixelShaderFunction): 2 Function None 3 5: Label SelectionMerge 9 None diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out index 79b8acd4..2f3d1b87 100755 --- a/Test/baseResults/hlsl.buffer.frag.out +++ b/Test/baseResults/hlsl.buffer.frag.out @@ -36,6 +36,8 @@ gl_FragCoord origin is upper left 0:? 'anon@1' (layout(column_major std430 ) buffer block{layout(column_major std430 ) buffer 4-component vector of float v2}) 0:? 'anon@2' (layout(set=10 binding=2 column_major std140 ) uniform block{layout(column_major std140 ) uniform 4-component vector of float v3, layout(column_major std140 offset=20 ) uniform int i3}) 0:? 'anon@3' (layout(binding=8 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v4, layout(column_major std430 offset=48 ) buffer int i4, layout(column_major std430 offset=60 ) buffer float f1, layout(column_major std430 offset=64 ) buffer float f3, layout(column_major std430 offset=68 ) buffer float f4, layout(column_major std430 offset=72 ) buffer float f5, layout(column_major std430 ) buffer float f6, layout(column_major std430 ) buffer float f7}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -78,6 +80,8 @@ gl_FragCoord origin is upper left 0:? 'anon@1' (layout(column_major std430 ) buffer block{layout(column_major std430 ) buffer 4-component vector of float v2}) 0:? 'anon@2' (layout(set=10 binding=2 column_major std140 ) uniform block{layout(column_major std140 ) uniform 4-component vector of float v3, layout(column_major std140 offset=20 ) uniform int i3}) 0:? 'anon@3' (layout(binding=8 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v4, layout(column_major std430 offset=48 ) buffer int i4, layout(column_major std430 offset=60 ) buffer float f1, layout(column_major std430 offset=64 ) buffer float f3, layout(column_major std430 offset=68 ) buffer float f4, layout(column_major std430 offset=72 ) buffer float f5, layout(column_major std430 ) buffer float f6, layout(column_major std430 ) buffer float f7}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index f11dd281..83aec993 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -156,6 +156,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -318,6 +319,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index e9b3c0cf..05b7a58e 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -168,6 +168,7 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -330,5 +331,6 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.cast.frag.out b/Test/baseResults/hlsl.cast.frag.out index 21edaf12..c64e23a1 100755 --- a/Test/baseResults/hlsl.cast.frag.out +++ b/Test/baseResults/hlsl.cast.frag.out @@ -23,6 +23,8 @@ gl_FragCoord origin is upper left 0:3 1.198000 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -52,6 +54,8 @@ gl_FragCoord origin is upper left 0:3 1.198000 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out index 8694b1dc..c5723222 100755 --- a/Test/baseResults/hlsl.conditional.frag.out +++ b/Test/baseResults/hlsl.conditional.frag.out @@ -109,6 +109,8 @@ gl_FragCoord origin is upper left 0:15 'f' (temp 4-component vector of float) 0:15 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -224,6 +226,8 @@ gl_FragCoord origin is upper left 0:15 'f' (temp 4-component vector of float) 0:15 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out index 31e013cc..4c013b00 100644 --- a/Test/baseResults/hlsl.constructexpr.frag.out +++ b/Test/baseResults/hlsl.constructexpr.frag.out @@ -40,6 +40,7 @@ gl_FragCoord origin is upper left 0:16 'ps_output' (temp structure{temp 4-component vector of float color}) 0:16 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) Linked fragment stage: @@ -86,6 +87,7 @@ gl_FragCoord origin is upper left 0:16 'ps_output' (temp structure{temp 4-component vector of float color}) 0:16 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.depthGreater.frag.out b/Test/baseResults/hlsl.depthGreater.frag.out index cfd819b7..6a44a2f9 100755 --- a/Test/baseResults/hlsl.depthGreater.frag.out +++ b/Test/baseResults/hlsl.depthGreater.frag.out @@ -12,6 +12,7 @@ using depth_greater 0:3 Constant: 0:3 0.200000 0:? Linker Objects +0:? 'depth' (out float FragDepth) Linked fragment stage: @@ -30,6 +31,7 @@ using depth_greater 0:3 Constant: 0:3 0.200000 0:? Linker Objects +0:? 'depth' (out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.depthLess.frag.out b/Test/baseResults/hlsl.depthLess.frag.out index 66231b3c..b1307ce2 100755 --- a/Test/baseResults/hlsl.depthLess.frag.out +++ b/Test/baseResults/hlsl.depthLess.frag.out @@ -13,6 +13,7 @@ using depth_less 0:3 0.200000 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float unknown built-in variable) Linked fragment stage: @@ -32,6 +33,7 @@ using depth_less 0:3 0.200000 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float unknown built-in variable) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.discard.frag.out b/Test/baseResults/hlsl.discard.frag.out index 463ae5bb..9601c7d1 100755 --- a/Test/baseResults/hlsl.discard.frag.out +++ b/Test/baseResults/hlsl.discard.frag.out @@ -40,6 +40,7 @@ gl_FragCoord origin is upper left 0:12 0 (const int) 0:13 Branch: Kill 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -86,6 +87,7 @@ gl_FragCoord origin is upper left 0:12 0 (const int) 0:13 Branch: Kill 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out index b13e8d15..315fc2e9 100755 --- a/Test/baseResults/hlsl.doLoop.frag.out +++ b/Test/baseResults/hlsl.doLoop.frag.out @@ -28,6 +28,8 @@ gl_FragCoord origin is upper left 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -62,6 +64,8 @@ gl_FragCoord origin is upper left 0:5 'input' (layout(location=0 ) in 4-component vector of float) 0:5 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out index 015136ee..872d738c 100755 --- a/Test/baseResults/hlsl.entry-out.frag.out +++ b/Test/baseResults/hlsl.entry-out.frag.out @@ -27,6 +27,11 @@ gl_FragCoord origin is upper left 0:11 'out1' (layout(location=1 ) out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) +0:? 'out1' (layout(location=1 ) out 4-component vector of float) +0:? 'v' (layout(location=2 ) out 2-component vector of float) +0:? 'i' (layout(location=3 ) out 2-component vector of int) Linked fragment stage: @@ -60,6 +65,11 @@ gl_FragCoord origin is upper left 0:11 'out1' (layout(location=1 ) out 4-component vector of float) 0:11 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) +0:? 'out1' (layout(location=1 ) out 4-component vector of float) +0:? 'v' (layout(location=2 ) out 2-component vector of float) +0:? 'i' (layout(location=3 ) out 2-component vector of int) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out index ca0cf5aa..5be0720c 100755 --- a/Test/baseResults/hlsl.forLoop.frag.out +++ b/Test/baseResults/hlsl.forLoop.frag.out @@ -114,6 +114,8 @@ gl_FragCoord origin is upper left 0:12 Pre-Decrement (temp float) 0:12 'ii' (temp float) 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -234,6 +236,8 @@ gl_FragCoord origin is upper left 0:12 Pre-Decrement (temp float) 0:12 'ii' (temp float) 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index ca195e84..e8c20f09 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -108,6 +108,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -222,6 +223,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index 0b0a2773..d5be71be 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -106,6 +106,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -218,6 +219,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 0573bdfe..bec800c0 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -98,6 +98,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) Linked vertex stage: @@ -202,6 +203,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index 75ac976c..e16f76cb 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -81,6 +81,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -168,6 +169,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 3a0e637c..b98c1dfc 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -78,6 +78,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -162,6 +163,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index d85f20bc..ee448860 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -283,6 +283,7 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -572,6 +573,7 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 83992d55..15defeba 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -287,6 +287,7 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -580,6 +581,7 @@ gl_FragCoord origin is upper left 0:? 'c2' (uniform 2-component vector of float) 0:? 'c3' (uniform 3-component vector of float) 0:? 'c4' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index 9b2ab967..6c1cee2b 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -363,6 +363,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -732,6 +733,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index acba726b..547f1194 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -359,6 +359,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -724,6 +725,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index ffd42faa..278fa6fd 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1094,6 +1094,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' (uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' (uniform utexture2DMSArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -2194,6 +2195,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' (uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' (uniform utexture2DMSArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index d98bb60b..c8a10643 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -44,6 +44,7 @@ Shader version: 450 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) Linked vertex stage: @@ -94,6 +95,7 @@ Shader version: 450 0:? Linker Objects 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index 9ada2a38..ac5ee6b2 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -52,6 +52,7 @@ ERROR: node is still EOpNull! 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -105,5 +106,6 @@ ERROR: node is still EOpNull! 0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out index d29cdb1b..d9e9fa58 100755 --- a/Test/baseResults/hlsl.if.frag.out +++ b/Test/baseResults/hlsl.if.frag.out @@ -93,6 +93,8 @@ gl_FragCoord origin is upper left 0:32 Pre-Increment (temp int) 0:32 'ii' (temp int) 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -192,6 +194,8 @@ gl_FragCoord origin is upper left 0:32 Pre-Increment (temp int) 0:32 'ii' (temp int) 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out index 65dae396..e6b24c3f 100755 --- a/Test/baseResults/hlsl.init.frag.out +++ b/Test/baseResults/hlsl.init.frag.out @@ -150,6 +150,8 @@ gl_FragCoord origin is upper left 0:? 'single2' (global structure{temp 2-component vector of uint v}) 0:? 'single3' (global structure{temp structure{temp int f} s1}) 0:? 'single4' (global structure{temp structure{temp 2-component vector of uint v} s1}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -306,6 +308,8 @@ gl_FragCoord origin is upper left 0:? 'single2' (global structure{temp 2-component vector of uint v}) 0:? 'single3' (global structure{temp structure{temp int f} s1}) 0:? 'single4' (global structure{temp structure{temp 2-component vector of uint v} s1}) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out index d3721ec0..6b8e95ca 100644 --- a/Test/baseResults/hlsl.init2.frag.out +++ b/Test/baseResults/hlsl.init2.frag.out @@ -49,6 +49,7 @@ gl_FragCoord origin is upper left 0:31 'ps_output' (temp structure{temp 4-component vector of float color}) 0:31 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) Linked fragment stage: @@ -104,6 +105,7 @@ gl_FragCoord origin is upper left 0:31 'ps_output' (temp structure{temp 4-component vector of float color}) 0:31 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index 175dd0cd..4e974927 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -61,6 +61,8 @@ gl_FragCoord origin is upper left 0:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'inpos' (noperspective in 4-component vector of float FragCoord) Linked fragment stage: @@ -128,6 +130,8 @@ gl_FragCoord origin is upper left 0:24 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:24 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) +0:? 'inpos' (noperspective in 4-component vector of float FragCoord) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out index 3a1342c7..82a64477 100644 --- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out +++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out @@ -18,6 +18,7 @@ local_size = (1, 1, 1) 0:11 0.000000 0:11 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) Linked compute stage: @@ -42,6 +43,7 @@ local_size = (1, 1, 1) 0:11 0.000000 0:11 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.comp.out b/Test/baseResults/hlsl.intrinsics.comp.out index 62337a99..cbf47118 100644 --- a/Test/baseResults/hlsl.intrinsics.comp.out +++ b/Test/baseResults/hlsl.intrinsics.comp.out @@ -321,6 +321,12 @@ local_size = (1, 1, 1) 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inU0' (layout(location=3 ) in 4-component vector of uint) +0:? 'inU1' (layout(location=4 ) in 4-component vector of uint) Linked compute stage: @@ -648,15 +654,21 @@ local_size = (1, 1, 1) 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inU0' (layout(location=3 ) in 4-component vector of uint) +0:? 'inU1' (layout(location=4 ) in 4-component vector of uint) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 219 +// Id's are bound by 224 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint GLCompute 4 "ComputeShaderFunction" 175 215 + EntryPoint GLCompute 4 "ComputeShaderFunction" 175 215 219 220 222 223 ExecutionMode 4 LocalSize 1 1 1 Name 4 "ComputeShaderFunction" Name 16 "ComputeShaderFunctionS(f1;f1;f1;u1;u1;" @@ -699,8 +711,16 @@ local_size = (1, 1, 1) Name 185 "out_u4" Name 193 "gs_uc4" Name 215 "@entryPointOutput" + Name 219 "inF1" + Name 220 "inF2" + Name 222 "inU0" + Name 223 "inU1" Decorate 175(inF0) Location 0 Decorate 215(@entryPointOutput) Location 0 + Decorate 219(inF1) Location 1 + Decorate 220(inF2) Location 2 + Decorate 222(inU0) Location 3 + Decorate 223(inU1) Location 4 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -753,6 +773,11 @@ local_size = (1, 1, 1) 215(@entryPointOutput): 214(ptr) Variable Output 216: 6(float) Constant 1082130432 217: 173(fvec4) ConstantComposite 128 129 169 216 + 219(inF1): 174(ptr) Variable Input + 220(inF2): 174(ptr) Variable Input + 221: TypePointer Input 178(ivec4) + 222(inU0): 221(ptr) Variable Input + 223(inU1): 221(ptr) Variable Input 4(ComputeShaderFunction): 2 Function None 3 5: Label 185(out_u4): 184(ptr) Variable Function diff --git a/Test/baseResults/hlsl.intrinsics.double.frag.out b/Test/baseResults/hlsl.intrinsics.double.frag.out index c6a812cf..a5ace7e8 100644 --- a/Test/baseResults/hlsl.intrinsics.double.frag.out +++ b/Test/baseResults/hlsl.intrinsics.double.frag.out @@ -34,6 +34,15 @@ gl_FragCoord origin is upper left 0:9 0.000000 0:9 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) +0:? 'inDV1a' (layout(location=0 ) in double) +0:? 'inDV1b' (layout(location=1 ) in double) +0:? 'inDV1c' (layout(location=2 ) in double) +0:? 'inDV2' (layout(location=3 ) in 2-component vector of double) +0:? 'inDV3' (layout(location=4 ) in 3-component vector of double) +0:? 'inDV4' (layout(location=6 ) in 4-component vector of double) +0:? 'inU1a' (layout(location=8 ) in uint) +0:? 'inU1b' (layout(location=9 ) in uint) Linked fragment stage: @@ -74,16 +83,25 @@ gl_FragCoord origin is upper left 0:9 0.000000 0:9 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) +0:? 'inDV1a' (layout(location=0 ) in double) +0:? 'inDV1b' (layout(location=1 ) in double) +0:? 'inDV1c' (layout(location=2 ) in double) +0:? 'inDV2' (layout(location=3 ) in 2-component vector of double) +0:? 'inDV3' (layout(location=4 ) in 3-component vector of double) +0:? 'inDV4' (layout(location=6 ) in 4-component vector of double) +0:? 'inU1a' (layout(location=8 ) in uint) +0:? 'inU1b' (layout(location=9 ) in uint) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 32 +// Id's are bound by 41 Capability Shader Capability Float64 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "PixelShaderFunction" 10 12 14 20 22 29 + EntryPoint Fragment 4 "PixelShaderFunction" 10 12 14 20 22 29 34 37 40 ExecutionMode 4 OriginUpperLeft Name 4 "PixelShaderFunction" Name 8 "r00" @@ -94,12 +112,18 @@ gl_FragCoord origin is upper left Name 20 "inU1a" Name 22 "inU1b" Name 29 "@entryPointOutput" + Name 34 "inDV2" + Name 37 "inDV3" + Name 40 "inDV4" Decorate 10(inDV1a) Location 0 Decorate 12(inDV1b) Location 1 Decorate 14(inDV1c) Location 2 Decorate 20(inU1a) Location 8 Decorate 22(inU1b) Location 9 Decorate 29(@entryPointOutput) Location 0 + Decorate 34(inDV2) Location 3 + Decorate 37(inDV3) Location 4 + Decorate 40(inDV4) Location 6 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 64 @@ -117,6 +141,15 @@ gl_FragCoord origin is upper left 28: TypePointer Output 27(float) 29(@entryPointOutput): 28(ptr) Variable Output 30: 27(float) Constant 0 + 32: TypeVector 6(float) 2 + 33: TypePointer Input 32(fvec2) + 34(inDV2): 33(ptr) Variable Input + 35: TypeVector 6(float) 3 + 36: TypePointer Input 35(fvec3) + 37(inDV3): 36(ptr) Variable Input + 38: TypeVector 6(float) 4 + 39: TypePointer Input 38(fvec4) + 40(inDV4): 39(ptr) Variable Input 4(PixelShaderFunction): 2 Function None 3 5: Label 8(r00): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out index 4b3b58d6..a23a8833 100644 --- a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out +++ b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out @@ -44,6 +44,11 @@ gl_FragCoord origin is upper left 0:9 Constant: 0:9 0.062500 0:? Linker Objects +0:? 'inF1' (layout(location=0 ) in float) +0:? 'inF2' (layout(location=1 ) in 2-component vector of float) +0:? 'inF3' (layout(location=2 ) in 3-component vector of float) +0:? 'inF4' (layout(location=3 ) in 4-component vector of float) +0:? 'inI2' (layout(location=4 ) in 2-component vector of int) Linked fragment stage: @@ -94,6 +99,11 @@ gl_FragCoord origin is upper left 0:9 Constant: 0:9 0.062500 0:? Linker Objects +0:? 'inF1' (layout(location=0 ) in float) +0:? 'inF2' (layout(location=1 ) in 2-component vector of float) +0:? 'inF3' (layout(location=2 ) in 3-component vector of float) +0:? 'inF4' (layout(location=3 ) in 4-component vector of float) +0:? 'inI2' (layout(location=4 ) in 2-component vector of int) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.f1632.frag.out b/Test/baseResults/hlsl.intrinsics.f1632.frag.out index 85e38391..aae3cedc 100644 --- a/Test/baseResults/hlsl.intrinsics.f1632.frag.out +++ b/Test/baseResults/hlsl.intrinsics.f1632.frag.out @@ -66,6 +66,8 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:32 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -131,5 +133,7 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:32 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out index 23297e9c..562cdcd9 100644 --- a/Test/baseResults/hlsl.intrinsics.frag.out +++ b/Test/baseResults/hlsl.intrinsics.frag.out @@ -2790,6 +2790,7 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) Linked fragment stage: @@ -5586,6 +5587,7 @@ gl_FragCoord origin is upper left 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.lit.frag.out b/Test/baseResults/hlsl.intrinsics.lit.frag.out index 506f6147..eb3cee7d 100644 --- a/Test/baseResults/hlsl.intrinsics.lit.frag.out +++ b/Test/baseResults/hlsl.intrinsics.lit.frag.out @@ -36,6 +36,9 @@ gl_FragCoord origin is upper left 0:3 Constant: 0:3 1.000000 0:? Linker Objects +0:? 'n_dot_l' (layout(location=0 ) in float) +0:? 'n_dot_h' (layout(location=1 ) in float) +0:? 'm' (layout(location=2 ) in float) Linked fragment stage: @@ -78,6 +81,9 @@ gl_FragCoord origin is upper left 0:3 Constant: 0:3 1.000000 0:? Linker Objects +0:? 'n_dot_l' (layout(location=0 ) in float) +0:? 'n_dot_h' (layout(location=1 ) in float) +0:? 'm' (layout(location=2 ) in float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out index d8ca8b07..75bdbf6c 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.comp.out +++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out @@ -62,6 +62,11 @@ local_size = (1, 1, 1) 0:? 4.000000 0:199 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) Linked compute stage: @@ -130,15 +135,20 @@ local_size = (1, 1, 1) 0:? 4.000000 0:199 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 65 +// Id's are bound by 72 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint GLCompute 4 "ComputeShaderFunction" 61 + EntryPoint GLCompute 4 "ComputeShaderFunction" 61 66 67 68 71 ExecutionMode 4 LocalSize 1 1 1 Name 4 "ComputeShaderFunction" Name 15 "ComputeShaderFunctionS(f1;f1;f1;i1;" @@ -162,7 +172,15 @@ local_size = (1, 1, 1) Name 41 "inF2" Name 42 "inI0" Name 61 "@entryPointOutput" + Name 66 "inF0" + Name 67 "inF1" + Name 68 "inF2" + Name 71 "inI0" Decorate 61(@entryPointOutput) Location 0 + Decorate 66(inF0) Location 0 + Decorate 67(inF1) Location 1 + Decorate 68(inF2) Location 2 + Decorate 71(inI0) Location 3 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -191,6 +209,13 @@ local_size = (1, 1, 1) 61(@entryPointOutput): 60(ptr) Variable Output 62: 6(float) Constant 1082130432 63: 59(fvec4) ConstantComposite 50 51 55 62 + 65: TypePointer Input 59(fvec4) + 66(inF0): 65(ptr) Variable Input + 67(inF1): 65(ptr) Variable Input + 68(inF2): 65(ptr) Variable Input + 69: TypeVector 8(int) 4 + 70: TypePointer Input 69(ivec4) + 71(inI0): 70(ptr) Variable Input 4(ComputeShaderFunction): 2 Function None 3 5: Label Store 61(@entryPointOutput) 63 diff --git a/Test/baseResults/hlsl.intrinsics.negative.frag.out b/Test/baseResults/hlsl.intrinsics.negative.frag.out index ff8775a3..28526950 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.frag.out +++ b/Test/baseResults/hlsl.intrinsics.negative.frag.out @@ -408,6 +408,11 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:? 4.000000 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) Linked fragment stage: @@ -759,5 +764,10 @@ ERROR: node is still EOpNull! 0:? 4.000000 0:? 4.000000 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out index 364a3eb0..a9b2bbc5 100644 --- a/Test/baseResults/hlsl.intrinsics.negative.vert.out +++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out @@ -126,6 +126,11 @@ Shader version: 450 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) Linked vertex stage: @@ -258,15 +263,20 @@ Shader version: 450 0:? 'gs_ua4' (global 4-component vector of uint) 0:? 'gs_ub4' (global 4-component vector of uint) 0:? 'gs_uc4' (global 4-component vector of uint) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'inF0' (layout(location=0 ) in 4-component vector of float) +0:? 'inF1' (layout(location=1 ) in 4-component vector of float) +0:? 'inF2' (layout(location=2 ) in 4-component vector of float) +0:? 'inI0' (layout(location=3 ) in 4-component vector of int) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 121 +// Id's are bound by 128 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "VertexShaderFunction" 85 + EntryPoint Vertex 4 "VertexShaderFunction" 85 122 123 124 127 Name 4 "VertexShaderFunction" Name 15 "VertexShaderFunctionS(f1;f1;f1;i1;" Name 11 "inF0" @@ -313,7 +323,15 @@ Shader version: 450 Name 118 "gs_ua4" Name 119 "gs_ub4" Name 120 "gs_uc4" + Name 122 "inF0" + Name 123 "inF1" + Name 124 "inF2" + Name 127 "inI0" Decorate 85(@entryPointOutput) Location 0 + Decorate 122(inF0) Location 0 + Decorate 123(inF1) Location 1 + Decorate 124(inF2) Location 2 + Decorate 127(inI0) Location 3 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -377,6 +395,13 @@ Shader version: 450 118(gs_ua4): 117(ptr) Variable Private 119(gs_ub4): 117(ptr) Variable Private 120(gs_uc4): 117(ptr) Variable Private + 121: TypePointer Input 61(fvec4) + 122(inF0): 121(ptr) Variable Input + 123(inF1): 121(ptr) Variable Input + 124(inF2): 121(ptr) Variable Input + 125: TypeVector 8(int) 4 + 126: TypePointer Input 125(ivec4) + 127(inI0): 126(ptr) Variable Input 4(VertexShaderFunction): 2 Function None 3 5: Label Store 85(@entryPointOutput) 87 diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 49c9acd5..0a40e2a7 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -109,6 +109,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -224,6 +225,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 28c5e043..2c019d8d 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -142,6 +142,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -290,6 +291,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 48860594..10d0442b 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -175,6 +175,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -356,6 +357,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index 73fc756d..fd3761c9 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -167,6 +167,7 @@ Shader version: 450 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) Linked vertex stage: @@ -340,6 +341,7 @@ Shader version: 450 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index 64c14bc0..57f6eb55 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -58,6 +58,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -122,6 +123,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index 317ff098..57dd6f77 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -184,6 +184,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -374,6 +375,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 6feae5d2..68e0aed4 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -148,6 +148,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -302,6 +303,7 @@ gl_FragCoord origin is upper left 0:? 'o2' (uniform 2-component vector of int) 0:? 'o3' (uniform 3-component vector of int) 0:? 'o4' (uniform 4-component vector of int) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out index 8524fe6e..36ba9019 100644 --- a/Test/baseResults/hlsl.matrixindex.frag.out +++ b/Test/baseResults/hlsl.matrixindex.frag.out @@ -116,6 +116,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'idx' (uniform int) 0:? 'um' (uniform 3X2 matrix of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) Linked fragment stage: @@ -238,6 +239,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'idx' (uniform int) 0:? 'um' (uniform 3X2 matrix of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.max.frag.out b/Test/baseResults/hlsl.max.frag.out index 51759586..04aeb2d4 100755 --- a/Test/baseResults/hlsl.max.frag.out +++ b/Test/baseResults/hlsl.max.frag.out @@ -15,6 +15,9 @@ gl_FragCoord origin is upper left 0:3 'input2' (layout(location=1 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input1' (layout(location=0 ) in 4-component vector of float) +0:? 'input2' (layout(location=1 ) in 4-component vector of float) Linked fragment stage: @@ -36,6 +39,9 @@ gl_FragCoord origin is upper left 0:3 'input2' (layout(location=1 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input1' (layout(location=0 ) in 4-component vector of float) +0:? 'input2' (layout(location=1 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.multiEntry.vert.out b/Test/baseResults/hlsl.multiEntry.vert.out index 8aa302cf..35ecaf50 100755 --- a/Test/baseResults/hlsl.multiEntry.vert.out +++ b/Test/baseResults/hlsl.multiEntry.vert.out @@ -22,6 +22,8 @@ Shader version: 450 0:10 Branch: Return 0:? Linker Objects 0:? 'Position' (uniform samplerBuffer) +0:? '@entryPointOutput' (out 4-component vector of float Position) +0:? 'Index' (in uint VertexIndex) Linked vertex stage: @@ -50,6 +52,8 @@ Shader version: 450 0:10 Branch: Return 0:? Linker Objects 0:? 'Position' (uniform samplerBuffer) +0:? '@entryPointOutput' (out 4-component vector of float Position) +0:? 'Index' (in uint VertexIndex) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out index b48967fa..e470893b 100644 --- a/Test/baseResults/hlsl.numericsuffixes.frag.out +++ b/Test/baseResults/hlsl.numericsuffixes.frag.out @@ -64,6 +64,7 @@ gl_FragCoord origin is upper left 0:19 'ps_output' (temp structure{temp 4-component vector of float color}) 0:19 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) Linked fragment stage: @@ -134,6 +135,7 @@ gl_FragCoord origin is upper left 0:19 'ps_output' (temp structure{temp 4-component vector of float color}) 0:19 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.overload.frag.out b/Test/baseResults/hlsl.overload.frag.out index 201d0846..24a23a95 100755 --- a/Test/baseResults/hlsl.overload.frag.out +++ b/Test/baseResults/hlsl.overload.frag.out @@ -354,6 +354,8 @@ gl_FragCoord origin is upper left 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -714,6 +716,8 @@ gl_FragCoord origin is upper left 0:141 'input' (layout(location=0 ) in 4-component vector of float) 0:141 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index f8ed19e9..6acd5684 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -37,6 +37,7 @@ gl_FragCoord origin is upper left 0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -80,6 +81,7 @@ gl_FragCoord origin is upper left 0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:129 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.precedence.frag.out b/Test/baseResults/hlsl.precedence.frag.out index d606cc96..6733aa5c 100755 --- a/Test/baseResults/hlsl.precedence.frag.out +++ b/Test/baseResults/hlsl.precedence.frag.out @@ -46,6 +46,11 @@ gl_FragCoord origin is upper left 0:8 3 (const int) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'a1' (layout(location=0 ) in 4-component vector of float) +0:? 'a2' (layout(location=1 ) in 4-component vector of float) +0:? 'a3' (layout(location=2 ) in 4-component vector of float) +0:? 'a4' (layout(location=3 ) in 4-component vector of float) Linked fragment stage: @@ -98,6 +103,11 @@ gl_FragCoord origin is upper left 0:8 3 (const int) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'a1' (layout(location=0 ) in 4-component vector of float) +0:? 'a2' (layout(location=1 ) in 4-component vector of float) +0:? 'a3' (layout(location=2 ) in 4-component vector of float) +0:? 'a4' (layout(location=3 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.precedence2.frag.out b/Test/baseResults/hlsl.precedence2.frag.out index 3218c792..3f5f159d 100755 --- a/Test/baseResults/hlsl.precedence2.frag.out +++ b/Test/baseResults/hlsl.precedence2.frag.out @@ -29,6 +29,11 @@ gl_FragCoord origin is upper left 0:8 'a4' (layout(location=3 ) in int) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out int) +0:? 'a1' (layout(location=0 ) in int) +0:? 'a2' (layout(location=1 ) in int) +0:? 'a3' (layout(location=2 ) in int) +0:? 'a4' (layout(location=3 ) in int) Linked fragment stage: @@ -64,6 +69,11 @@ gl_FragCoord origin is upper left 0:8 'a4' (layout(location=3 ) in int) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out int) +0:? 'a1' (layout(location=0 ) in int) +0:? 'a2' (layout(location=1 ) in int) +0:? 'a3' (layout(location=2 ) in int) +0:? 'a4' (layout(location=3 ) in int) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out index a3a780b1..38b97951 100644 --- a/Test/baseResults/hlsl.precise.frag.out +++ b/Test/baseResults/hlsl.precise.frag.out @@ -26,6 +26,7 @@ gl_FragCoord origin is upper left 0:12 Branch: Return 0:? Linker Objects 0:? 'precisefloat' (noContraction global float) +0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) Linked fragment stage: @@ -58,6 +59,7 @@ gl_FragCoord origin is upper left 0:12 Branch: Return 0:? Linker Objects 0:? 'precisefloat' (noContraction global float) +0:? '@entryPointOutput' (out structure{noContraction temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out index fbad6bc0..eea37d35 100644 --- a/Test/baseResults/hlsl.promotions.frag.out +++ b/Test/baseResults/hlsl.promotions.frag.out @@ -512,6 +512,7 @@ gl_FragCoord origin is upper left 0:? 'fs' (uniform float) 0:? 'us' (uniform uint) 0:? 'ds' (uniform double) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) Linked fragment stage: @@ -1030,6 +1031,7 @@ gl_FragCoord origin is upper left 0:? 'fs' (uniform float) 0:? 'us' (uniform uint) 0:? 'ds' (uniform double) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 2caeb72e..da683940 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -138,6 +138,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -282,6 +283,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 73c39784..6f6dc6de 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -253,6 +253,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -510,6 +511,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index ec030678..dae4594d 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -159,6 +159,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -324,6 +325,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index e9ab2c70..0df5d1e4 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -114,6 +114,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -234,6 +235,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index b5066115..76774948 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -156,6 +156,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -318,6 +319,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index bd0263ca..7af43cb6 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -189,6 +189,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -384,6 +385,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index a6bca8b8..e1b1027c 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -177,6 +177,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -360,6 +361,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 908fda0c..44182349 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -258,6 +259,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index ed4c1bf6..df7bb630 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -176,6 +176,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -358,6 +359,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index b6ff4eb4..3bae16f2 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -167,6 +167,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -340,6 +341,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index 47bd5d91..de345e2a 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -140,6 +140,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -286,6 +287,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index 7eba5d3f..1deff2aa 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -146,6 +146,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -298,6 +299,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index 1f0fda7d..8468b8e3 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -194,6 +194,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -394,6 +395,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 14dd752c..08d1154a 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -185,6 +185,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -376,6 +377,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index ac223cb0..662a1df5 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -152,6 +152,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -310,6 +311,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 764d0dc4..86c6801b 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -158,6 +158,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -322,6 +323,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 27a2a42a..27bcad42 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -192,6 +192,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -390,6 +391,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index ce6d6efa..82eea56d 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -243,6 +243,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -492,6 +493,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index 5943081c..8f85cfcc 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -235,6 +235,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) Linked vertex stage: @@ -476,6 +477,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 348d27ad..2928bed3 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -213,6 +213,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -432,6 +433,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index 9aeaeddd..76831db8 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -147,6 +147,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -300,6 +301,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCubeArray) 0:? 'g_tTexcdi4' (uniform itextureCubeArray) 0:? 'g_tTexcdu4' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 59beba60..dbdf833c 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -156,6 +156,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -318,6 +319,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' (uniform textureCubeArray) 0:? 'g_tTexcdi4a' (uniform itextureCubeArray) 0:? 'g_tTexcdu4a' (uniform utextureCubeArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index a7e26ca8..7e0c28e4 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -190,6 +190,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -386,6 +387,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index f1fef1f6..e3b61aaf 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -181,6 +181,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) Linked vertex stage: @@ -368,6 +369,7 @@ Shader version: 450 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 608fd0ce..81bafbde 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -177,6 +177,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -360,6 +361,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' (uniform textureCube) 0:? 'g_tTexcdi4' (uniform itextureCube) 0:? 'g_tTexcdu4' (uniform utextureCube) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index e762d59d..ebec613d 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -126,6 +126,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) Linked fragment stage: @@ -258,6 +259,7 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' (uniform texture2DArray) 0:? 'g_tTex2di4' (uniform itexture2DArray) 0:? 'g_tTex2du4' (uniform utexture2DArray) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.scope.frag.out b/Test/baseResults/hlsl.scope.frag.out index 2bc1dd52..4218c4fb 100755 --- a/Test/baseResults/hlsl.scope.frag.out +++ b/Test/baseResults/hlsl.scope.frag.out @@ -38,6 +38,7 @@ gl_FragCoord origin is upper left 0:29 0 (const int) 0:27 No loop body 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -82,21 +83,24 @@ gl_FragCoord origin is upper left 0:29 0 (const int) 0:27 No loop body 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 36 +// Id's are bound by 39 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "PixelShaderFunction" + EntryPoint Fragment 4 "PixelShaderFunction" 38 ExecutionMode 4 OriginUpperLeft Name 4 "PixelShaderFunction" Name 8 "x" Name 11 "x" Name 14 "x" Name 17 "x" + Name 38 "input" + Decorate 38(input) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 @@ -108,6 +112,9 @@ gl_FragCoord origin is upper left 15: TypeVector 9(float) 3 16: TypePointer Function 15(fvec3) 19: 6(int) Constant 0 + 36: TypeVector 9(float) 4 + 37: TypePointer Input 36(fvec4) + 38(input): 37(ptr) Variable Input 4(PixelShaderFunction): 2 Function None 3 5: Label 8(x): 7(ptr) Variable Function diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out index 91b88fd4..e5eb8e2d 100644 --- a/Test/baseResults/hlsl.semicolons.frag.out +++ b/Test/baseResults/hlsl.semicolons.frag.out @@ -25,6 +25,7 @@ gl_FragCoord origin is upper left 0:17 'ps_output' (temp structure{temp 4-component vector of float color}) 0:17 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) Linked fragment stage: @@ -56,6 +57,7 @@ gl_FragCoord origin is upper left 0:17 'ps_output' (temp structure{temp 4-component vector of float color}) 0:17 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out structure{temp 4-component vector of float color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.sin.frag.out b/Test/baseResults/hlsl.sin.frag.out index 87c26bca..246cfe64 100755 --- a/Test/baseResults/hlsl.sin.frag.out +++ b/Test/baseResults/hlsl.sin.frag.out @@ -13,6 +13,8 @@ gl_FragCoord origin is upper left 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -32,6 +34,8 @@ gl_FragCoord origin is upper left 0:3 'input' (layout(location=0 ) in 4-component vector of float) 0:3 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out index 7cfd2d52..4d5d275c 100644 --- a/Test/baseResults/hlsl.stringtoken.frag.out +++ b/Test/baseResults/hlsl.stringtoken.frag.out @@ -23,6 +23,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'TestTexture' (uniform texture2D) 0:? 'TestUF' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) Linked fragment stage: @@ -52,6 +53,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 'TestTexture' (uniform texture2D) 0:? 'TestUF' (uniform 4-component vector of float) +0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index 70287ec0..0809d08c 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -33,6 +33,8 @@ gl_FragCoord origin is upper left 0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float ff4}) 0:? 'ff5' (layout(binding=5 offset=20 ) global 3-component vector of float) 0:? 'ff6' (layout(binding=8 offset=36 ) global 3-component vector of float) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -68,6 +70,8 @@ gl_FragCoord origin is upper left 0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float ff4}) 0:? 'ff5' (layout(binding=5 offset=20 ) global 3-component vector of float) 0:? 'ff6' (layout(binding=8 offset=36 ) global 3-component vector of float) +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out index c68ba83a..0531bd11 100755 --- a/Test/baseResults/hlsl.structin.vert.out +++ b/Test/baseResults/hlsl.structin.vert.out @@ -32,6 +32,11 @@ Shader version: 450 0:8 'e' (layout(location=4 ) in 4-component vector of float) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float Position) +0:? 'd' (layout(location=0 ) in 4-component vector of float) +0:? 'm' (layout(location=1 ) in 2-element array of 4-component vector of float) +0:? 'coord' (layout(location=3 ) in 2-component vector of uint) +0:? 'e' (layout(location=4 ) in 4-component vector of float) Linked vertex stage: @@ -70,6 +75,11 @@ Shader version: 450 0:8 'e' (layout(location=4 ) in 4-component vector of float) 0:8 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float Position) +0:? 'd' (layout(location=0 ) in 4-component vector of float) +0:? 'm' (layout(location=1 ) in 2-element array of 4-component vector of float) +0:? 'coord' (layout(location=3 ) in 2-component vector of uint) +0:? 'e' (layout(location=4 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out index 241dec3c..bd1eaa08 100755 --- a/Test/baseResults/hlsl.switch.frag.out +++ b/Test/baseResults/hlsl.switch.frag.out @@ -125,6 +125,10 @@ gl_FragCoord origin is upper left 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) +0:? 'c' (layout(location=1 ) in int) +0:? 'd' (layout(location=2 ) in int) Linked fragment stage: @@ -256,6 +260,10 @@ gl_FragCoord origin is upper left 0:54 'input' (layout(location=0 ) in 4-component vector of float) 0:54 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) +0:? 'c' (layout(location=1 ) in int) +0:? 'd' (layout(location=2 ) in int) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.templatetypes.frag.out b/Test/baseResults/hlsl.templatetypes.frag.out index 76de8910..db2b4535 100644 --- a/Test/baseResults/hlsl.templatetypes.frag.out +++ b/Test/baseResults/hlsl.templatetypes.frag.out @@ -246,6 +246,7 @@ gl_FragCoord origin is upper left 0:45 0.000000 0:45 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) Linked fragment stage: @@ -498,6 +499,7 @@ gl_FragCoord origin is upper left 0:45 0.000000 0:45 Branch: Return 0:? Linker Objects +0:? '@entryPointOutput' (out float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/hlsl.void.frag.out b/Test/baseResults/hlsl.void.frag.out index 40444c02..3715166f 100755 --- a/Test/baseResults/hlsl.void.frag.out +++ b/Test/baseResults/hlsl.void.frag.out @@ -14,6 +14,7 @@ gl_FragCoord origin is upper left 0:7 Function Call: foo2( (global void) 0:8 Branch: Return 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -34,21 +35,28 @@ gl_FragCoord origin is upper left 0:7 Function Call: foo2( (global void) 0:8 Branch: Return 0:? Linker Objects +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 13 +// Id's are bound by 17 Capability Shader 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "PixelShaderFunction" + EntryPoint Fragment 4 "PixelShaderFunction" 16 ExecutionMode 4 OriginUpperLeft Name 4 "PixelShaderFunction" Name 6 "foo1(" Name 8 "foo2(" + Name 16 "input" + Decorate 16(input) Location 0 2: TypeVoid 3: TypeFunction 2 + 13: TypeFloat 32 + 14: TypeVector 13(float) 4 + 15: TypePointer Input 14(fvec4) + 16(input): 15(ptr) Variable Input 4(PixelShaderFunction): 2 Function None 3 5: Label 10: 2 FunctionCall 6(foo1() diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out index cd88050b..d1b92ea3 100755 --- a/Test/baseResults/hlsl.whileLoop.frag.out +++ b/Test/baseResults/hlsl.whileLoop.frag.out @@ -34,6 +34,8 @@ gl_FragCoord origin is upper left 0:6 false (const bool) 0:6 No loop body 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) Linked fragment stage: @@ -74,6 +76,8 @@ gl_FragCoord origin is upper left 0:6 false (const bool) 0:6 No loop body 0:? Linker Objects +0:? '@entryPointOutput' (out 4-component vector of float) +0:? 'input' (layout(location=0 ) in 4-component vector of float) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out index a483986e..7048c10f 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out @@ -11,12 +11,18 @@ Linked fragment stage: Capability Float64 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 5663 "main" + EntryPoint Fragment 5663 "main" 4045 4872 ExecutionMode 5663 OriginUpperLeft + Decorate 4872 Location 0 8: TypeVoid 1282: TypeFunction 8 13: TypeFloat 32 + 29: TypeVector 13(float) 4 2572: 13(float) Constant 0 + 666: TypePointer Output 29(fvec4) + 4045: 666(ptr) Variable Output + 667: TypePointer Input 29(fvec4) + 4872: 667(ptr) Variable Input 5663: 8 Function None 1282 16122: Label ReturnValue 2572 diff --git a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out index 741f7098..6fa58dbc 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out @@ -5,13 +5,13 @@ Linked fragment stage: // Module Version 10000 // Generated by (magic number): 80001 -// Id's are bound by 145 +// Id's are bound by 149 Capability Shader Capability Float64 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" + EntryPoint Fragment 4 "main" 146 148 ExecutionMode 4 OriginUpperLeft Name 4 "main" Name 9 "r00" @@ -42,6 +42,9 @@ Linked fragment stage: Name 130 "r62" Name 136 "r65" Name 141 "r66" + Name 146 "@entryPointOutput" + Name 148 "input" + Decorate 148(input) Location 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -155,6 +158,10 @@ Linked fragment stage: 142: 69(fvec3) ConstantComposite 109 111 112 143: 69(fvec3) ConstantComposite 113 114 116 144: 139 ConstantComposite 72 126 142 143 + 145: TypePointer Output 7(fvec4) +146(@entryPointOutput): 145(ptr) Variable Output + 147: TypePointer Input 7(fvec4) + 148(input): 147(ptr) Variable Input 4(main): 2 Function None 3 5: Label 9(r00): 8(ptr) Variable Function diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 33703919..74310f35 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1481" -#define GLSLANG_DATE "11-Sep-2016" +#define GLSLANG_REVISION "Overload400-PrecQual.1482" +#define GLSLANG_DATE "12-Sep-2016" diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index dbc29402..40bea67f 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -702,6 +702,9 @@ TIntermTyped* HlslParseContext::handleDotDereference(const TSourceLoc& loc, TInt // E.g., pipeline inputs to the vertex stage and outputs from the fragment stage. bool HlslParseContext::shouldFlatten(const TType& type) { + if (! inEntrypoint) + return false; + const TStorageQualifier qualifier = type.getQualifier().storage; return type.isStruct() && @@ -727,6 +730,7 @@ void HlslParseContext::flattenStruct(const TVariable& variable) memberVariable->getWritableType().getQualifier().layoutLocation = location; location += intermediate.computeTypeLocationSize(memberVariable->getType()); memberVariables.push_back(memberVariable); + intermediate.addSymbolLinkageNode(linkage, *memberVariable); } flattenMap[variable.getUniqueId()] = memberVariables; @@ -855,6 +859,8 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l if (shouldFlatten(*param.type)) flattenStruct(*variable); + else if (inEntrypoint) + intermediate.addSymbolLinkageNode(linkage, *variable); } } else paramNodes = intermediate.growAggregate(paramNodes, intermediate.addSymbol(*param.type, loc), loc); @@ -907,6 +913,7 @@ void HlslParseContext::remapEntrypointIO(TFunction& function) if (function.getType().getBasicType() != EbtVoid) { entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType()); entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut; + intermediate.addSymbolLinkageNode(linkage, *entryPointOutput); if (function.getType().getQualifier().builtIn == EbvNone) { entryPointOutput->getWritableType().getQualifier().layoutLocation = outCount; outCount += intermediate.computeTypeLocationSize(function.getType());