diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index 535905ca..bed52c43 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -335,7 +335,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -395,7 +395,7 @@ gl_FragCoord origin is upper left Name 127 "psout" Name 137 "flattenTemp" Name 140 "Color" - Name 144 "Depth" + Name 144 "@entryPointOutput_Depth" Name 147 "g_tTex1df4" Decorate 16(g_tTex1df4a) DescriptorSet 0 Decorate 16(g_tTex1df4a) Binding 1 @@ -410,7 +410,7 @@ gl_FragCoord origin is upper left Decorate 104(g_tTexcdi4a) DescriptorSet 0 Decorate 115(g_tTexcdu4a) DescriptorSet 0 Decorate 140(Color) Location 0 - Decorate 144(Depth) BuiltIn FragDepth + Decorate 144(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 147(g_tTex1df4) DescriptorSet 0 Decorate 147(g_tTex1df4) Binding 0 2: TypeVoid @@ -487,7 +487,7 @@ gl_FragCoord origin is upper left 139: TypePointer Output 7(fvec4) 140(Color): 139(ptr) Variable Output 143: TypePointer Output 6(float) - 144(Depth): 143(ptr) Variable Output +144(@entryPointOutput_Depth): 143(ptr) Variable Output 147(g_tTex1df4): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -499,7 +499,7 @@ gl_FragCoord origin is upper left Store 140(Color) 142 145: 12(ptr) AccessChain 137(flattenTemp) 132 146: 6(float) Load 145 - Store 144(Depth) 146 + Store 144(@entryPointOutput_Depth) 146 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index f19f5d0b..9d64bd3a 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -167,7 +167,7 @@ ERROR: node is still EOpNull! 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -184,8 +184,8 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -347,7 +347,7 @@ ERROR: node is still EOpNull! 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -364,7 +364,7 @@ ERROR: node is still EOpNull! 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index 5f9a1caf..1cb5b8c6 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -107,7 +107,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -124,8 +124,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -239,7 +239,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -256,8 +256,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -292,7 +292,7 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 104 "flattenTemp" Name 107 "Color" - Name 111 "Depth" + Name 111 "@entryPointOutput_Depth" Name 116 "g_tTex1df4a" Name 117 "g_tTex1df4" Name 120 "g_tTex1di4a" @@ -306,7 +306,7 @@ gl_FragCoord origin is upper left Decorate 74(g_tTexcdi4a) DescriptorSet 0 Decorate 84(g_tTexcdu4a) DescriptorSet 0 Decorate 107(Color) Location 0 - Decorate 111(Depth) BuiltIn FragDepth + Decorate 111(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 116(g_tTex1df4a) DescriptorSet 0 Decorate 116(g_tTex1df4a) Binding 1 Decorate 117(g_tTex1df4) DescriptorSet 0 @@ -378,7 +378,7 @@ gl_FragCoord origin is upper left 106: TypePointer Output 7(fvec4) 107(Color): 106(ptr) Variable Output 110: TypePointer Output 6(float) - 111(Depth): 110(ptr) Variable Output +111(@entryPointOutput_Depth): 110(ptr) Variable Output 114: TypeImage 6(float) 1D array sampled format:Unknown 115: TypePointer UniformConstant 114 116(g_tTex1df4a): 115(ptr) Variable UniformConstant @@ -399,7 +399,7 @@ gl_FragCoord origin is upper left Store 107(Color) 109 112: 99(ptr) AccessChain 104(flattenTemp) 98 113: 6(float) Load 112 - Store 111(Depth) 113 + Store 111(@entryPointOutput_Depth) 113 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index c011f560..e1afa0be 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -101,7 +101,7 @@ gl_FragCoord origin is upper left 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -122,8 +122,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -231,7 +231,7 @@ gl_FragCoord origin is upper left 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -252,8 +252,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -287,7 +287,7 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 105 "flattenTemp" Name 108 "Color" - Name 112 "Depth" + Name 112 "@entryPointOutput_Depth" Name 115 "g_sSamp2d" Name 118 "g_tTex1df4a" Name 119 "g_tTex1df4" @@ -305,7 +305,7 @@ gl_FragCoord origin is upper left Decorate 74(g_tTexcdi4) DescriptorSet 0 Decorate 84(g_tTexcdu4) DescriptorSet 0 Decorate 108(Color) Location 0 - Decorate 112(Depth) BuiltIn FragDepth + Decorate 112(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 115(g_sSamp2d) DescriptorSet 0 Decorate 118(g_tTex1df4a) DescriptorSet 0 Decorate 118(g_tTex1df4a) Binding 1 @@ -382,7 +382,7 @@ gl_FragCoord origin is upper left 107: TypePointer Output 7(fvec4) 108(Color): 107(ptr) Variable Output 111: TypePointer Output 6(float) - 112(Depth): 111(ptr) Variable Output +112(@entryPointOutput_Depth): 111(ptr) Variable Output 115(g_sSamp2d): 19(ptr) Variable UniformConstant 116: TypeImage 6(float) 1D sampled format:Unknown 117: TypePointer UniformConstant 116 @@ -413,7 +413,7 @@ gl_FragCoord origin is upper left Store 108(Color) 110 113: 100(ptr) AccessChain 105(flattenTemp) 99 114: 6(float) Load 113 - Store 112(Depth) 114 + Store 112(@entryPointOutput_Depth) 114 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index 8ed1c079..fb813a7e 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -77,7 +77,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -97,8 +97,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -202,8 +202,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -231,7 +231,7 @@ gl_FragCoord origin is upper left Name 67 "psout" Name 76 "flattenTemp" Name 79 "Color" - Name 83 "Depth" + Name 83 "@entryPointOutput_Depth" Name 88 "g_tTex1df4a" Name 89 "g_tTex1df4" Name 92 "g_tTex1di4" @@ -248,7 +248,7 @@ gl_FragCoord origin is upper left Decorate 39(g_tTex2di4) DescriptorSet 0 Decorate 55(g_tTex2du4) DescriptorSet 0 Decorate 79(Color) Location 0 - Decorate 83(Depth) BuiltIn FragDepth + Decorate 83(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 88(g_tTex1df4a) DescriptorSet 0 Decorate 88(g_tTex1df4a) Binding 1 Decorate 89(g_tTex1df4) DescriptorSet 0 @@ -313,7 +313,7 @@ gl_FragCoord origin is upper left 78: TypePointer Output 7(fvec4) 79(Color): 78(ptr) Variable Output 82: TypePointer Output 6(float) - 83(Depth): 82(ptr) Variable Output +83(@entryPointOutput_Depth): 82(ptr) Variable Output 86: TypeImage 6(float) 1D sampled format:Unknown 87: TypePointer UniformConstant 86 88(g_tTex1df4a): 87(ptr) Variable UniformConstant @@ -352,7 +352,7 @@ gl_FragCoord origin is upper left Store 79(Color) 81 84: 71(ptr) AccessChain 76(flattenTemp) 30 85: 6(float) Load 84 - Store 83(Depth) 85 + Store 83(@entryPointOutput_Depth) 85 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 73ecae0c..6f4703f2 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -94,8 +94,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -196,8 +196,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -225,7 +225,7 @@ gl_FragCoord origin is upper left Name 68 "psout" Name 77 "flattenTemp" Name 80 "Color" - Name 84 "Depth" + Name 84 "@entryPointOutput_Depth" Name 89 "g_tTex1df4a" Name 90 "g_tTex1df4" Name 93 "g_tTex1di4" @@ -236,7 +236,7 @@ gl_FragCoord origin is upper left Decorate 40(g_tTex2di4) DescriptorSet 0 Decorate 55(g_tTex2du4) DescriptorSet 0 Decorate 80(Color) Location 0 - Decorate 84(Depth) BuiltIn FragDepth + Decorate 84(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 89(g_tTex1df4a) DescriptorSet 0 Decorate 89(g_tTex1df4a) Binding 1 Decorate 90(g_tTex1df4) DescriptorSet 0 @@ -296,7 +296,7 @@ gl_FragCoord origin is upper left 79: TypePointer Output 7(fvec4) 80(Color): 79(ptr) Variable Output 83: TypePointer Output 6(float) - 84(Depth): 83(ptr) Variable Output +84(@entryPointOutput_Depth): 83(ptr) Variable Output 87: TypeImage 6(float) 1D array sampled format:Unknown 88: TypePointer UniformConstant 87 89(g_tTex1df4a): 88(ptr) Variable UniformConstant @@ -317,7 +317,7 @@ gl_FragCoord origin is upper left Store 80(Color) 82 85: 72(ptr) AccessChain 77(flattenTemp) 31 86: 6(float) Load 85 - Store 84(Depth) 86 + Store 84(@entryPointOutput_Depth) 86 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out index 675e1780..0a7aac9f 100644 --- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out @@ -350,7 +350,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -368,8 +368,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -726,7 +726,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -744,8 +744,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -804,7 +804,7 @@ gl_FragCoord origin is upper left Name 226 "psout" Name 235 "flattenTemp" Name 238 "Color" - Name 242 "Depth" + Name 242 "@entryPointOutput_Depth" Name 245 "g_sSamp2d" Name 248 "g_tTex1df4a" Name 251 "g_tTex1di4a" @@ -824,7 +824,7 @@ gl_FragCoord origin is upper left Decorate 143(g_tTexcdi4a) DescriptorSet 0 Decorate 154(g_tTexcdu4a) DescriptorSet 0 Decorate 238(Color) Location 0 - Decorate 242(Depth) BuiltIn FragDepth + Decorate 242(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 245(g_sSamp2d) DescriptorSet 0 Decorate 248(g_tTex1df4a) DescriptorSet 0 Decorate 248(g_tTex1df4a) Binding 0 @@ -888,7 +888,7 @@ gl_FragCoord origin is upper left 237: TypePointer Output 7(fvec4) 238(Color): 237(ptr) Variable Output 241: TypePointer Output 6(float) - 242(Depth): 241(ptr) Variable Output +242(@entryPointOutput_Depth): 241(ptr) Variable Output 245(g_sSamp2d): 19(ptr) Variable UniformConstant 246: TypeImage 6(float) 1D array sampled format:Unknown 247: TypePointer UniformConstant 246 @@ -909,7 +909,7 @@ gl_FragCoord origin is upper left Store 238(Color) 240 243: 230(ptr) AccessChain 235(flattenTemp) 69 244: 6(float) Load 243 - Store 242(Depth) 244 + Store 242(@entryPointOutput_Depth) 244 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out index 4d5da521..d2cb9c22 100644 --- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out @@ -350,7 +350,7 @@ gl_FragCoord origin is upper left 0:34 Constant: 0:34 0 (const int) 0:34 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:34 Depth: direct index for structure ( temp float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: @@ -372,8 +372,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -730,7 +730,7 @@ gl_FragCoord origin is upper left 0:34 Constant: 0:34 0 (const int) 0:34 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:34 Depth: direct index for structure ( temp float) 0:34 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:34 Constant: @@ -752,8 +752,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -811,7 +811,7 @@ gl_FragCoord origin is upper left Name 226 "psout" Name 235 "flattenTemp" Name 238 "Color" - Name 242 "Depth" + Name 242 "@entryPointOutput_Depth" Name 245 "g_sSamp2d" Name 248 "g_tTex1df4a" Name 249 "g_tTex1df4" @@ -835,7 +835,7 @@ gl_FragCoord origin is upper left Decorate 143(g_tTexcdi4) DescriptorSet 0 Decorate 154(g_tTexcdu4) DescriptorSet 0 Decorate 238(Color) Location 0 - Decorate 242(Depth) BuiltIn FragDepth + Decorate 242(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 245(g_sSamp2d) DescriptorSet 0 Decorate 248(g_tTex1df4a) DescriptorSet 0 Decorate 248(g_tTex1df4a) Binding 1 @@ -904,7 +904,7 @@ gl_FragCoord origin is upper left 237: TypePointer Output 7(fvec4) 238(Color): 237(ptr) Variable Output 241: TypePointer Output 6(float) - 242(Depth): 241(ptr) Variable Output +242(@entryPointOutput_Depth): 241(ptr) Variable Output 245(g_sSamp2d): 19(ptr) Variable UniformConstant 246: TypeImage 6(float) 1D sampled format:Unknown 247: TypePointer UniformConstant 246 @@ -935,7 +935,7 @@ gl_FragCoord origin is upper left Store 238(Color) 240 243: 230(ptr) AccessChain 235(flattenTemp) 30 244: 6(float) Load 243 - Store 242(Depth) 244 + Store 242(@entryPointOutput_Depth) 244 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out index a4fd588a..d9febf9d 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out @@ -602,7 +602,7 @@ gl_FragCoord origin is upper left 0:39 Constant: 0:39 0 (const int) 0:39 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:39 Depth: direct index for structure ( temp float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: @@ -624,8 +624,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -1234,7 +1234,7 @@ gl_FragCoord origin is upper left 0:39 Constant: 0:39 0 (const int) 0:39 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:39 Depth: direct index for structure ( temp float) 0:39 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:39 Constant: @@ -1256,8 +1256,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -1317,7 +1317,7 @@ gl_FragCoord origin is upper left Name 351 "psout" Name 360 "flattenTemp" Name 363 "Color" - Name 367 "Depth" + Name 367 "@entryPointOutput_Depth" Name 370 "g_sSamp2d" Name 373 "g_tTex1df4a" Name 374 "g_tTex1df4" @@ -1345,7 +1345,7 @@ gl_FragCoord origin is upper left Decorate 47(g_tTex2di4) DescriptorSet 0 Decorate 63(g_tTex2du4) DescriptorSet 0 Decorate 363(Color) Location 0 - Decorate 367(Depth) BuiltIn FragDepth + Decorate 367(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 370(g_sSamp2d) DescriptorSet 0 Decorate 373(g_tTex1df4a) DescriptorSet 0 Decorate 373(g_tTex1df4a) Binding 1 @@ -1410,7 +1410,7 @@ gl_FragCoord origin is upper left 362: TypePointer Output 7(fvec4) 363(Color): 362(ptr) Variable Output 366: TypePointer Output 6(float) - 367(Depth): 366(ptr) Variable Output +367(@entryPointOutput_Depth): 366(ptr) Variable Output 370(g_sSamp2d): 19(ptr) Variable UniformConstant 371: TypeImage 6(float) 1D sampled format:Unknown 372: TypePointer UniformConstant 371 @@ -1450,7 +1450,7 @@ gl_FragCoord origin is upper left Store 363(Color) 365 368: 355(ptr) AccessChain 360(flattenTemp) 33 369: 6(float) Load 368 - Store 367(Depth) 369 + Store 367(@entryPointOutput_Depth) 369 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out index 23d26cc8..590b4fcb 100644 --- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out @@ -602,7 +602,7 @@ gl_FragCoord origin is upper left 0:33 Constant: 0:33 0 (const int) 0:33 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:33 Depth: direct index for structure ( temp float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: @@ -620,8 +620,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -1230,7 +1230,7 @@ gl_FragCoord origin is upper left 0:33 Constant: 0:33 0 (const int) 0:33 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:33 Depth: direct index for structure ( temp float) 0:33 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:33 Constant: @@ -1248,8 +1248,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -1310,7 +1310,7 @@ gl_FragCoord origin is upper left Name 351 "psout" Name 360 "flattenTemp" Name 363 "Color" - Name 367 "Depth" + Name 367 "@entryPointOutput_Depth" Name 370 "g_sSamp2d" Name 373 "g_tTex1df4a" Name 376 "g_tTex1di4a" @@ -1334,7 +1334,7 @@ gl_FragCoord origin is upper left Decorate 47(g_tTex2di4a) DescriptorSet 0 Decorate 63(g_tTex2du4a) DescriptorSet 0 Decorate 363(Color) Location 0 - Decorate 367(Depth) BuiltIn FragDepth + Decorate 367(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 370(g_sSamp2d) DescriptorSet 0 Decorate 373(g_tTex1df4a) DescriptorSet 0 Decorate 373(g_tTex1df4a) Binding 0 @@ -1394,7 +1394,7 @@ gl_FragCoord origin is upper left 362: TypePointer Output 7(fvec4) 363(Color): 362(ptr) Variable Output 366: TypePointer Output 6(float) - 367(Depth): 366(ptr) Variable Output +367(@entryPointOutput_Depth): 366(ptr) Variable Output 370(g_sSamp2d): 19(ptr) Variable UniformConstant 371: TypeImage 6(float) 1D array sampled format:Unknown 372: TypePointer UniformConstant 371 @@ -1424,7 +1424,7 @@ gl_FragCoord origin is upper left Store 363(Color) 365 368: 355(ptr) AccessChain 360(flattenTemp) 131 369: 6(float) Load 368 - Store 367(Depth) 369 + Store 367(@entryPointOutput_Depth) 369 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out index 0704ee0e..3f504cde 100644 --- a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out @@ -200,7 +200,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -221,8 +221,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -429,7 +429,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -450,8 +450,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -491,7 +491,7 @@ gl_FragCoord origin is upper left Name 120 "psout" Name 129 "flattenTemp" Name 132 "Color" - Name 136 "Depth" + Name 136 "@entryPointOutput_Depth" Name 141 "g_tTex1df4a" Name 142 "g_tTex1df4" Name 145 "g_tTex1di4" @@ -514,7 +514,7 @@ gl_FragCoord origin is upper left Decorate 45(g_tTex2di4) DescriptorSet 0 Decorate 62(g_tTex2du4) DescriptorSet 0 Decorate 132(Color) Location 0 - Decorate 136(Depth) BuiltIn FragDepth + Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 141(g_tTex1df4a) DescriptorSet 0 Decorate 141(g_tTex1df4a) Binding 1 Decorate 142(g_tTex1df4) DescriptorSet 0 @@ -584,7 +584,7 @@ gl_FragCoord origin is upper left 131: TypePointer Output 7(fvec4) 132(Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) - 136(Depth): 135(ptr) Variable Output +136(@entryPointOutput_Depth): 135(ptr) Variable Output 139: TypeImage 6(float) 1D sampled format:Unknown 140: TypePointer UniformConstant 139 141(g_tTex1df4a): 140(ptr) Variable UniformConstant @@ -623,7 +623,7 @@ gl_FragCoord origin is upper left Store 132(Color) 134 137: 124(ptr) AccessChain 129(flattenTemp) 31 138: 6(float) Load 137 - Store 136(Depth) 138 + Store 136(@entryPointOutput_Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index c3986d7c..ccfb22a6 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -1118,7 +1118,7 @@ gl_FragCoord origin is upper left 0:46 Constant: 0:46 0 (const int) 0:46 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:46 Depth: direct index for structure ( temp float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: @@ -1152,8 +1152,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -2278,7 +2278,7 @@ gl_FragCoord origin is upper left 0:46 Constant: 0:46 0 (const int) 0:46 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:46 Depth: direct index for structure ( temp float) 0:46 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:46 Constant: @@ -2312,8 +2312,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -2418,7 +2418,7 @@ gl_FragCoord origin is upper left Name 526 "psout" Name 537 "flattenTemp" Name 540 "Color" - Name 544 "Depth" + Name 544 "@entryPointOutput_Depth" Name 549 "g_sSamp" Decorate 17(g_tTex1df4) DescriptorSet 0 Decorate 17(g_tTex1df4) Binding 0 @@ -2449,7 +2449,7 @@ gl_FragCoord origin is upper left Decorate 500(g_tTex2dmsi4a) DescriptorSet 0 Decorate 514(g_tTex2dmsu4a) DescriptorSet 0 Decorate 540(Color) Location 0 - Decorate 544(Depth) BuiltIn FragDepth + Decorate 544(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 549(g_sSamp) DescriptorSet 0 Decorate 549(g_sSamp) Binding 0 2: TypeVoid @@ -2560,7 +2560,7 @@ gl_FragCoord origin is upper left 539: TypePointer Output 7(fvec4) 540(Color): 539(ptr) Variable Output 543: TypePointer Output 6(float) - 544(Depth): 543(ptr) Variable Output +544(@entryPointOutput_Depth): 543(ptr) Variable Output 547: TypeSampler 548: TypePointer UniformConstant 547 549(g_sSamp): 548(ptr) Variable UniformConstant @@ -2574,7 +2574,7 @@ gl_FragCoord origin is upper left Store 540(Color) 542 545: 532(ptr) AccessChain 537(flattenTemp) 531 546: 6(float) Load 545 - Store 544(Depth) 546 + Store 544(@entryPointOutput_Depth) 546 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out index 67b2f8f5..c4d5ff9b 100644 --- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out @@ -326,7 +326,7 @@ gl_FragCoord origin is upper left 0:44 Constant: 0:44 0 (const int) 0:44 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:44 Depth: direct index for structure ( temp float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -686,7 +686,7 @@ gl_FragCoord origin is upper left 0:44 Constant: 0:44 0 (const int) 0:44 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:44 Depth: direct index for structure ( temp float) 0:44 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:44 Constant: @@ -712,8 +712,8 @@ gl_FragCoord origin is upper left 0:? 'g_tBuffI' (layout( rgba32i) uniform iimageBuffer) 0:? 'g_tBuffU' (layout( rgba32ui) uniform uimageBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -776,7 +776,7 @@ gl_FragCoord origin is upper left Name 201 "psout" Name 213 "flattenTemp" Name 216 "Color" - Name 220 "Depth" + Name 220 "@entryPointOutput_Depth" Name 225 "g_sSamp" Name 229 "$Global" MemberName 229($Global) 0 "c1" @@ -808,7 +808,7 @@ gl_FragCoord origin is upper left Decorate 179(g_tTex3di4) DescriptorSet 0 Decorate 191(g_tTex3du4) DescriptorSet 0 Decorate 216(Color) Location 0 - Decorate 220(Depth) BuiltIn FragDepth + Decorate 220(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 225(g_sSamp) DescriptorSet 0 Decorate 225(g_sSamp) Binding 0 MemberDecorate 229($Global) 0 Offset 0 @@ -901,7 +901,7 @@ gl_FragCoord origin is upper left 215: TypePointer Output 7(fvec4) 216(Color): 215(ptr) Variable Output 219: TypePointer Output 6(float) - 220(Depth): 219(ptr) Variable Output +220(@entryPointOutput_Depth): 219(ptr) Variable Output 223: TypeSampler 224: TypePointer UniformConstant 223 225(g_sSamp): 224(ptr) Variable UniformConstant @@ -921,7 +921,7 @@ gl_FragCoord origin is upper left Store 216(Color) 218 221: 208(ptr) AccessChain 213(flattenTemp) 207 222: 6(float) Load 221 - Store 220(Depth) 222 + Store 220(@entryPointOutput_Depth) 222 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index 3f346d40..5b63a1d8 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -273,7 +273,7 @@ gl_FragCoord origin is upper left 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:13 Depth: direct index for structure ( temp float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: @@ -282,8 +282,8 @@ gl_FragCoord origin is upper left 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex2dmsf4' ( uniform texture2DMS) 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) 0:? 'sample' (layout( location=0) flat in int) @@ -564,7 +564,7 @@ gl_FragCoord origin is upper left 0:13 Constant: 0:13 0 (const int) 0:13 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:13 Depth: direct index for structure ( temp float) 0:13 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:13 Constant: @@ -573,8 +573,8 @@ gl_FragCoord origin is upper left 0:? 'g_sSamp' (layout( binding=0) uniform sampler) 0:? 'g_tTex2dmsf4' ( uniform texture2DMS) 0:? 'g_tTex2dmsf4a' ( uniform texture2DMSArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) 0:? 'sample' (layout( location=0) flat in int) // Module Version 10000 @@ -615,14 +615,14 @@ gl_FragCoord origin is upper left Name 206 "flattenTemp" Name 207 "param" Name 211 "Color" - Name 215 "Depth" + Name 215 "@entryPointOutput_Depth" Name 220 "g_sSamp" Decorate 23(g_tTex2dmsf4) DescriptorSet 0 Decorate 142(g_tTex2dmsf4a) DescriptorSet 0 Decorate 204(sample) Flat Decorate 204(sample) Location 0 Decorate 211(Color) Location 0 - Decorate 215(Depth) BuiltIn FragDepth + Decorate 215(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 220(g_sSamp) DescriptorSet 0 Decorate 220(g_sSamp) Binding 0 2: TypeVoid @@ -723,7 +723,7 @@ gl_FragCoord origin is upper left 210: TypePointer Output 9(fvec4) 211(Color): 210(ptr) Variable Output 214: TypePointer Output 8(float) - 215(Depth): 214(ptr) Variable Output +215(@entryPointOutput_Depth): 214(ptr) Variable Output 218: TypeSampler 219: TypePointer UniformConstant 218 220(g_sSamp): 219(ptr) Variable UniformConstant @@ -743,7 +743,7 @@ gl_FragCoord origin is upper left Store 211(Color) 213 216: 197(ptr) AccessChain 206(flattenTemp) 196 217: 8(float) Load 216 - Store 215(Depth) 217 + Store 215(@entryPointOutput_Depth) 217 Return FunctionEnd 13(@main(i1;):10(PS_OUTPUT) Function None 11 diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out index 3f7f139a..613ca2be 100644 --- a/Test/baseResults/hlsl.inoutquals.frag.out +++ b/Test/baseResults/hlsl.inoutquals.frag.out @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:16 Depth: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: @@ -95,8 +95,8 @@ gl_FragCoord origin is upper left 0:? 'sampleMask' ( out int SampleMaskIn) 0:? 'sampleMask' ( temp int) 0:? Linker Objects +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) 0:? 'inpos' ( noperspective in 4-component vector of float FragCoord) 0:? 'sampleMask' ( out int SampleMaskIn) @@ -191,7 +191,7 @@ gl_FragCoord origin is upper left 0:16 Constant: 0:16 0 (const int) 0:16 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:16 Depth: direct index for structure ( temp float) 0:16 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:16 Constant: @@ -200,8 +200,8 @@ gl_FragCoord origin is upper left 0:? 'sampleMask' ( out int SampleMaskIn) 0:? 'sampleMask' ( temp int) 0:? Linker Objects +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) 0:? 'inpos' ( noperspective in 4-component vector of float FragCoord) 0:? 'sampleMask' ( out int SampleMaskIn) @@ -243,12 +243,12 @@ gl_FragCoord origin is upper left Name 72 "param" Name 74 "param" Name 78 "Color" - Name 82 "Depth" + Name 82 "@entryPointOutput_Depth" Name 86 "sampleMask" Decorate 68(inpos) NoPerspective Decorate 68(inpos) BuiltIn FragCoord Decorate 78(Color) Location 0 - Decorate 82(Depth) BuiltIn FragDepth + Decorate 82(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 86(sampleMask) BuiltIn SampleMask 2: TypeVoid 3: TypeFunction 2 @@ -275,7 +275,7 @@ gl_FragCoord origin is upper left 77: TypePointer Output 15(fvec4) 78(Color): 77(ptr) Variable Output 81: TypePointer Output 6(float) - 82(Depth): 81(ptr) Variable Output +82(@entryPointOutput_Depth): 81(ptr) Variable Output 85: TypePointer Output 17(int) 86(sampleMask): 85(ptr) Variable Output 4(main): 2 Function None 3 @@ -298,7 +298,7 @@ gl_FragCoord origin is upper left Store 78(Color) 80 83: 7(ptr) AccessChain 70(flattenTemp) 59 84: 6(float) Load 83 - Store 82(Depth) 84 + Store 82(@entryPointOutput_Depth) 84 87: 17(int) Load 71(sampleMask) Store 86(sampleMask) 87 Return diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 251d56ed..921348f5 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -158,7 +158,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -338,7 +338,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2dmsi4a' ( uniform itexture2DMSArray) 0:? 'g_tTex2dmsu4a' ( uniform utexture2DMSArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -391,7 +391,7 @@ gl_FragCoord origin is upper left Name 106 "psout" Name 117 "flattenTemp" Name 120 "Color" - Name 124 "Depth" + Name 124 "@entryPointOutput_Depth" Name 129 "g_sSamp" Decorate 14(g_tTex2dmsf4) DescriptorSet 0 MemberDecorate 20($Global) 0 Offset 0 @@ -410,7 +410,7 @@ gl_FragCoord origin is upper left Decorate 75(g_tTex2dmsi4a) DescriptorSet 0 Decorate 82(g_tTex2dmsu4a) DescriptorSet 0 Decorate 120(Color) Location 0 - Decorate 124(Depth) BuiltIn FragDepth + Decorate 124(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 129(g_sSamp) DescriptorSet 0 Decorate 129(g_sSamp) Binding 0 2: TypeVoid @@ -461,7 +461,7 @@ gl_FragCoord origin is upper left 119: TypePointer Output 7(fvec4) 120(Color): 119(ptr) Variable Output 123: TypePointer Output 6(float) - 124(Depth): 123(ptr) Variable Output +124(@entryPointOutput_Depth): 123(ptr) Variable Output 127: TypeSampler 128: TypePointer UniformConstant 127 129(g_sSamp): 128(ptr) Variable UniformConstant @@ -475,7 +475,7 @@ gl_FragCoord origin is upper left Store 120(Color) 122 125: 112(ptr) AccessChain 117(flattenTemp) 23 126: 6(float) Load 125 - Store 124(Depth) 126 + Store 124(@entryPointOutput_Depth) 126 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 78e2b2c3..281681ff 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -158,7 +158,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -187,8 +187,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -353,7 +353,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -382,8 +382,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -421,7 +421,7 @@ gl_FragCoord origin is upper left Name 89 "psout" Name 101 "flattenTemp" Name 104 "Color" - Name 108 "Depth" + Name 108 "@entryPointOutput_Depth" Name 113 "g_sSamp" Name 116 "g_tTex1df4" Name 119 "g_tTex1di4" @@ -455,7 +455,7 @@ gl_FragCoord origin is upper left Decorate 70(g_tTex2di4a) DescriptorSet 0 Decorate 80(g_tTex2du4a) DescriptorSet 0 Decorate 104(Color) Location 0 - Decorate 108(Depth) BuiltIn FragDepth + Decorate 108(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 113(g_sSamp) DescriptorSet 0 Decorate 113(g_sSamp) Binding 0 Decorate 116(g_tTex1df4) DescriptorSet 0 @@ -524,7 +524,7 @@ gl_FragCoord origin is upper left 103: TypePointer Output 7(fvec4) 104(Color): 103(ptr) Variable Output 107: TypePointer Output 6(float) - 108(Depth): 107(ptr) Variable Output +108(@entryPointOutput_Depth): 107(ptr) Variable Output 111: TypeSampler 112: TypePointer UniformConstant 111 113(g_sSamp): 112(ptr) Variable UniformConstant @@ -583,7 +583,7 @@ gl_FragCoord origin is upper left Store 104(Color) 106 109: 96(ptr) AccessChain 101(flattenTemp) 95 110: 6(float) Load 109 - Store 108(Depth) 110 + Store 108(@entryPointOutput_Depth) 110 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index 0da4048a..b849a473 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -209,7 +209,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -238,8 +238,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -455,7 +455,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -484,8 +484,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -526,7 +526,7 @@ gl_FragCoord origin is upper left Name 119 "psout" Name 130 "flattenTemp" Name 133 "Color" - Name 137 "Depth" + Name 137 "@entryPointOutput_Depth" Name 142 "g_sSamp" Name 145 "g_tTexcdf4" Name 148 "g_tTexcdi4" @@ -561,7 +561,7 @@ gl_FragCoord origin is upper left Decorate 100(g_tTex3di4) DescriptorSet 0 Decorate 110(g_tTex3du4) DescriptorSet 0 Decorate 133(Color) Location 0 - Decorate 137(Depth) BuiltIn FragDepth + Decorate 137(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 142(g_sSamp) DescriptorSet 0 Decorate 142(g_sSamp) Binding 0 Decorate 145(g_tTexcdf4) DescriptorSet 0 @@ -637,7 +637,7 @@ gl_FragCoord origin is upper left 132: TypePointer Output 7(fvec4) 133(Color): 132(ptr) Variable Output 136: TypePointer Output 6(float) - 137(Depth): 136(ptr) Variable Output +137(@entryPointOutput_Depth): 136(ptr) Variable Output 140: TypeSampler 141: TypePointer UniformConstant 140 142(g_sSamp): 141(ptr) Variable UniformConstant @@ -687,7 +687,7 @@ gl_FragCoord origin is upper left Store 133(Color) 135 138: 125(ptr) AccessChain 130(flattenTemp) 23 139: 6(float) Load 138 - Store 137(Depth) 139 + Store 137(@entryPointOutput_Depth) 139 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index e68e5f96..a1805641 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -65,7 +65,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -76,8 +76,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer) 0:? 'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -149,7 +149,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbi4' (layout( rgba32i) uniform itextureBuffer) 0:? 'g_tTexbu4' (layout( rgba32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -198,7 +198,7 @@ gl_FragCoord origin is upper left Name 51 "psout" Name 61 "flattenTemp" Name 64 "Color" - Name 68 "Depth" + Name 68 "@entryPointOutput_Depth" Name 71 "g_tTexbf4_test" Decorate 16(g_tTexbf4) DescriptorSet 0 MemberDecorate 22($Global) 0 Offset 0 @@ -214,7 +214,7 @@ gl_FragCoord origin is upper left Decorate 34(g_tTexbi4) DescriptorSet 0 Decorate 45(g_tTexbu4) DescriptorSet 0 Decorate 64(Color) Location 0 - Decorate 68(Depth) BuiltIn FragDepth + Decorate 68(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 71(g_tTexbf4_test) DescriptorSet 0 Decorate 71(g_tTexbf4_test) Binding 0 2: TypeVoid @@ -254,7 +254,7 @@ gl_FragCoord origin is upper left 63: TypePointer Output 7(fvec4) 64(Color): 63(ptr) Variable Output 67: TypePointer Output 6(float) - 68(Depth): 67(ptr) Variable Output +68(@entryPointOutput_Depth): 67(ptr) Variable Output 71(g_tTexbf4_test): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -266,7 +266,7 @@ gl_FragCoord origin is upper left Store 64(Color) 66 69: 56(ptr) AccessChain 61(flattenTemp) 55 70: 6(float) Load 69 - Store 68(Depth) 70 + Store 68(@entryPointOutput_Depth) 70 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out index ff686a31..4502b587 100644 --- a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -79,8 +79,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbis' (layout( r32i) uniform itextureBuffer) 0:? 'g_tTexbus' (layout( r32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -166,8 +166,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexbis' (layout( r32i) uniform itextureBuffer) 0:? 'g_tTexbus' (layout( r32ui) uniform utextureBuffer) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -204,7 +204,7 @@ gl_FragCoord origin is upper left Name 54 "psout" Name 64 "flattenTemp" Name 67 "Color" - Name 71 "Depth" + Name 71 "@entryPointOutput_Depth" Name 74 "g_tTexbfs_test" Decorate 16(g_tTexbfs) DescriptorSet 0 MemberDecorate 22($Global) 0 Offset 0 @@ -220,7 +220,7 @@ gl_FragCoord origin is upper left Decorate 35(g_tTexbis) DescriptorSet 0 Decorate 46(g_tTexbus) DescriptorSet 0 Decorate 67(Color) Location 0 - Decorate 71(Depth) BuiltIn FragDepth + Decorate 71(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 74(g_tTexbfs_test) DescriptorSet 0 Decorate 74(g_tTexbfs_test) Binding 0 2: TypeVoid @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 66: TypePointer Output 7(fvec4) 67(Color): 66(ptr) Variable Output 70: TypePointer Output 6(float) - 71(Depth): 70(ptr) Variable Output +71(@entryPointOutput_Depth): 70(ptr) Variable Output 74(g_tTexbfs_test): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -272,7 +272,7 @@ gl_FragCoord origin is upper left Store 67(Color) 69 72: 12(ptr) AccessChain 64(flattenTemp) 59 73: 6(float) Load 72 - Store 71(Depth) 73 + Store 71(@entryPointOutput_Depth) 73 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index 473db616..c26c3331 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -274,8 +274,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -527,7 +527,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -556,8 +556,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -599,7 +599,7 @@ gl_FragCoord origin is upper left Name 141 "psout" Name 152 "flattenTemp" Name 155 "Color" - Name 159 "Depth" + Name 159 "@entryPointOutput_Depth" Name 164 "g_sSamp" Name 167 "g_tTexcdf4" Name 170 "g_tTexcdi4" @@ -634,7 +634,7 @@ gl_FragCoord origin is upper left Decorate 118(g_tTex3di4) DescriptorSet 0 Decorate 130(g_tTex3du4) DescriptorSet 0 Decorate 155(Color) Location 0 - Decorate 159(Depth) BuiltIn FragDepth + Decorate 159(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 164(g_sSamp) DescriptorSet 0 Decorate 164(g_sSamp) Binding 0 Decorate 167(g_tTexcdf4) DescriptorSet 0 @@ -714,7 +714,7 @@ gl_FragCoord origin is upper left 154: TypePointer Output 7(fvec4) 155(Color): 154(ptr) Variable Output 158: TypePointer Output 6(float) - 159(Depth): 158(ptr) Variable Output +159(@entryPointOutput_Depth): 158(ptr) Variable Output 162: TypeSampler 163: TypePointer UniformConstant 162 164(g_sSamp): 163(ptr) Variable UniformConstant @@ -764,7 +764,7 @@ gl_FragCoord origin is upper left Store 155(Color) 157 160: 147(ptr) AccessChain 152(flattenTemp) 23 161: 6(float) Load 160 - Store 159(Depth) 161 + Store 159(@entryPointOutput_Depth) 161 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 4b6a09f0..2a9b586f 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -211,8 +211,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -401,7 +401,7 @@ gl_FragCoord origin is upper left 0:48 Constant: 0:48 0 (const int) 0:48 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:48 Depth: direct index for structure ( temp float) 0:48 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:48 Constant: @@ -430,8 +430,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -470,7 +470,7 @@ gl_FragCoord origin is upper left Name 104 "psout" Name 116 "flattenTemp" Name 119 "Color" - Name 123 "Depth" + Name 123 "@entryPointOutput_Depth" Name 128 "g_sSamp" Name 131 "g_tTex1df4" Name 134 "g_tTex1di4" @@ -504,7 +504,7 @@ gl_FragCoord origin is upper left Decorate 81(g_tTex2di4a) DescriptorSet 0 Decorate 93(g_tTex2du4a) DescriptorSet 0 Decorate 119(Color) Location 0 - Decorate 123(Depth) BuiltIn FragDepth + Decorate 123(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 128(g_sSamp) DescriptorSet 0 Decorate 128(g_sSamp) Binding 0 Decorate 131(g_tTex1df4) DescriptorSet 0 @@ -576,7 +576,7 @@ gl_FragCoord origin is upper left 118: TypePointer Output 7(fvec4) 119(Color): 118(ptr) Variable Output 122: TypePointer Output 6(float) - 123(Depth): 122(ptr) Variable Output +123(@entryPointOutput_Depth): 122(ptr) Variable Output 126: TypeSampler 127: TypePointer UniformConstant 126 128(g_sSamp): 127(ptr) Variable UniformConstant @@ -635,7 +635,7 @@ gl_FragCoord origin is upper left Store 119(Color) 121 124: 111(ptr) AccessChain 116(flattenTemp) 110 125: 6(float) Load 124 - Store 123(Depth) 125 + Store 123(@entryPointOutput_Depth) 125 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out index 884ed8f6..c6964c39 100644 --- a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out @@ -74,7 +74,7 @@ gl_FragCoord origin is upper left 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -97,8 +97,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -202,8 +202,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -240,7 +240,7 @@ gl_FragCoord origin is upper left Name 68 "psout" Name 79 "flattenTemp" Name 82 "Color" - Name 86 "Depth" + Name 86 "@entryPointOutput_Depth" Name 91 "g_sSamp" Name 94 "g_tTex1df4" Name 97 "g_tTex1di4" @@ -268,7 +268,7 @@ gl_FragCoord origin is upper left Decorate 55(g_tTex2di4a) DescriptorSet 0 Decorate 62(g_tTex2du4a) DescriptorSet 0 Decorate 82(Color) Location 0 - Decorate 86(Depth) BuiltIn FragDepth + Decorate 86(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 91(g_sSamp) DescriptorSet 0 Decorate 91(g_sSamp) Binding 0 Decorate 94(g_tTex1df4) DescriptorSet 0 @@ -327,7 +327,7 @@ gl_FragCoord origin is upper left 81: TypePointer Output 7(fvec4) 82(Color): 81(ptr) Variable Output 85: TypePointer Output 6(float) - 86(Depth): 85(ptr) Variable Output +86(@entryPointOutput_Depth): 85(ptr) Variable Output 89: TypeSampler 90: TypePointer UniformConstant 89 91(g_sSamp): 90(ptr) Variable UniformConstant @@ -368,7 +368,7 @@ gl_FragCoord origin is upper left Store 82(Color) 84 87: 74(ptr) AccessChain 79(flattenTemp) 23 88: 6(float) Load 87 - Store 86(Depth) 88 + Store 86(@entryPointOutput_Depth) 88 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out index 30618671..9623c418 100644 --- a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out +++ b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out @@ -92,7 +92,7 @@ gl_FragCoord origin is upper left 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -115,8 +115,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -215,7 +215,7 @@ gl_FragCoord origin is upper left 0:40 Constant: 0:40 0 (const int) 0:40 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:40 Depth: direct index for structure ( temp float) 0:40 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:40 Constant: @@ -238,8 +238,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2di4a' (layout( rgba32i) uniform iimage2DArray) 0:? 'g_tTex2du4a' (layout( rgba32ui) uniform uimage2DArray) 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform int c1, uniform 2-component vector of int c2, uniform 3-component vector of int c3, uniform 4-component vector of int c4, uniform int o1, uniform 2-component vector of int o2, uniform 3-component vector of int o3, uniform 4-component vector of int o4}) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -279,7 +279,7 @@ gl_FragCoord origin is upper left Name 91 "psout" Name 101 "flattenTemp" Name 104 "Color" - Name 108 "Depth" + Name 108 "@entryPointOutput_Depth" Name 113 "g_sSamp" Name 116 "g_tTex1df4a" Name 119 "g_tTex1di4a" @@ -308,7 +308,7 @@ gl_FragCoord origin is upper left Decorate 78(g_tTex3di4) DescriptorSet 0 Decorate 85(g_tTex3du4) DescriptorSet 0 Decorate 104(Color) Location 0 - Decorate 108(Depth) BuiltIn FragDepth + Decorate 108(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 113(g_sSamp) DescriptorSet 0 Decorate 113(g_sSamp) Binding 0 Decorate 116(g_tTex1df4a) DescriptorSet 0 @@ -373,7 +373,7 @@ gl_FragCoord origin is upper left 103: TypePointer Output 7(fvec4) 104(Color): 103(ptr) Variable Output 107: TypePointer Output 6(float) - 108(Depth): 107(ptr) Variable Output +108(@entryPointOutput_Depth): 107(ptr) Variable Output 111: TypeSampler 112: TypePointer UniformConstant 111 113(g_sSamp): 112(ptr) Variable UniformConstant @@ -405,7 +405,7 @@ gl_FragCoord origin is upper left Store 104(Color) 106 109: 96(ptr) AccessChain 101(flattenTemp) 48 110: 6(float) Load 109 - Store 108(Depth) 110 + Store 108(@entryPointOutput_Depth) 110 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out index 727fdd06..7b9f2e65 100644 --- a/Test/baseResults/hlsl.pp.line.frag.out +++ b/Test/baseResults/hlsl.pp.line.frag.out @@ -47,14 +47,14 @@ gl_FragCoord origin is upper left 0:4 Constant: 0:4 0 (const int) 0:4 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:4 Depth: direct index for structure ( temp float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 1 (const int) 0:? Linker Objects +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -108,14 +108,14 @@ gl_FragCoord origin is upper left 0:4 Constant: 0:4 0 (const int) 0:4 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:4 Depth: direct index for structure ( temp float) 0:4 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:4 Constant: 0:4 1 (const int) 0:? Linker Objects +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -136,9 +136,9 @@ gl_FragCoord origin is upper left Name 17 "psout" Name 32 "flattenTemp" Name 35 "Color" - Name 39 "Depth" + Name 39 "@entryPointOutput_Depth" Decorate 35(Color) Location 0 - Decorate 39(Depth) BuiltIn FragDepth + Decorate 39(@entryPointOutput_Depth) BuiltIn FragDepth 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 @@ -158,7 +158,7 @@ gl_FragCoord origin is upper left 34: TypePointer Output 7(fvec4) 35(Color): 34(ptr) Variable Output 38: TypePointer Output 6(float) - 39(Depth): 38(ptr) Variable Output +39(@entryPointOutput_Depth): 38(ptr) Variable Output 4(main): 2 Function None 3 5: Label 32(flattenTemp): 16(ptr) Variable Function @@ -169,7 +169,7 @@ gl_FragCoord origin is upper left Store 35(Color) 37 40: 27(ptr) AccessChain 32(flattenTemp) 26 41: 6(float) Load 40 - Store 39(Depth) 41 + Store 39(@entryPointOutput_Depth) 41 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 1ac123ef..55edf367 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -137,7 +137,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -154,8 +154,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -299,7 +299,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -316,8 +316,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -358,7 +358,7 @@ gl_FragCoord origin is upper left Name 125 "psout" Name 135 "flattenTemp" Name 138 "Color" - Name 142 "Depth" + Name 142 "@entryPointOutput_Depth" Name 145 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -373,7 +373,7 @@ gl_FragCoord origin is upper left Decorate 104(g_tTexcdi4) DescriptorSet 0 Decorate 114(g_tTexcdu4) DescriptorSet 0 Decorate 138(Color) Location 0 - Decorate 142(Depth) BuiltIn FragDepth + Decorate 142(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 145(g_tTex1df4a) DescriptorSet 0 Decorate 145(g_tTex1df4a) Binding 1 2: TypeVoid @@ -457,7 +457,7 @@ gl_FragCoord origin is upper left 137: TypePointer Output 7(fvec4) 138(Color): 137(ptr) Variable Output 141: TypePointer Output 6(float) - 142(Depth): 141(ptr) Variable Output +142(@entryPointOutput_Depth): 141(ptr) Variable Output 145(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -469,7 +469,7 @@ gl_FragCoord origin is upper left Store 138(Color) 140 143: 130(ptr) AccessChain 135(flattenTemp) 129 144: 6(float) Load 143 - Store 142(Depth) 144 + Store 142(@entryPointOutput_Depth) 144 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 61abf2af..edebe77e 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -247,7 +247,7 @@ gl_FragCoord origin is upper left 0:53 Constant: 0:53 0 (const int) 0:53 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:53 Depth: direct index for structure ( temp float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: @@ -269,8 +269,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -522,7 +522,7 @@ gl_FragCoord origin is upper left 0:53 Constant: 0:53 0 (const int) 0:53 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:53 Depth: direct index for structure ( temp float) 0:53 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:53 Constant: @@ -544,8 +544,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -605,7 +605,7 @@ gl_FragCoord origin is upper left Name 176 "psout" Name 185 "flattenTemp" Name 188 "Color" - Name 192 "Depth" + Name 192 "@entryPointOutput_Depth" Name 195 "g_sSamp2d" Name 196 "g_sSamp2D_b" Name 197 "g_tTex1df4a" @@ -625,7 +625,7 @@ gl_FragCoord origin is upper left Decorate 160(g_tTexcdi4) DescriptorSet 0 Decorate 169(g_tTexcdu4) DescriptorSet 0 Decorate 188(Color) Location 0 - Decorate 192(Depth) BuiltIn FragDepth + Decorate 192(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 195(g_sSamp2d) DescriptorSet 0 Decorate 196(g_sSamp2D_b) DescriptorSet 0 Decorate 197(g_tTex1df4a) DescriptorSet 0 @@ -733,7 +733,7 @@ gl_FragCoord origin is upper left 187: TypePointer Output 7(fvec4) 188(Color): 187(ptr) Variable Output 191: TypePointer Output 6(float) - 192(Depth): 191(ptr) Variable Output +192(@entryPointOutput_Depth): 191(ptr) Variable Output 195(g_sSamp2d): 48(ptr) Variable UniformConstant 196(g_sSamp2D_b): 48(ptr) Variable UniformConstant 197(g_tTex1df4a): 44(ptr) Variable UniformConstant @@ -747,7 +747,7 @@ gl_FragCoord origin is upper left Store 188(Color) 190 193: 180(ptr) AccessChain 185(flattenTemp) 16 194: 6(float) Load 193 - Store 192(Depth) 194 + Store 192(@entryPointOutput_Depth) 194 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index f6bfb8d8..71fd1c09 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -175,8 +175,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -338,7 +338,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -358,8 +358,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -399,7 +399,7 @@ gl_FragCoord origin is upper left Name 132 "psout" Name 141 "flattenTemp" Name 144 "Color" - Name 148 "Depth" + Name 148 "@entryPointOutput_Depth" Name 151 "g_tTex1df4a" Name 154 "g_tTexcdf4" Name 157 "g_tTexcdi4" @@ -417,7 +417,7 @@ gl_FragCoord origin is upper left Decorate 109(g_tTex3di4) DescriptorSet 0 Decorate 120(g_tTex3du4) DescriptorSet 0 Decorate 144(Color) Location 0 - Decorate 148(Depth) BuiltIn FragDepth + Decorate 148(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 151(g_tTex1df4a) DescriptorSet 0 Decorate 151(g_tTex1df4a) Binding 1 Decorate 154(g_tTexcdf4) DescriptorSet 0 @@ -510,7 +510,7 @@ gl_FragCoord origin is upper left 143: TypePointer Output 7(fvec4) 144(Color): 143(ptr) Variable Output 147: TypePointer Output 6(float) - 148(Depth): 147(ptr) Variable Output +148(@entryPointOutput_Depth): 147(ptr) Variable Output 151(g_tTex1df4a): 15(ptr) Variable UniformConstant 152: TypeImage 6(float) Cube sampled format:Unknown 153: TypePointer UniformConstant 152 @@ -531,7 +531,7 @@ gl_FragCoord origin is upper left Store 144(Color) 146 149: 136(ptr) AccessChain 141(flattenTemp) 26 150: 6(float) Load 149 - Store 148(Depth) 150 + Store 148(@entryPointOutput_Depth) 150 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index c08ec5cf..0df1b9b6 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -116,7 +116,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -130,8 +130,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -254,7 +254,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -268,8 +268,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -303,7 +303,7 @@ gl_FragCoord origin is upper left Name 98 "psout" Name 107 "flattenTemp" Name 110 "Color" - Name 114 "Depth" + Name 114 "@entryPointOutput_Depth" Name 117 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -315,7 +315,7 @@ gl_FragCoord origin is upper left Decorate 76(g_tTex2di4) DescriptorSet 0 Decorate 87(g_tTex2du4) DescriptorSet 0 Decorate 110(Color) Location 0 - Decorate 114(Depth) BuiltIn FragDepth + Decorate 114(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 117(g_tTex1df4a) DescriptorSet 0 Decorate 117(g_tTex1df4a) Binding 1 2: TypeVoid @@ -386,7 +386,7 @@ gl_FragCoord origin is upper left 109: TypePointer Output 7(fvec4) 110(Color): 109(ptr) Variable Output 113: TypePointer Output 6(float) - 114(Depth): 113(ptr) Variable Output +114(@entryPointOutput_Depth): 113(ptr) Variable Output 117(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -398,7 +398,7 @@ gl_FragCoord origin is upper left Store 110(Color) 112 115: 102(ptr) AccessChain 107(flattenTemp) 43 116: 6(float) Load 115 - Store 114(Depth) 116 + Store 114(@entryPointOutput_Depth) 116 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index afed0a40..74cab441 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -335,7 +335,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -394,7 +394,7 @@ gl_FragCoord origin is upper left Name 125 "psout" Name 135 "flattenTemp" Name 138 "Color" - Name 142 "Depth" + Name 142 "@entryPointOutput_Depth" Name 145 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -409,7 +409,7 @@ gl_FragCoord origin is upper left Decorate 104(g_tTexcdi4) DescriptorSet 0 Decorate 114(g_tTexcdu4) DescriptorSet 0 Decorate 138(Color) Location 0 - Decorate 142(Depth) BuiltIn FragDepth + Decorate 142(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 145(g_tTex1df4a) DescriptorSet 0 Decorate 145(g_tTex1df4a) Binding 1 2: TypeVoid @@ -493,7 +493,7 @@ gl_FragCoord origin is upper left 137: TypePointer Output 7(fvec4) 138(Color): 137(ptr) Variable Output 141: TypePointer Output 6(float) - 142(Depth): 141(ptr) Variable Output +142(@entryPointOutput_Depth): 141(ptr) Variable Output 145(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -505,7 +505,7 @@ gl_FragCoord origin is upper left Store 138(Color) 140 143: 130(ptr) AccessChain 135(flattenTemp) 129 144: 6(float) Load 143 - Store 142(Depth) 144 + Store 142(@entryPointOutput_Depth) 144 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index cff271fb..1a1caf8e 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -185,7 +185,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -205,8 +205,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -398,7 +398,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -418,8 +418,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -465,7 +465,7 @@ gl_FragCoord origin is upper left Name 148 "psout" Name 159 "flattenTemp" Name 162 "Color" - Name 166 "Depth" + Name 166 "@entryPointOutput_Depth" Name 169 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -483,7 +483,7 @@ gl_FragCoord origin is upper left Decorate 132(g_tTexcdi4) DescriptorSet 0 Decorate 141(g_tTexcdu4) DescriptorSet 0 Decorate 162(Color) Location 0 - Decorate 166(Depth) BuiltIn FragDepth + Decorate 166(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 169(g_tTex1df4a) DescriptorSet 0 Decorate 169(g_tTex1df4a) Binding 1 2: TypeVoid @@ -576,7 +576,7 @@ gl_FragCoord origin is upper left 161: TypePointer Output 7(fvec4) 162(Color): 161(ptr) Variable Output 165: TypePointer Output 6(float) - 166(Depth): 165(ptr) Variable Output +166(@entryPointOutput_Depth): 165(ptr) Variable Output 169(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -588,7 +588,7 @@ gl_FragCoord origin is upper left Store 162(Color) 164 167: 154(ptr) AccessChain 159(flattenTemp) 153 168: 6(float) Load 167 - Store 166(Depth) 168 + Store 166(@entryPointOutput_Depth) 168 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index b05d1d75..73efb361 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -173,7 +173,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -374,7 +374,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -394,8 +394,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -435,7 +435,7 @@ gl_FragCoord origin is upper left Name 132 "psout" Name 141 "flattenTemp" Name 144 "Color" - Name 148 "Depth" + Name 148 "@entryPointOutput_Depth" Name 151 "g_tTex1df4a" Name 154 "g_tTexcdf4" Name 157 "g_tTexcdi4" @@ -453,7 +453,7 @@ gl_FragCoord origin is upper left Decorate 109(g_tTex3di4) DescriptorSet 0 Decorate 120(g_tTex3du4) DescriptorSet 0 Decorate 144(Color) Location 0 - Decorate 148(Depth) BuiltIn FragDepth + Decorate 148(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 151(g_tTex1df4a) DescriptorSet 0 Decorate 151(g_tTex1df4a) Binding 1 Decorate 154(g_tTexcdf4) DescriptorSet 0 @@ -546,7 +546,7 @@ gl_FragCoord origin is upper left 143: TypePointer Output 7(fvec4) 144(Color): 143(ptr) Variable Output 147: TypePointer Output 6(float) - 148(Depth): 147(ptr) Variable Output +148(@entryPointOutput_Depth): 147(ptr) Variable Output 151(g_tTex1df4a): 15(ptr) Variable UniformConstant 152: TypeImage 6(float) Cube sampled format:Unknown 153: TypePointer UniformConstant 152 @@ -567,7 +567,7 @@ gl_FragCoord origin is upper left Store 144(Color) 146 149: 136(ptr) AccessChain 141(flattenTemp) 27 150: 6(float) Load 149 - Store 148(Depth) 150 + Store 148(@entryPointOutput_Depth) 150 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index e7187435..889c68eb 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -128,7 +128,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -278,7 +278,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -292,8 +292,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -327,7 +327,7 @@ gl_FragCoord origin is upper left Name 98 "psout" Name 107 "flattenTemp" Name 110 "Color" - Name 114 "Depth" + Name 114 "@entryPointOutput_Depth" Name 117 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -339,7 +339,7 @@ gl_FragCoord origin is upper left Decorate 77(g_tTex2di4) DescriptorSet 0 Decorate 87(g_tTex2du4) DescriptorSet 0 Decorate 110(Color) Location 0 - Decorate 114(Depth) BuiltIn FragDepth + Decorate 114(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 117(g_tTex1df4a) DescriptorSet 0 Decorate 117(g_tTex1df4a) Binding 1 2: TypeVoid @@ -410,7 +410,7 @@ gl_FragCoord origin is upper left 109: TypePointer Output 7(fvec4) 110(Color): 109(ptr) Variable Output 113: TypePointer Output 6(float) - 114(Depth): 113(ptr) Variable Output +114(@entryPointOutput_Depth): 113(ptr) Variable Output 117(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -422,7 +422,7 @@ gl_FragCoord origin is upper left Store 110(Color) 112 115: 102(ptr) AccessChain 107(flattenTemp) 44 116: 6(float) Load 115 - Store 114(Depth) 116 + Store 114(@entryPointOutput_Depth) 116 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index 1ddff1a7..18517b4f 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -164,7 +164,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -192,8 +192,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -364,7 +364,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -392,8 +392,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -434,7 +434,7 @@ gl_FragCoord origin is upper left Name 161 "psout" Name 172 "flattenTemp" Name 175 "Color" - Name 179 "Depth" + Name 179 "@entryPointOutput_Depth" Name 184 "g_tTex1df4" Name 187 "g_tTex1di4" Name 190 "g_tTex1du4" @@ -459,7 +459,7 @@ gl_FragCoord origin is upper left Decorate 133(g_tTexcdi4a) DescriptorSet 0 Decorate 148(g_tTexcdu4a) DescriptorSet 0 Decorate 175(Color) Location 0 - Decorate 179(Depth) BuiltIn FragDepth + Decorate 179(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 184(g_tTex1df4) DescriptorSet 0 Decorate 184(g_tTex1df4) Binding 0 Decorate 187(g_tTex1di4) DescriptorSet 0 @@ -549,7 +549,7 @@ gl_FragCoord origin is upper left 174: TypePointer Output 7(fvec4) 175(Color): 174(ptr) Variable Output 178: TypePointer Output 6(float) - 179(Depth): 178(ptr) Variable Output +179(@entryPointOutput_Depth): 178(ptr) Variable Output 182: TypeImage 6(float) 1D sampled format:Unknown 183: TypePointer UniformConstant 182 184(g_tTex1df4): 183(ptr) Variable UniformConstant @@ -596,7 +596,7 @@ gl_FragCoord origin is upper left Store 175(Color) 177 180: 12(ptr) AccessChain 172(flattenTemp) 167 181: 6(float) Load 180 - Store 179(Depth) 181 + Store 179(@entryPointOutput_Depth) 181 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index 373423a7..eb4bd14e 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -183,8 +183,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -346,7 +346,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -374,8 +374,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -416,7 +416,7 @@ gl_FragCoord origin is upper left Name 150 "psout" Name 161 "flattenTemp" Name 164 "Color" - Name 168 "Depth" + Name 168 "@entryPointOutput_Depth" Name 173 "g_tTex3df4" Name 176 "g_tTex3di4" Name 179 "g_tTex3du4" @@ -442,7 +442,7 @@ gl_FragCoord origin is upper left Decorate 122(g_tTexcdi4) DescriptorSet 0 Decorate 137(g_tTexcdu4) DescriptorSet 0 Decorate 164(Color) Location 0 - Decorate 168(Depth) BuiltIn FragDepth + Decorate 168(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 173(g_tTex3df4) DescriptorSet 0 Decorate 176(g_tTex3di4) DescriptorSet 0 Decorate 179(g_tTex3du4) DescriptorSet 0 @@ -529,7 +529,7 @@ gl_FragCoord origin is upper left 163: TypePointer Output 7(fvec4) 164(Color): 163(ptr) Variable Output 167: TypePointer Output 6(float) - 168(Depth): 167(ptr) Variable Output +168(@entryPointOutput_Depth): 167(ptr) Variable Output 171: TypeImage 6(float) 3D sampled format:Unknown 172: TypePointer UniformConstant 171 173(g_tTex3df4): 172(ptr) Variable UniformConstant @@ -576,7 +576,7 @@ gl_FragCoord origin is upper left Store 164(Color) 166 169: 12(ptr) AccessChain 161(flattenTemp) 156 170: 6(float) Load 169 - Store 168(Depth) 170 + Store 168(@entryPointOutput_Depth) 170 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index 290c8b49..eb54c746 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -128,7 +128,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -156,8 +156,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -292,7 +292,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -320,8 +320,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -356,7 +356,7 @@ gl_FragCoord origin is upper left Name 107 "psout" Name 118 "flattenTemp" Name 121 "Color" - Name 125 "Depth" + Name 125 "@entryPointOutput_Depth" Name 130 "g_tTex3df4" Name 133 "g_tTex3di4" Name 136 "g_tTex3du4" @@ -382,7 +382,7 @@ gl_FragCoord origin is upper left Decorate 81(g_tTex2di4) DescriptorSet 0 Decorate 95(g_tTex2du4) DescriptorSet 0 Decorate 121(Color) Location 0 - Decorate 125(Depth) BuiltIn FragDepth + Decorate 125(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 130(g_tTex3df4) DescriptorSet 0 Decorate 133(g_tTex3di4) DescriptorSet 0 Decorate 136(g_tTex3du4) DescriptorSet 0 @@ -459,7 +459,7 @@ gl_FragCoord origin is upper left 120: TypePointer Output 7(fvec4) 121(Color): 120(ptr) Variable Output 124: TypePointer Output 6(float) - 125(Depth): 124(ptr) Variable Output +125(@entryPointOutput_Depth): 124(ptr) Variable Output 128: TypeImage 6(float) 3D sampled format:Unknown 129: TypePointer UniformConstant 128 130(g_tTex3df4): 129(ptr) Variable UniformConstant @@ -515,7 +515,7 @@ gl_FragCoord origin is upper left Store 121(Color) 123 126: 12(ptr) AccessChain 118(flattenTemp) 113 127: 6(float) Load 126 - Store 125(Depth) 127 + Store 125(@entryPointOutput_Depth) 127 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index ed401028..ad452c42 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -134,7 +134,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -162,8 +162,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -304,7 +304,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -332,8 +332,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -368,7 +368,7 @@ gl_FragCoord origin is upper left Name 118 "psout" Name 129 "flattenTemp" Name 132 "Color" - Name 136 "Depth" + Name 136 "@entryPointOutput_Depth" Name 141 "g_tTex1df4" Name 144 "g_tTex1di4" Name 147 "g_tTex1du4" @@ -393,7 +393,7 @@ gl_FragCoord origin is upper left Decorate 90(g_tTex2di4a) DescriptorSet 0 Decorate 105(g_tTex2du4a) DescriptorSet 0 Decorate 132(Color) Location 0 - Decorate 136(Depth) BuiltIn FragDepth + Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 141(g_tTex1df4) DescriptorSet 0 Decorate 141(g_tTex1df4) Binding 0 Decorate 144(g_tTex1di4) DescriptorSet 0 @@ -473,7 +473,7 @@ gl_FragCoord origin is upper left 131: TypePointer Output 7(fvec4) 132(Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) - 136(Depth): 135(ptr) Variable Output +136(@entryPointOutput_Depth): 135(ptr) Variable Output 139: TypeImage 6(float) 1D sampled format:Unknown 140: TypePointer UniformConstant 139 141(g_tTex1df4): 140(ptr) Variable UniformConstant @@ -529,7 +529,7 @@ gl_FragCoord origin is upper left Store 132(Color) 134 137: 12(ptr) AccessChain 129(flattenTemp) 124 138: 6(float) Load 137 - Store 136(Depth) 138 + Store 136(@entryPointOutput_Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index beae0822..8d560100 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -210,8 +210,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -400,7 +400,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -428,8 +428,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -470,7 +470,7 @@ gl_FragCoord origin is upper left Name 162 "psout" Name 173 "flattenTemp" Name 176 "Color" - Name 180 "Depth" + Name 180 "@entryPointOutput_Depth" Name 185 "g_tTex1df4" Name 188 "g_tTex1di4" Name 191 "g_tTex1du4" @@ -495,7 +495,7 @@ gl_FragCoord origin is upper left Decorate 134(g_tTexcdi4a) DescriptorSet 0 Decorate 149(g_tTexcdu4a) DescriptorSet 0 Decorate 176(Color) Location 0 - Decorate 180(Depth) BuiltIn FragDepth + Decorate 180(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 185(g_tTex1df4) DescriptorSet 0 Decorate 185(g_tTex1df4) Binding 0 Decorate 188(g_tTex1di4) DescriptorSet 0 @@ -586,7 +586,7 @@ gl_FragCoord origin is upper left 175: TypePointer Output 7(fvec4) 176(Color): 175(ptr) Variable Output 179: TypePointer Output 6(float) - 180(Depth): 179(ptr) Variable Output +180(@entryPointOutput_Depth): 179(ptr) Variable Output 183: TypeImage 6(float) 1D sampled format:Unknown 184: TypePointer UniformConstant 183 185(g_tTex1df4): 184(ptr) Variable UniformConstant @@ -633,7 +633,7 @@ gl_FragCoord origin is upper left Store 176(Color) 178 181: 12(ptr) AccessChain 173(flattenTemp) 168 182: 6(float) Load 181 - Store 180(Depth) 182 + Store 180(@entryPointOutput_Depth) 182 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 9d2802db..7847b806 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -173,7 +173,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -201,8 +201,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -382,7 +382,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -410,8 +410,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -452,7 +452,7 @@ gl_FragCoord origin is upper left Name 151 "psout" Name 162 "flattenTemp" Name 165 "Color" - Name 169 "Depth" + Name 169 "@entryPointOutput_Depth" Name 174 "g_tTex3df4" Name 177 "g_tTex3di4" Name 180 "g_tTex3du4" @@ -478,7 +478,7 @@ gl_FragCoord origin is upper left Decorate 123(g_tTexcdi4) DescriptorSet 0 Decorate 138(g_tTexcdu4) DescriptorSet 0 Decorate 165(Color) Location 0 - Decorate 169(Depth) BuiltIn FragDepth + Decorate 169(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 174(g_tTex3df4) DescriptorSet 0 Decorate 177(g_tTex3di4) DescriptorSet 0 Decorate 180(g_tTex3du4) DescriptorSet 0 @@ -566,7 +566,7 @@ gl_FragCoord origin is upper left 164: TypePointer Output 7(fvec4) 165(Color): 164(ptr) Variable Output 168: TypePointer Output 6(float) - 169(Depth): 168(ptr) Variable Output +169(@entryPointOutput_Depth): 168(ptr) Variable Output 172: TypeImage 6(float) 3D sampled format:Unknown 173: TypePointer UniformConstant 172 174(g_tTex3df4): 173(ptr) Variable UniformConstant @@ -613,7 +613,7 @@ gl_FragCoord origin is upper left Store 165(Color) 167 170: 12(ptr) AccessChain 162(flattenTemp) 157 171: 6(float) Load 170 - Store 169(Depth) 171 + Store 169(@entryPointOutput_Depth) 171 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index 2e30e7c3..d9ce3f68 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -140,7 +140,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -168,8 +168,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -316,7 +316,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -344,8 +344,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -380,7 +380,7 @@ gl_FragCoord origin is upper left Name 108 "psout" Name 119 "flattenTemp" Name 122 "Color" - Name 126 "Depth" + Name 126 "@entryPointOutput_Depth" Name 131 "g_tTex3df4" Name 134 "g_tTex3di4" Name 137 "g_tTex3du4" @@ -406,7 +406,7 @@ gl_FragCoord origin is upper left Decorate 82(g_tTex2di4) DescriptorSet 0 Decorate 96(g_tTex2du4) DescriptorSet 0 Decorate 122(Color) Location 0 - Decorate 126(Depth) BuiltIn FragDepth + Decorate 126(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 131(g_tTex3df4) DescriptorSet 0 Decorate 134(g_tTex3di4) DescriptorSet 0 Decorate 137(g_tTex3du4) DescriptorSet 0 @@ -484,7 +484,7 @@ gl_FragCoord origin is upper left 121: TypePointer Output 7(fvec4) 122(Color): 121(ptr) Variable Output 125: TypePointer Output 6(float) - 126(Depth): 125(ptr) Variable Output +126(@entryPointOutput_Depth): 125(ptr) Variable Output 129: TypeImage 6(float) 3D sampled format:Unknown 130: TypePointer UniformConstant 129 131(g_tTex3df4): 130(ptr) Variable UniformConstant @@ -540,7 +540,7 @@ gl_FragCoord origin is upper left Store 122(Color) 124 127: 12(ptr) AccessChain 119(flattenTemp) 114 128: 6(float) Load 127 - Store 126(Depth) 128 + Store 126(@entryPointOutput_Depth) 128 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index eda17f2a..1b457c93 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -146,7 +146,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -174,8 +174,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -328,7 +328,7 @@ gl_FragCoord origin is upper left 0:38 Constant: 0:38 0 (const int) 0:38 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:38 Depth: direct index for structure ( temp float) 0:38 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:38 Constant: @@ -356,8 +356,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -392,7 +392,7 @@ gl_FragCoord origin is upper left Name 119 "psout" Name 130 "flattenTemp" Name 133 "Color" - Name 137 "Depth" + Name 137 "@entryPointOutput_Depth" Name 142 "g_tTex1df4" Name 145 "g_tTex1di4" Name 148 "g_tTex1du4" @@ -417,7 +417,7 @@ gl_FragCoord origin is upper left Decorate 91(g_tTex2di4a) DescriptorSet 0 Decorate 106(g_tTex2du4a) DescriptorSet 0 Decorate 133(Color) Location 0 - Decorate 137(Depth) BuiltIn FragDepth + Decorate 137(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 142(g_tTex1df4) DescriptorSet 0 Decorate 142(g_tTex1df4) Binding 0 Decorate 145(g_tTex1di4) DescriptorSet 0 @@ -498,7 +498,7 @@ gl_FragCoord origin is upper left 132: TypePointer Output 7(fvec4) 133(Color): 132(ptr) Variable Output 136: TypePointer Output 6(float) - 137(Depth): 136(ptr) Variable Output +137(@entryPointOutput_Depth): 136(ptr) Variable Output 140: TypeImage 6(float) 1D sampled format:Unknown 141: TypePointer UniformConstant 140 142(g_tTex1df4): 141(ptr) Variable UniformConstant @@ -554,7 +554,7 @@ gl_FragCoord origin is upper left Store 133(Color) 135 138: 12(ptr) AccessChain 130(flattenTemp) 125 139: 6(float) Load 138 - Store 137(Depth) 139 + Store 137(@entryPointOutput_Depth) 139 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 03449f8e..0486f02a 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -191,7 +191,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -208,8 +208,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -407,7 +407,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -424,8 +424,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -466,7 +466,7 @@ gl_FragCoord origin is upper left Name 118 "psout" Name 129 "flattenTemp" Name 132 "Color" - Name 136 "Depth" + Name 136 "@entryPointOutput_Depth" Name 139 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -481,7 +481,7 @@ gl_FragCoord origin is upper left Decorate 102(g_tTexcdi4) DescriptorSet 0 Decorate 111(g_tTexcdu4) DescriptorSet 0 Decorate 132(Color) Location 0 - Decorate 136(Depth) BuiltIn FragDepth + Decorate 136(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 139(g_tTex1df4a) DescriptorSet 0 Decorate 139(g_tTex1df4a) Binding 1 2: TypeVoid @@ -559,7 +559,7 @@ gl_FragCoord origin is upper left 131: TypePointer Output 7(fvec4) 132(Color): 131(ptr) Variable Output 135: TypePointer Output 6(float) - 136(Depth): 135(ptr) Variable Output +136(@entryPointOutput_Depth): 135(ptr) Variable Output 139(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -571,7 +571,7 @@ gl_FragCoord origin is upper left Store 132(Color) 134 137: 124(ptr) AccessChain 129(flattenTemp) 123 138: 6(float) Load 137 - Store 136(Depth) 138 + Store 136(@entryPointOutput_Depth) 138 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 42a27bfc..82fd7208 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -239,7 +239,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -259,8 +259,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -506,7 +506,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -526,8 +526,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -573,7 +573,7 @@ gl_FragCoord origin is upper left Name 153 "psout" Name 164 "flattenTemp" Name 167 "Color" - Name 171 "Depth" + Name 171 "@entryPointOutput_Depth" Name 174 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -591,7 +591,7 @@ gl_FragCoord origin is upper left Decorate 137(g_tTexcdi4) DescriptorSet 0 Decorate 146(g_tTexcdu4) DescriptorSet 0 Decorate 167(Color) Location 0 - Decorate 171(Depth) BuiltIn FragDepth + Decorate 171(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 174(g_tTex1df4a) DescriptorSet 0 Decorate 174(g_tTex1df4a) Binding 1 2: TypeVoid @@ -689,7 +689,7 @@ gl_FragCoord origin is upper left 166: TypePointer Output 7(fvec4) 167(Color): 166(ptr) Variable Output 170: TypePointer Output 6(float) - 171(Depth): 170(ptr) Variable Output +171(@entryPointOutput_Depth): 170(ptr) Variable Output 174(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -701,7 +701,7 @@ gl_FragCoord origin is upper left Store 167(Color) 169 172: 159(ptr) AccessChain 164(flattenTemp) 158 173: 6(float) Load 172 - Store 171(Depth) 173 + Store 171(@entryPointOutput_Depth) 173 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 4b4e7181..43fb5f27 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -209,7 +209,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -229,8 +229,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -446,7 +446,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -466,8 +466,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -507,7 +507,7 @@ gl_FragCoord origin is upper left Name 137 "psout" Name 146 "flattenTemp" Name 149 "Color" - Name 153 "Depth" + Name 153 "@entryPointOutput_Depth" Name 156 "g_tTex1df4a" Name 159 "g_tTexcdf4" Name 162 "g_tTexcdi4" @@ -525,7 +525,7 @@ gl_FragCoord origin is upper left Decorate 114(g_tTex3di4) DescriptorSet 0 Decorate 125(g_tTex3du4) DescriptorSet 0 Decorate 149(Color) Location 0 - Decorate 153(Depth) BuiltIn FragDepth + Decorate 153(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 156(g_tTex1df4a) DescriptorSet 0 Decorate 156(g_tTex1df4a) Binding 1 Decorate 159(g_tTexcdf4) DescriptorSet 0 @@ -623,7 +623,7 @@ gl_FragCoord origin is upper left 148: TypePointer Output 7(fvec4) 149(Color): 148(ptr) Variable Output 152: TypePointer Output 6(float) - 153(Depth): 152(ptr) Variable Output +153(@entryPointOutput_Depth): 152(ptr) Variable Output 156(g_tTex1df4a): 15(ptr) Variable UniformConstant 157: TypeImage 6(float) Cube sampled format:Unknown 158: TypePointer UniformConstant 157 @@ -644,7 +644,7 @@ gl_FragCoord origin is upper left Store 149(Color) 151 154: 141(ptr) AccessChain 146(flattenTemp) 28 155: 6(float) Load 154 - Store 153(Depth) 155 + Store 153(@entryPointOutput_Depth) 155 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index 1f714e69..fb41434c 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -146,7 +146,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -163,8 +163,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -317,7 +317,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -334,8 +334,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCubeArray) 0:? 'g_tTexcdi4' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -370,7 +370,7 @@ gl_FragCoord origin is upper left Name 91 "psout" Name 100 "flattenTemp" Name 103 "Color" - Name 107 "Depth" + Name 107 "@entryPointOutput_Depth" Name 110 "g_tTex1df4a" Name 113 "g_tTexcdf4" Name 116 "g_tTexcdi4" @@ -385,7 +385,7 @@ gl_FragCoord origin is upper left Decorate 75(g_tTex2di4) DescriptorSet 0 Decorate 84(g_tTex2du4) DescriptorSet 0 Decorate 103(Color) Location 0 - Decorate 107(Depth) BuiltIn FragDepth + Decorate 107(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 110(g_tTex1df4a) DescriptorSet 0 Decorate 110(g_tTex1df4a) Binding 1 Decorate 113(g_tTexcdf4) DescriptorSet 0 @@ -452,7 +452,7 @@ gl_FragCoord origin is upper left 102: TypePointer Output 7(fvec4) 103(Color): 102(ptr) Variable Output 106: TypePointer Output 6(float) - 107(Depth): 106(ptr) Variable Output +107(@entryPointOutput_Depth): 106(ptr) Variable Output 110(g_tTex1df4a): 15(ptr) Variable UniformConstant 111: TypeImage 6(float) Cube array sampled format:Unknown 112: TypePointer UniformConstant 111 @@ -473,7 +473,7 @@ gl_FragCoord origin is upper left Store 103(Color) 105 108: 95(ptr) AccessChain 100(flattenTemp) 31 109: 6(float) Load 108 - Store 107(Depth) 109 + Store 107(@entryPointOutput_Depth) 109 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 0a3e7fde..1dc2756c 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -335,7 +335,7 @@ gl_FragCoord origin is upper left 0:24 Constant: 0:24 0 (const int) 0:24 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:24 Depth: direct index for structure ( temp float) 0:24 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:24 Constant: @@ -352,8 +352,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4a' ( uniform textureCubeArray) 0:? 'g_tTexcdi4a' ( uniform itextureCubeArray) 0:? 'g_tTexcdu4a' ( uniform utextureCubeArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -394,7 +394,7 @@ gl_FragCoord origin is upper left Name 126 "psout" Name 136 "flattenTemp" Name 139 "Color" - Name 143 "Depth" + Name 143 "@entryPointOutput_Depth" Name 146 "g_tTex1df4" Decorate 16(g_tTex1df4a) DescriptorSet 0 Decorate 16(g_tTex1df4a) Binding 1 @@ -409,7 +409,7 @@ gl_FragCoord origin is upper left Decorate 105(g_tTexcdi4a) DescriptorSet 0 Decorate 115(g_tTexcdu4a) DescriptorSet 0 Decorate 139(Color) Location 0 - Decorate 143(Depth) BuiltIn FragDepth + Decorate 143(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 146(g_tTex1df4) DescriptorSet 0 Decorate 146(g_tTex1df4) Binding 0 2: TypeVoid @@ -494,7 +494,7 @@ gl_FragCoord origin is upper left 138: TypePointer Output 7(fvec4) 139(Color): 138(ptr) Variable Output 142: TypePointer Output 6(float) - 143(Depth): 142(ptr) Variable Output +143(@entryPointOutput_Depth): 142(ptr) Variable Output 146(g_tTex1df4): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -506,7 +506,7 @@ gl_FragCoord origin is upper left Store 139(Color) 141 144: 131(ptr) AccessChain 136(flattenTemp) 130 145: 6(float) Load 144 - Store 143(Depth) 145 + Store 143(@entryPointOutput_Depth) 145 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index 6ff36bed..6cb50736 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -185,7 +185,7 @@ gl_FragCoord origin is upper left 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -206,8 +206,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -399,7 +399,7 @@ gl_FragCoord origin is upper left 0:29 Constant: 0:29 0 (const int) 0:29 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:29 Depth: direct index for structure ( temp float) 0:29 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:29 Constant: @@ -420,8 +420,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -467,7 +467,7 @@ gl_FragCoord origin is upper left Name 149 "psout" Name 160 "flattenTemp" Name 163 "Color" - Name 167 "Depth" + Name 167 "@entryPointOutput_Depth" Name 170 "g_sSamp2d" Name 171 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 @@ -486,7 +486,7 @@ gl_FragCoord origin is upper left Decorate 133(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 Decorate 163(Color) Location 0 - Decorate 167(Depth) BuiltIn FragDepth + Decorate 167(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 170(g_sSamp2d) DescriptorSet 0 Decorate 171(g_tTex1df4a) DescriptorSet 0 Decorate 171(g_tTex1df4a) Binding 1 @@ -581,7 +581,7 @@ gl_FragCoord origin is upper left 162: TypePointer Output 7(fvec4) 163(Color): 162(ptr) Variable Output 166: TypePointer Output 6(float) - 167(Depth): 166(ptr) Variable Output +167(@entryPointOutput_Depth): 166(ptr) Variable Output 170(g_sSamp2d): 19(ptr) Variable UniformConstant 171(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 @@ -594,7 +594,7 @@ gl_FragCoord origin is upper left Store 163(Color) 165 168: 155(ptr) AccessChain 160(flattenTemp) 154 169: 6(float) Load 168 - Store 167(Depth) 169 + Store 167(@entryPointOutput_Depth) 169 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 7311ae41..89e5152b 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -173,7 +173,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -193,8 +193,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -374,7 +374,7 @@ gl_FragCoord origin is upper left 0:28 Constant: 0:28 0 (const int) 0:28 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:28 Depth: direct index for structure ( temp float) 0:28 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:28 Constant: @@ -394,8 +394,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTexcdf4' ( uniform textureCube) 0:? 'g_tTexcdi4' ( uniform itextureCube) 0:? 'g_tTexcdu4' ( uniform utextureCube) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -435,7 +435,7 @@ gl_FragCoord origin is upper left Name 133 "psout" Name 142 "flattenTemp" Name 145 "Color" - Name 149 "Depth" + Name 149 "@entryPointOutput_Depth" Name 152 "g_tTex1df4a" Name 155 "g_tTexcdf4" Name 158 "g_tTexcdi4" @@ -453,7 +453,7 @@ gl_FragCoord origin is upper left Decorate 110(g_tTex3di4) DescriptorSet 0 Decorate 121(g_tTex3du4) DescriptorSet 0 Decorate 145(Color) Location 0 - Decorate 149(Depth) BuiltIn FragDepth + Decorate 149(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 152(g_tTex1df4a) DescriptorSet 0 Decorate 152(g_tTex1df4a) Binding 1 Decorate 155(g_tTexcdf4) DescriptorSet 0 @@ -547,7 +547,7 @@ gl_FragCoord origin is upper left 144: TypePointer Output 7(fvec4) 145(Color): 144(ptr) Variable Output 148: TypePointer Output 6(float) - 149(Depth): 148(ptr) Variable Output +149(@entryPointOutput_Depth): 148(ptr) Variable Output 152(g_tTex1df4a): 15(ptr) Variable UniformConstant 153: TypeImage 6(float) Cube sampled format:Unknown 154: TypePointer UniformConstant 153 @@ -568,7 +568,7 @@ gl_FragCoord origin is upper left Store 145(Color) 147 150: 137(ptr) AccessChain 142(flattenTemp) 27 151: 6(float) Load 150 - Store 149(Depth) 151 + Store 149(@entryPointOutput_Depth) 151 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index 223bfaf8..0a2e3358 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -128,7 +128,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) Linked fragment stage: @@ -278,7 +278,7 @@ gl_FragCoord origin is upper left 0:20 Constant: 0:20 0 (const int) 0:20 move second child to first child ( temp float) -0:? 'Depth' ( out float FragDepth) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:20 Depth: direct index for structure ( temp float) 0:20 'flattenTemp' ( temp structure{ temp 4-component vector of float Color, temp float Depth}) 0:20 Constant: @@ -292,8 +292,8 @@ gl_FragCoord origin is upper left 0:? 'g_tTex2df4' ( uniform texture2DArray) 0:? 'g_tTex2di4' ( uniform itexture2DArray) 0:? 'g_tTex2du4' ( uniform utexture2DArray) +0:? '@entryPointOutput_Depth' ( out float FragDepth) 0:? 'Color' (layout( location=0) out 4-component vector of float) -0:? 'Depth' ( out float FragDepth) // Module Version 10000 // Generated by (magic number): 80001 @@ -327,7 +327,7 @@ gl_FragCoord origin is upper left Name 99 "psout" Name 108 "flattenTemp" Name 111 "Color" - Name 115 "Depth" + Name 115 "@entryPointOutput_Depth" Name 118 "g_tTex1df4a" Decorate 16(g_tTex1df4) DescriptorSet 0 Decorate 16(g_tTex1df4) Binding 0 @@ -339,7 +339,7 @@ gl_FragCoord origin is upper left Decorate 77(g_tTex2di4) DescriptorSet 0 Decorate 88(g_tTex2du4) DescriptorSet 0 Decorate 111(Color) Location 0 - Decorate 115(Depth) BuiltIn FragDepth + Decorate 115(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 118(g_tTex1df4a) DescriptorSet 0 Decorate 118(g_tTex1df4a) Binding 1 2: TypeVoid @@ -411,7 +411,7 @@ gl_FragCoord origin is upper left 110: TypePointer Output 7(fvec4) 111(Color): 110(ptr) Variable Output 114: TypePointer Output 6(float) - 115(Depth): 114(ptr) Variable Output +115(@entryPointOutput_Depth): 114(ptr) Variable Output 118(g_tTex1df4a): 15(ptr) Variable UniformConstant 4(main): 2 Function None 3 5: Label @@ -423,7 +423,7 @@ gl_FragCoord origin is upper left Store 111(Color) 113 116: 103(ptr) AccessChain 108(flattenTemp) 44 117: 6(float) Load 116 - Store 115(Depth) 117 + Store 115(@entryPointOutput_Depth) 117 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/Test/baseResults/hlsl.semantic.vert.out b/Test/baseResults/hlsl.semantic.vert.out index 1ff53fa4..106578e0 100755 --- a/Test/baseResults/hlsl.semantic.vert.out +++ b/Test/baseResults/hlsl.semantic.vert.out @@ -40,7 +40,7 @@ Shader version: 500 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 4 (const int) -0:? 'ii' ( in int InstanceIndex) +0:? 'ins_ii' ( in int InstanceIndex) 0:10 Sequence 0:10 move second child to first child ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 'flattenTemp' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) @@ -97,11 +97,11 @@ Shader version: 500 0:10 4 (const int) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int ii}) +0:? 'ins_ii' ( in int InstanceIndex) 0:? 'clip0' (layout( location=0) in float) 0:? 'clip1' (layout( location=1) in float) 0:? 'cull0' (layout( location=2) in float) 0:? 'cull1' (layout( location=3) in float) -0:? 'ii' ( in int InstanceIndex) 0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) 0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) @@ -150,7 +150,7 @@ Shader version: 500 0:? 'ins' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 Constant: 0:10 4 (const int) -0:? 'ii' ( in int InstanceIndex) +0:? 'ins_ii' ( in int InstanceIndex) 0:10 Sequence 0:10 move second child to first child ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) 0:10 'flattenTemp' ( temp structure{ temp float clip0, temp float clip1, temp float cull0, temp float cull1, temp int ii}) @@ -207,11 +207,11 @@ Shader version: 500 0:10 4 (const int) 0:? Linker Objects 0:? '@entryPointOutput' (layout( location=0) out structure{ temp int ii}) +0:? 'ins_ii' ( in int InstanceIndex) 0:? 'clip0' (layout( location=0) in float) 0:? 'clip1' (layout( location=1) in float) 0:? 'cull0' (layout( location=2) in float) 0:? 'cull1' (layout( location=3) in float) -0:? 'ii' ( in int InstanceIndex) 0:? '@entryPointOutput_clip1' ( out 2-element array of float ClipDistance) 0:? '@entryPointOutput_cull1' ( out 2-element array of float CullDistance) @@ -241,7 +241,7 @@ Shader version: 500 Name 26 "clip1" Name 30 "cull0" Name 34 "cull1" - Name 39 "ii" + Name 39 "ins_ii" Name 43 "flattenTemp" Name 44 "param" Name 51 "@entryPointOutput_clip1" @@ -253,7 +253,7 @@ Shader version: 500 Decorate 26(clip1) Location 1 Decorate 30(cull0) Location 2 Decorate 34(cull1) Location 3 - Decorate 39(ii) BuiltIn InstanceIndex + Decorate 39(ins_ii) BuiltIn InstanceIndex Decorate 51(@entryPointOutput_clip1) BuiltIn ClipDistance Decorate 59(@entryPointOutput_cull1) BuiltIn CullDistance Decorate 68(@entryPointOutput) Location 0 @@ -276,7 +276,7 @@ Shader version: 500 34(cull1): 20(ptr) Variable Input 37: 7(int) Constant 4 38: TypePointer Input 7(int) - 39(ii): 38(ptr) Variable Input + 39(ins_ii): 38(ptr) Variable Input 41: TypePointer Function 7(int) 47: TypeInt 32 0 48: 47(int) Constant 2 @@ -306,7 +306,7 @@ Shader version: 500 35: 6(float) Load 34(cull1) 36: 23(ptr) AccessChain 18(ins) 33 Store 36 35 - 40: 7(int) Load 39(ii) + 40: 7(int) Load 39(ins_ii) 42: 41(ptr) AccessChain 18(ins) 37 Store 42 40 45: 8(S) Load 18(ins) diff --git a/Test/baseResults/hlsl.structIoFourWay.frag.out b/Test/baseResults/hlsl.structIoFourWay.frag.out index 1b6c10d4..3eb6c243 100755 --- a/Test/baseResults/hlsl.structIoFourWay.frag.out +++ b/Test/baseResults/hlsl.structIoFourWay.frag.out @@ -55,7 +55,7 @@ using depth_greater 0:15 Constant: 0:15 1 (const int) 0:15 move second child to first child ( temp float) -0:? 'd' ( out float FragDepth) +0:? '@entryPointOutput_d' ( out float FragDepth) 0:15 d: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: @@ -69,9 +69,9 @@ using depth_greater 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s}) 0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t}) +0:? '@entryPointOutput_d' ( out float FragDepth) 0:? 'f' (layout( location=0) out float) 0:? 'g' (layout( location=1) out float) -0:? 'd' ( out float FragDepth) 0:? 'normal' (layout( location=2) out 4-component vector of float) 0:? 'f' (layout( location=0) in float) 0:? 'g' (layout( location=1) centroid in float) @@ -138,7 +138,7 @@ using depth_greater 0:15 Constant: 0:15 1 (const int) 0:15 move second child to first child ( temp float) -0:? 'd' ( out float FragDepth) +0:? '@entryPointOutput_d' ( out float FragDepth) 0:15 d: direct index for structure ( temp float) 0:15 'flattenTemp' ( temp structure{ temp float f, temp float g, temp float d, temp 4-component vector of float normal}) 0:15 Constant: @@ -152,9 +152,9 @@ using depth_greater 0:? Linker Objects 0:? 'anon@0' (layout( row_major std140) uniform block{ uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} s}) 0:? 'anon@1' (layout( row_major std140) uniform block{layout( row_major std140 offset=88) uniform structure{layout( offset=68) temp float f, temp float g, temp float d, temp 4-component vector of float normal} t}) +0:? '@entryPointOutput_d' ( out float FragDepth) 0:? 'f' (layout( location=0) out float) 0:? 'g' (layout( location=1) out float) -0:? 'd' ( out float FragDepth) 0:? 'normal' (layout( location=2) out 4-component vector of float) 0:? 'f' (layout( location=0) in float) 0:? 'g' (layout( location=1) centroid in float) @@ -190,7 +190,7 @@ using depth_greater Name 41 "param" Name 45 "f" Name 48 "g" - Name 51 "d" + Name 51 "@entryPointOutput_d" Name 55 "normal" Name 58 "T" MemberName 58(T) 0 "f" @@ -210,7 +210,7 @@ using depth_greater Decorate 36(normal) Location 3 Decorate 45(f) Location 0 Decorate 48(g) Location 1 - Decorate 51(d) BuiltIn FragDepth + Decorate 51(@entryPointOutput_d) BuiltIn FragDepth Decorate 55(normal) Location 2 MemberDecorate 58(T) 0 Offset 68 MemberDecorate 58(T) 1 Offset 72 @@ -245,7 +245,7 @@ using depth_greater 44: TypePointer Output 6(float) 45(f): 44(ptr) Variable Output 48(g): 44(ptr) Variable Output - 51(d): 44(ptr) Variable Output +51(@entryPointOutput_d): 44(ptr) Variable Output 54: TypePointer Output 7(fvec4) 55(normal): 54(ptr) Variable Output 58(T): TypeStruct 6(float) 6(float) 6(float) 7(fvec4) @@ -284,7 +284,7 @@ using depth_greater Store 48(g) 50 52: 24(ptr) AccessChain 40(flattenTemp) 30 53: 6(float) Load 52 - Store 51(d) 53 + Store 51(@entryPointOutput_d) 53 56: 38(ptr) AccessChain 40(flattenTemp) 34 57: 7(fvec4) Load 56 Store 55(normal) 57 diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out index 4fc29872..d8d77810 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out @@ -9,7 +9,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Capability Sampled1D 1: ExtInstImport "GLSL.std.450" MemoryModel Logical GLSL450 - EntryPoint Fragment 5663 "main" 4656 4112 + EntryPoint Fragment 5663 "main" 4656 4257 ExecutionMode 5663 OriginUpperLeft Decorate 4727 DescriptorSet 0 Decorate 4727 Binding 0 @@ -27,7 +27,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Decorate 3805 DescriptorSet 0 Decorate 3869 DescriptorSet 0 Decorate 4656 Location 0 - Decorate 4112 BuiltIn FragDepth + Decorate 4257 BuiltIn FragDepth 8: TypeVoid 1282: TypeFunction 8 13: TypeFloat 32 @@ -129,7 +129,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented 667: TypePointer Output 29(fvec4) 4656: 667(ptr) Variable Output 651: TypePointer Output 13(float) - 4112: 651(ptr) Variable Output + 4257: 651(ptr) Variable Output 5663: 8 Function None 1282 24877: Label 4104: 1669(ptr) Variable Function @@ -140,7 +140,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Store 4656 7967 16622: 650(ptr) AccessChain 4104 2574 11539: 13(float) Load 16622 - Store 4112 11539 + Store 4257 11539 Return FunctionEnd 3317:1032(struct) Function None 319 diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index af309a14..0641c523 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out @@ -59,7 +59,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Name 176 "psout" Name 185 "flattenTemp" Name 188 "Color" - Name 192 "Depth" + Name 192 "@entryPointOutput_Depth" Name 195 "g_sSamp2d" Name 196 "g_sSamp2D_b" Name 197 "g_tTex1df4a" @@ -79,7 +79,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Decorate 160(g_tTexcdi4) DescriptorSet 0 Decorate 169(g_tTexcdu4) DescriptorSet 0 Decorate 188(Color) Location 0 - Decorate 192(Depth) BuiltIn FragDepth + Decorate 192(@entryPointOutput_Depth) BuiltIn FragDepth Decorate 195(g_sSamp2d) DescriptorSet 0 Decorate 196(g_sSamp2D_b) DescriptorSet 0 Decorate 197(g_tTex1df4a) DescriptorSet 0 @@ -187,7 +187,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented 187: TypePointer Output 7(fvec4) 188(Color): 187(ptr) Variable Output 191: TypePointer Output 6(float) - 192(Depth): 191(ptr) Variable Output +192(@entryPointOutput_Depth): 191(ptr) Variable Output 195(g_sSamp2d): 48(ptr) Variable UniformConstant 196(g_sSamp2D_b): 48(ptr) Variable UniformConstant 197(g_tTex1df4a): 44(ptr) Variable UniformConstant @@ -201,7 +201,7 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented Store 188(Color) 190 193: 180(ptr) AccessChain 185(flattenTemp) 16 194: 6(float) Load 193 - Store 192(Depth) 194 + Store 192(@entryPointOutput_Depth) 194 Return FunctionEnd 10(@main():8(PS_OUTPUT) Function None 9 diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 9915de50..62f60bb9 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -1127,9 +1127,19 @@ bool HlslParseContext::isBuiltInMethod(const TSourceLoc&, TIntermTyped* base, co void HlslParseContext::splitBuiltIn(const TString& baseName, const TType& memberType, const TArraySizes* arraySizes, const TQualifier& outerQualifier) { - TVariable* ioVar = makeInternalVariable(baseName + (baseName.empty() ? "" : "_") + memberType.getFieldName(), memberType); + // Because of arrays of structs, we might be asked more than once, + // but the arraySizes passed in should have captured the whole thing + // the first time. + // However, clip/cull rely on multiple updates. + if (!isClipOrCullDistance(memberType)) + if (splitBuiltIns.find(tInterstageIoData(memberType.getQualifier().builtIn, outerQualifier.storage)) != + splitBuiltIns.end()) + return; - if (arraySizes) + TVariable* ioVar = makeInternalVariable(baseName + (baseName.empty() ? "" : "_") + memberType.getFieldName(), + memberType); + + if (arraySizes != nullptr && !memberType.isArray()) ioVar->getWritableType().newArraySizes(*arraySizes); fixBuiltInIoType(ioVar->getWritableType()); @@ -1140,6 +1150,8 @@ void HlslParseContext::splitBuiltIn(const TString& baseName, const TType& member // Merge qualifier from the user structure mergeQualifiers(ioVar->getWritableType().getQualifier(), outerQualifier); + // But, not location, we're losing that + ioVar->getWritableType().getQualifier().layoutLocation = TQualifier::layoutLocationEnd; } // Split a type into @@ -1188,12 +1200,16 @@ void HlslParseContext::flatten(const TVariable& variable, bool linkage) { const TType& type = variable.getType(); + // If it's a standalone built-in, there is nothing to flatten + if (type.isBuiltIn() && !type.isStruct()) + return; + auto entry = flattenMap.insert(std::make_pair(variable.getUniqueId(), TFlattenData(type.getQualifier().layoutBinding, type.getQualifier().layoutLocation))); // the item is a map pair, so first->second is the TFlattenData itself. - flatten(variable, type, entry.first->second, "", linkage); + flatten(variable, type, entry.first->second, "", linkage, type.getQualifier(), nullptr); } // Recursively flatten the given variable at the provided type, building the flattenData as we go. @@ -1224,14 +1240,16 @@ void HlslParseContext::flatten(const TVariable& variable, bool linkage) // so the 4th flattened member in traversal order is ours. // int HlslParseContext::flatten(const TVariable& variable, const TType& type, - TFlattenData& flattenData, TString name, bool linkage) + TFlattenData& flattenData, TString name, bool linkage, + const TQualifier& outerQualifier, + const TArraySizes* builtInArraySizes) { // If something is an arrayed struct, the array flattener will recursively call flatten() // to then flatten the struct, so this is an "if else": we don't do both. if (type.isArray()) - return flattenArray(variable, type, flattenData, name, linkage); + return flattenArray(variable, type, flattenData, name, linkage, outerQualifier); else if (type.isStruct()) - return flattenStruct(variable, type, flattenData, name, linkage); + return flattenStruct(variable, type, flattenData, name, linkage, outerQualifier, builtInArraySizes); else { assert(0); // should never happen return -1; @@ -1241,7 +1259,9 @@ int HlslParseContext::flatten(const TVariable& variable, const TType& type, // Add a single flattened member to the flattened data being tracked for the composite // Returns true for the final flattening level. int HlslParseContext::addFlattenedMember(const TVariable& variable, const TType& type, TFlattenData& flattenData, - const TString& memberName, bool linkage) + const TString& memberName, bool linkage, + const TQualifier& outerQualifier, + const TArraySizes* builtInArraySizes) { if (isFinalFlattening(type)) { // This is as far as we flatten. Insert the variable. @@ -1272,7 +1292,7 @@ int HlslParseContext::addFlattenedMember(const TVariable& variable, const TType& return static_cast(flattenData.offsets.size()) - 1; // location of the member reference } else { // Further recursion required - return flatten(variable, type, flattenData, memberName, linkage); + return flatten(variable, type, flattenData, memberName, linkage, outerQualifier, builtInArraySizes); } } @@ -1281,7 +1301,9 @@ int HlslParseContext::addFlattenedMember(const TVariable& variable, const TType& // // Assumes shouldFlatten() or equivalent was called first. int HlslParseContext::flattenStruct(const TVariable& variable, const TType& type, - TFlattenData& flattenData, TString name, bool linkage) + TFlattenData& flattenData, TString name, bool linkage, + const TQualifier& outerQualifier, + const TArraySizes* builtInArraySizes) { assert(type.isStruct()); @@ -1289,15 +1311,23 @@ int HlslParseContext::flattenStruct(const TVariable& variable, const TType& type // Reserve space for this tree level. int start = static_cast(flattenData.offsets.size()); - int pos = start; + int pos = start; flattenData.offsets.resize(int(pos + members.size()), -1); for (int member = 0; member < (int)members.size(); ++member) { TType& dereferencedType = *members[member].type; - const TString memberName = name + (name.empty() ? "" : ".") + dereferencedType.getFieldName(); + if (dereferencedType.isBuiltIn()) + splitBuiltIn(variable.getName(), dereferencedType, builtInArraySizes, outerQualifier); + else { + const TString memberName = name + (name.empty() ? "" : ".") + dereferencedType.getFieldName(); - const int mpos = addFlattenedMember(variable, dereferencedType, flattenData, memberName, linkage); - flattenData.offsets[pos++] = mpos; + const int mpos = addFlattenedMember(variable, dereferencedType, flattenData, memberName, linkage, + outerQualifier, + builtInArraySizes == nullptr && dereferencedType.isArray() + ? &dereferencedType.getArraySizes() + : builtInArraySizes); + flattenData.offsets[pos++] = mpos; + } } return start; @@ -1308,7 +1338,8 @@ int HlslParseContext::flattenStruct(const TVariable& variable, const TType& type // // Assumes shouldFlatten() or equivalent was called first. int HlslParseContext::flattenArray(const TVariable& variable, const TType& type, - TFlattenData& flattenData, TString name, bool linkage) + TFlattenData& flattenData, TString name, bool linkage, + const TQualifier& outerQualifier) { assert(type.isArray() && !type.isImplicitlySizedArray()); @@ -1327,7 +1358,8 @@ int HlslParseContext::flattenArray(const TVariable& variable, const TType& type, char elementNumBuf[20]; // sufficient for MAXINT snprintf(elementNumBuf, sizeof(elementNumBuf)-1, "[%d]", element); const int mpos = addFlattenedMember(variable, dereferencedType, flattenData, - name + elementNumBuf, linkage); + name + elementNumBuf, linkage, outerQualifier, + type.getArraySizes()); flattenData.offsets[pos++] = mpos; } @@ -2519,13 +2551,18 @@ TIntermTyped* HlslParseContext::handleAssign(const TSourceLoc& loc, TOperator op TIntermTyped* subTree; const TType derefType(node->getType(), member); - if (split && derefType.isBuiltIn()) { - // copy from interstage IO built-in if needed + const TVariable* builtInVar = nullptr; + if ((flattened || split) && derefType.isBuiltIn()) { const TIntermTyped* outer = isLeft ? outerLeft : outerRight; - subTree = intermediate.addSymbol( - *splitBuiltIns.find(HlslParseContext::tInterstageIoData( - derefType.getQualifier().builtIn, - outer->getType().getQualifier().storage))->second); + auto splitPair = splitBuiltIns.find(HlslParseContext::tInterstageIoData( + derefType.getQualifier().builtIn, + outer->getType().getQualifier().storage)); + if (splitPair != splitBuiltIns.end()) + builtInVar = splitPair->second; + } + if (builtInVar != nullptr) { + // copy from interstage IO built-in if needed + subTree = intermediate.addSymbol(*builtInVar); // Arrayness of builtIn symbols isn't handled by the normal recursion: // it's been extracted and moved to the built-in. diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h index 9a30e0ae..b743136e 100755 --- a/hlsl/hlslParseHelper.h +++ b/hlsl/hlslParseHelper.h @@ -248,7 +248,8 @@ protected: bool shouldFlatten(const TType&) const; bool wasFlattened(const TIntermTyped* node) const; bool wasFlattened(int id) const { return flattenMap.find(id) != flattenMap.end(); } - int addFlattenedMember(const TVariable&, const TType&, TFlattenData&, const TString& name, bool track); + int addFlattenedMember(const TVariable&, const TType&, TFlattenData&, const TString& name, bool linkage, + const TQualifier& outerQualifier, const TArraySizes* builtInArraySizes); bool isFinalFlattening(const TType& type) const { return !(type.isStruct() || type.isArray()); } // Structure splitting (splits interstage built-in types into its own struct) @@ -264,9 +265,12 @@ protected: void fixBuiltInIoType(TType&); void flatten(const TVariable& variable, bool linkage); - int flatten(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage); - int flattenStruct(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage); - int flattenArray(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage); + int flatten(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage, + const TQualifier& outerQualifier, const TArraySizes* builtInArraySizes); + int flattenStruct(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage, + const TQualifier& outerQualifier, const TArraySizes* builtInArraySizes); + int flattenArray(const TVariable& variable, const TType&, TFlattenData&, TString name, bool linkage, + const TQualifier& outerQualifier); bool hasUniform(const TQualifier& qualifier) const; void clearUniform(TQualifier& qualifier);