From 96e9f47cbb3d488ff1f12b0a3397c8bcef571f0e Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 29 Jul 2016 14:28:39 -0600 Subject: [PATCH] HLSL: Implement the register production. --- Test/baseResults/hlsl.calculatelod.dx10.frag.out | 55 +++++++++--------- .../hlsl.calculatelodunclamped.dx10.frag.out | 52 ++++++++--------- Test/baseResults/hlsl.float4.frag.out | 13 +++-- Test/baseResults/hlsl.gather.array.dx10.frag.out | 39 +++++++------ Test/baseResults/hlsl.gather.basic.dx10.frag.out | 39 +++++++------ Test/baseResults/hlsl.gather.basic.dx10.vert.out | 39 +++++++------ Test/baseResults/hlsl.gather.offset.dx10.frag.out | 27 +++++---- .../hlsl.gather.offsetarray.dx10.frag.out | 27 +++++---- Test/baseResults/hlsl.getdimensions.dx10.frag.out | 22 +++---- Test/baseResults/hlsl.getdimensions.dx10.vert.out | 22 +++---- .../hlsl.getsampleposition.dx10.frag.out | 4 +- Test/baseResults/hlsl.load.2dms.dx10.frag.out | 5 +- Test/baseResults/hlsl.load.array.dx10.frag.out | 10 ++-- Test/baseResults/hlsl.load.basic.dx10.frag.out | 14 +++-- Test/baseResults/hlsl.load.basic.dx10.vert.out | 14 +++-- Test/baseResults/hlsl.load.buffer.dx10.frag.out | 5 +- Test/baseResults/hlsl.load.offset.dx10.frag.out | 14 +++-- .../hlsl.load.offsetarray.dx10.frag.out | 10 ++-- Test/baseResults/hlsl.sample.array.dx10.frag.out | 55 +++++++++--------- Test/baseResults/hlsl.sample.basic.dx10.frag.out | 67 +++++++++++----------- Test/baseResults/hlsl.sample.offset.dx10.frag.out | 55 +++++++++--------- .../hlsl.sample.offsetarray.dx10.frag.out | 43 +++++++------- .../hlsl.samplebias.array.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplebias.basic.dx10.frag.out | 67 +++++++++++----------- .../hlsl.samplebias.offset.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplebias.offsetarray.dx10.frag.out | 43 +++++++------- .../baseResults/hlsl.samplecmp.array.dx10.frag.out | 46 ++++++++------- .../baseResults/hlsl.samplecmp.basic.dx10.frag.out | 50 ++++++++-------- .../hlsl.samplecmp.offset.dx10.frag.out | 38 ++++++------ .../hlsl.samplecmp.offsetarray.dx10.frag.out | 34 +++++------ .../hlsl.samplecmplevelzero.array.dx10.frag.out | 46 ++++++++------- .../hlsl.samplecmplevelzero.basic.dx10.frag.out | 50 ++++++++-------- .../hlsl.samplecmplevelzero.offset.dx10.frag.out | 38 ++++++------ ...sl.samplecmplevelzero.offsetarray.dx10.frag.out | 34 +++++------ .../hlsl.samplegrad.array.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplegrad.basic.dx10.frag.out | 67 +++++++++++----------- .../hlsl.samplegrad.basic.dx10.vert.out | 67 +++++++++++----------- .../hlsl.samplegrad.offset.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplegrad.offsetarray.dx10.frag.out | 43 +++++++------- .../hlsl.samplelevel.array.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplelevel.basic.dx10.frag.out | 67 +++++++++++----------- .../hlsl.samplelevel.basic.dx10.vert.out | 67 +++++++++++----------- .../hlsl.samplelevel.offset.dx10.frag.out | 55 +++++++++--------- .../hlsl.samplelevel.offsetarray.dx10.frag.out | 43 +++++++------- Test/baseResults/hlsl.struct.frag.out | 15 +++-- Test/hlsl.float4.frag | 4 +- Test/hlsl.struct.frag | 4 +- glslang/Include/revision.h | 2 +- hlsl/hlslGrammar.cpp | 35 ++++++----- hlsl/hlslParseHelper.cpp | 39 ++++++++++++- hlsl/hlslParseHelper.h | 1 + 51 files changed, 1009 insertions(+), 852 deletions(-) diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out index 7319a19..43232fb 100644 --- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out @@ -11,8 +11,8 @@ gl_FragCoord origin is upper left 0:28 direct index (temp float) 0:? textureQueryLod (temp float) 0:28 Construct combined texture-sampler (temp sampler1DArray) -0:28 'g_tTex1df4a' (uniform texture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:28 Constant: 0:28 0.100000 0:28 Constant: @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:29 Construct combined texture-sampler (temp isampler1DArray) 0:29 'g_tTex1di4a' (uniform itexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:29 Constant: 0:29 0.200000 0:29 Constant: @@ -36,7 +36,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:30 Construct combined texture-sampler (temp usampler1DArray) 0:30 'g_tTex1du4a' (uniform utexture1DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.300000 0:30 Constant: @@ -48,7 +48,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:32 Construct combined texture-sampler (temp sampler2DArray) 0:32 'g_tTex2df4a' (uniform texture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -61,7 +61,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:33 Construct combined texture-sampler (temp isampler2DArray) 0:33 'g_tTex2di4a' (uniform itexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -74,7 +74,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:34 Construct combined texture-sampler (temp usampler2DArray) 0:34 'g_tTex2du4a' (uniform utexture2DArray) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -87,7 +87,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:36 Construct combined texture-sampler (temp samplerCubeArray) 0:36 'g_tTexcdf4a' (uniform textureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -101,7 +101,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:37 Construct combined texture-sampler (temp isamplerCubeArray) 0:37 'g_tTexcdi4a' (uniform itextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -115,7 +115,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:38 Construct combined texture-sampler (temp usamplerCubeArray) 0:38 'g_tTexcdu4a' (uniform utextureCubeArray) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -142,9 +142,9 @@ gl_FragCoord origin is upper left 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -170,8 +170,8 @@ gl_FragCoord origin is upper left 0:28 direct index (temp float) 0:? textureQueryLod (temp float) 0:28 Construct combined texture-sampler (temp sampler1DArray) -0:28 'g_tTex1df4a' (uniform texture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:28 Constant: 0:28 0.100000 0:28 Constant: @@ -183,7 +183,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:29 Construct combined texture-sampler (temp isampler1DArray) 0:29 'g_tTex1di4a' (uniform itexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:29 Constant: 0:29 0.200000 0:29 Constant: @@ -195,7 +195,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:30 Construct combined texture-sampler (temp usampler1DArray) 0:30 'g_tTex1du4a' (uniform utexture1DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.300000 0:30 Constant: @@ -207,7 +207,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:32 Construct combined texture-sampler (temp sampler2DArray) 0:32 'g_tTex2df4a' (uniform texture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -220,7 +220,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:33 Construct combined texture-sampler (temp isampler2DArray) 0:33 'g_tTex2di4a' (uniform itexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -233,7 +233,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:34 Construct combined texture-sampler (temp usampler2DArray) 0:34 'g_tTex2du4a' (uniform utexture2DArray) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -246,7 +246,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:36 Construct combined texture-sampler (temp samplerCubeArray) 0:36 'g_tTexcdf4a' (uniform textureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:37 Construct combined texture-sampler (temp isamplerCubeArray) 0:37 'g_tTexcdi4a' (uniform itextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -274,7 +274,7 @@ gl_FragCoord origin is upper left 0:? textureQueryLod (temp float) 0:38 Construct combined texture-sampler (temp usamplerCubeArray) 0:38 'g_tTexcdu4a' (uniform utextureCubeArray) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -301,9 +301,9 @@ gl_FragCoord origin is upper left 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -352,7 +352,9 @@ gl_FragCoord origin is upper left Name 133 "psout" Name 142 "g_tTex1df4" Decorate 11(g_tTex1df4a) DescriptorSet 0 + Decorate 11(g_tTex1df4a) Binding 1 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 29(g_tTex1di4a) DescriptorSet 0 Decorate 42(g_tTex1du4a) DescriptorSet 0 Decorate 54(g_tTex2df4a) DescriptorSet 0 @@ -363,6 +365,7 @@ gl_FragCoord origin is upper left Decorate 118(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 142(g_tTex1df4) DescriptorSet 0 + Decorate 142(g_tTex1df4) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out index b55a36b..e2dc1db 100644 --- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out +++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out @@ -23,8 +23,8 @@ ERROR: node is still EOpNull! 0:28 direct index (temp float) 0:? textureQueryLod (temp float) 0:28 Construct combined texture-sampler (temp sampler1DArray) -0:28 'g_tTex1df4a' (uniform texture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:28 Constant: 0:28 0.100000 0:28 Constant: @@ -36,7 +36,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:29 Construct combined texture-sampler (temp isampler1DArray) 0:29 'g_tTex1di4a' (uniform itexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:29 Constant: 0:29 0.200000 0:29 Constant: @@ -48,7 +48,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:30 Construct combined texture-sampler (temp usampler1DArray) 0:30 'g_tTex1du4a' (uniform utexture1DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.300000 0:30 Constant: @@ -60,7 +60,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:32 Construct combined texture-sampler (temp sampler2DArray) 0:32 'g_tTex2df4a' (uniform texture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -73,7 +73,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:33 Construct combined texture-sampler (temp isampler2DArray) 0:33 'g_tTex2di4a' (uniform itexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -86,7 +86,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:34 Construct combined texture-sampler (temp usampler2DArray) 0:34 'g_tTex2du4a' (uniform utexture2DArray) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -99,7 +99,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:36 Construct combined texture-sampler (temp samplerCubeArray) 0:36 'g_tTexcdf4a' (uniform textureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -113,7 +113,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:37 Construct combined texture-sampler (temp isamplerCubeArray) 0:37 'g_tTexcdi4a' (uniform itextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -127,7 +127,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:38 Construct combined texture-sampler (temp usamplerCubeArray) 0:38 'g_tTexcdu4a' (uniform utextureCubeArray) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -154,9 +154,9 @@ ERROR: node is still EOpNull! 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -182,8 +182,8 @@ ERROR: node is still EOpNull! 0:28 direct index (temp float) 0:? textureQueryLod (temp float) 0:28 Construct combined texture-sampler (temp sampler1DArray) -0:28 'g_tTex1df4a' (uniform texture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:28 Constant: 0:28 0.100000 0:28 Constant: @@ -195,7 +195,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:29 Construct combined texture-sampler (temp isampler1DArray) 0:29 'g_tTex1di4a' (uniform itexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:29 Constant: 0:29 0.200000 0:29 Constant: @@ -207,7 +207,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:30 Construct combined texture-sampler (temp usampler1DArray) 0:30 'g_tTex1du4a' (uniform utexture1DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.300000 0:30 Constant: @@ -219,7 +219,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:32 Construct combined texture-sampler (temp sampler2DArray) 0:32 'g_tTex2df4a' (uniform texture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -232,7 +232,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:33 Construct combined texture-sampler (temp isampler2DArray) 0:33 'g_tTex2di4a' (uniform itexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -245,7 +245,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:34 Construct combined texture-sampler (temp usampler2DArray) 0:34 'g_tTex2du4a' (uniform utexture2DArray) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -258,7 +258,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:36 Construct combined texture-sampler (temp samplerCubeArray) 0:36 'g_tTexcdf4a' (uniform textureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -272,7 +272,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:37 Construct combined texture-sampler (temp isamplerCubeArray) 0:37 'g_tTexcdi4a' (uniform itextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -286,7 +286,7 @@ ERROR: node is still EOpNull! 0:? textureQueryLod (temp float) 0:38 Construct combined texture-sampler (temp usamplerCubeArray) 0:38 'g_tTexcdu4a' (uniform utextureCubeArray) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -313,9 +313,9 @@ ERROR: node is still EOpNull! 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) diff --git a/Test/baseResults/hlsl.float4.frag.out b/Test/baseResults/hlsl.float4.frag.out index 481c901..370a506 100755 --- a/Test/baseResults/hlsl.float4.frag.out +++ b/Test/baseResults/hlsl.float4.frag.out @@ -1,4 +1,7 @@ hlsl.float4.frag +WARNING: 0:5: 'register' : ignoring shader_profile +WARNING: 0:6: 'register' : ignoring shader_profile + Shader version: 450 gl_FragCoord origin is upper left 0:? Sequence @@ -22,8 +25,8 @@ gl_FragCoord origin is upper left 0:? 'AmbientColor' (global 4-component vector of float) 0:? 'ff1' (global bool Face) 0:? 'ff2' (layout(offset=4 ) global 4-component vector of float) -0:? 'ff3' (layout(offset=4 ) global 4-component vector of float) -0:? 'ff4' (layout(offset=4 ) global 4-component vector of float FragCoord) +0:? 'ff3' (layout(binding=0 offset=4 ) global 4-component vector of float) +0:? 'ff4' (layout(binding=1 offset=4 ) global 4-component vector of float FragCoord) Linked fragment stage: @@ -52,8 +55,8 @@ gl_FragCoord origin is upper left 0:? 'AmbientColor' (global 4-component vector of float) 0:? 'ff1' (global bool Face) 0:? 'ff2' (layout(offset=4 ) global 4-component vector of float) -0:? 'ff3' (layout(offset=4 ) global 4-component vector of float) -0:? 'ff4' (layout(offset=4 ) global 4-component vector of float FragCoord) +0:? 'ff3' (layout(binding=0 offset=4 ) global 4-component vector of float) +0:? 'ff4' (layout(binding=1 offset=4 ) global 4-component vector of float FragCoord) // Module Version 10000 // Generated by (magic number): 80001 @@ -76,7 +79,9 @@ gl_FragCoord origin is upper left Decorate 26(ff1) BuiltIn FrontFacing Decorate 27(ff2) Offset 4 Decorate 28(ff3) Offset 4 + Decorate 28(ff3) Binding 0 Decorate 29(ff4) Offset 4 + Decorate 29(ff4) Binding 1 Decorate 29(ff4) BuiltIn FragCoord 2: TypeVoid 3: TypeFunction 2 diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out index e63ab53..70d1bf1 100644 --- a/Test/baseResults/hlsl.gather.array.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:29 textureGather (global 4-component vector of float) 0:29 Construct combined texture-sampler (temp sampler2DArray) 0:29 'g_tTex2df4a' (uniform texture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -22,7 +22,7 @@ gl_FragCoord origin is upper left 0:30 textureGather (global 4-component vector of int) 0:30 Construct combined texture-sampler (temp isampler2DArray) 0:30 'g_tTex2di4a' (uniform itexture2DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:31 textureGather (global 4-component vector of uint) 0:31 Construct combined texture-sampler (temp usampler2DArray) 0:31 'g_tTex2du4a' (uniform utexture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:35 textureGather (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4a' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:36 textureGather (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4a' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:37 textureGather (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4a' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -94,9 +94,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -122,7 +122,7 @@ gl_FragCoord origin is upper left 0:29 textureGather (global 4-component vector of float) 0:29 Construct combined texture-sampler (temp sampler2DArray) 0:29 'g_tTex2df4a' (uniform texture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -133,7 +133,7 @@ gl_FragCoord origin is upper left 0:30 textureGather (global 4-component vector of int) 0:30 Construct combined texture-sampler (temp isampler2DArray) 0:30 'g_tTex2di4a' (uniform itexture2DArray) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -144,7 +144,7 @@ gl_FragCoord origin is upper left 0:31 textureGather (global 4-component vector of uint) 0:31 Construct combined texture-sampler (temp usampler2DArray) 0:31 'g_tTex2du4a' (uniform utexture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:35 textureGather (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4a' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -167,7 +167,7 @@ gl_FragCoord origin is upper left 0:36 textureGather (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4a' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -179,7 +179,7 @@ gl_FragCoord origin is upper left 0:37 textureGather (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4a' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -205,9 +205,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -253,6 +253,7 @@ gl_FragCoord origin is upper left Name 109 "g_tTex1du4a" Decorate 12(g_tTex2df4a) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 33(g_tTex2di4a) DescriptorSet 0 Decorate 48(g_tTex2du4a) DescriptorSet 0 Decorate 60(g_tTexcdf4a) DescriptorSet 0 @@ -260,7 +261,9 @@ gl_FragCoord origin is upper left Decorate 80(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 102(g_tTex1df4a) DescriptorSet 0 + Decorate 102(g_tTex1df4a) Binding 1 Decorate 103(g_tTex1df4) DescriptorSet 0 + Decorate 103(g_tTex1df4) Binding 0 Decorate 106(g_tTex1di4a) DescriptorSet 0 Decorate 109(g_tTex1du4a) DescriptorSet 0 2: TypeVoid diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out index f491804..c52d7cd 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:34 textureGather (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -21,7 +21,7 @@ gl_FragCoord origin is upper left 0:35 textureGather (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -31,7 +31,7 @@ gl_FragCoord origin is upper left 0:36 textureGather (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left 0:40 textureGather (global 4-component vector of float) 0:40 Construct combined texture-sampler (temp samplerCube) 0:40 'g_tTexcdf4' (uniform textureCube) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -52,7 +52,7 @@ gl_FragCoord origin is upper left 0:41 textureGather (global 4-component vector of int) 0:41 Construct combined texture-sampler (temp isamplerCube) 0:41 'g_tTexcdi4' (uniform itextureCube) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -63,7 +63,7 @@ gl_FragCoord origin is upper left 0:42 textureGather (global 4-component vector of uint) 0:42 Construct combined texture-sampler (temp usamplerCube) 0:42 'g_tTexcdu4' (uniform utextureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -88,10 +88,10 @@ gl_FragCoord origin is upper left 0:47 Branch: Return with expression 0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -120,7 +120,7 @@ gl_FragCoord origin is upper left 0:34 textureGather (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -130,7 +130,7 @@ gl_FragCoord origin is upper left 0:35 textureGather (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -140,7 +140,7 @@ gl_FragCoord origin is upper left 0:36 textureGather (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -150,7 +150,7 @@ gl_FragCoord origin is upper left 0:40 textureGather (global 4-component vector of float) 0:40 Construct combined texture-sampler (temp samplerCube) 0:40 'g_tTexcdf4' (uniform textureCube) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -161,7 +161,7 @@ gl_FragCoord origin is upper left 0:41 textureGather (global 4-component vector of int) 0:41 Construct combined texture-sampler (temp isamplerCube) 0:41 'g_tTexcdi4' (uniform itextureCube) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -172,7 +172,7 @@ gl_FragCoord origin is upper left 0:42 textureGather (global 4-component vector of uint) 0:42 Construct combined texture-sampler (temp usamplerCube) 0:42 'g_tTexcdu4' (uniform utextureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -197,10 +197,10 @@ gl_FragCoord origin is upper left 0:47 Branch: Return with expression 0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -252,6 +252,7 @@ gl_FragCoord origin is upper left Name 120 "g_tTex3du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 32(g_tTex2di4) DescriptorSet 0 Decorate 47(g_tTex2du4) DescriptorSet 0 Decorate 59(g_tTexcdf4) DescriptorSet 0 @@ -260,7 +261,9 @@ gl_FragCoord origin is upper left MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 101(g_sSamp2d) DescriptorSet 0 Decorate 104(g_tTex1df4a) DescriptorSet 0 + Decorate 104(g_tTex1df4a) Binding 1 Decorate 105(g_tTex1df4) DescriptorSet 0 + Decorate 105(g_tTex1df4) Binding 0 Decorate 108(g_tTex1di4) DescriptorSet 0 Decorate 111(g_tTex1du4) DescriptorSet 0 Decorate 114(g_tTex3df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out index 9cc0bfd..667c39f 100644 --- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out @@ -10,7 +10,7 @@ Shader version: 450 0:33 textureGather (global 4-component vector of float) 0:33 Construct combined texture-sampler (temp sampler2D) 0:33 'g_tTex2df4' (uniform texture2D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -20,7 +20,7 @@ Shader version: 450 0:34 textureGather (global 4-component vector of int) 0:34 Construct combined texture-sampler (temp isampler2D) 0:34 'g_tTex2di4' (uniform itexture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -30,7 +30,7 @@ Shader version: 450 0:35 textureGather (global 4-component vector of uint) 0:35 Construct combined texture-sampler (temp usampler2D) 0:35 'g_tTex2du4' (uniform utexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -40,7 +40,7 @@ Shader version: 450 0:39 textureGather (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp samplerCube) 0:39 'g_tTexcdf4' (uniform textureCube) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -51,7 +51,7 @@ Shader version: 450 0:40 textureGather (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isamplerCube) 0:40 'g_tTexcdi4' (uniform itextureCube) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -62,7 +62,7 @@ Shader version: 450 0:41 textureGather (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usamplerCube) 0:41 'g_tTexcdu4' (uniform utextureCube) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -80,10 +80,10 @@ Shader version: 450 0:45 Branch: Return with expression 0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -111,7 +111,7 @@ Shader version: 450 0:33 textureGather (global 4-component vector of float) 0:33 Construct combined texture-sampler (temp sampler2D) 0:33 'g_tTex2df4' (uniform texture2D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -121,7 +121,7 @@ Shader version: 450 0:34 textureGather (global 4-component vector of int) 0:34 Construct combined texture-sampler (temp isampler2D) 0:34 'g_tTex2di4' (uniform itexture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -131,7 +131,7 @@ Shader version: 450 0:35 textureGather (global 4-component vector of uint) 0:35 Construct combined texture-sampler (temp usampler2D) 0:35 'g_tTex2du4' (uniform utexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -141,7 +141,7 @@ Shader version: 450 0:39 textureGather (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp samplerCube) 0:39 'g_tTexcdf4' (uniform textureCube) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -152,7 +152,7 @@ Shader version: 450 0:40 textureGather (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isamplerCube) 0:40 'g_tTexcdi4' (uniform itextureCube) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -163,7 +163,7 @@ Shader version: 450 0:41 textureGather (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usamplerCube) 0:41 'g_tTexcdu4' (uniform utextureCube) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -181,10 +181,10 @@ Shader version: 450 0:45 Branch: Return with expression 0:45 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -234,6 +234,7 @@ Shader version: 450 Name 117 "g_tTex3du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 32(g_tTex2di4) DescriptorSet 0 Decorate 47(g_tTex2du4) DescriptorSet 0 Decorate 59(g_tTexcdf4) DescriptorSet 0 @@ -242,7 +243,9 @@ Shader version: 450 MemberDecorate 90(VS_OUTPUT) 0 BuiltIn FragCoord Decorate 98(g_sSamp2d) DescriptorSet 0 Decorate 101(g_tTex1df4a) DescriptorSet 0 + Decorate 101(g_tTex1df4a) Binding 1 Decorate 102(g_tTex1df4) DescriptorSet 0 + Decorate 102(g_tTex1df4) Binding 0 Decorate 105(g_tTex1di4) DescriptorSet 0 Decorate 108(g_tTex1du4) DescriptorSet 0 Decorate 111(g_tTex3df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out index 7a08165..d5a3921 100644 --- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:33 textureGatherOffset (global 4-component vector of float) 0:33 Construct combined texture-sampler (temp sampler2D) 0:33 'g_tTex2df4' (uniform texture2D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:34 textureGatherOffset (global 4-component vector of int) 0:34 Construct combined texture-sampler (temp isampler2D) 0:34 'g_tTex2di4' (uniform itexture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:35 textureGatherOffset (global 4-component vector of uint) 0:35 Construct combined texture-sampler (temp usampler2D) 0:35 'g_tTex2du4' (uniform utexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -64,9 +64,9 @@ gl_FragCoord origin is upper left 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left 0:33 textureGatherOffset (global 4-component vector of float) 0:33 Construct combined texture-sampler (temp sampler2D) 0:33 'g_tTex2df4' (uniform texture2D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -108,7 +108,7 @@ gl_FragCoord origin is upper left 0:34 textureGatherOffset (global 4-component vector of int) 0:34 Construct combined texture-sampler (temp isampler2D) 0:34 'g_tTex2di4' (uniform itexture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -121,7 +121,7 @@ gl_FragCoord origin is upper left 0:35 textureGatherOffset (global 4-component vector of uint) 0:35 Construct combined texture-sampler (temp usampler2D) 0:35 'g_tTex2du4' (uniform utexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -148,9 +148,9 @@ gl_FragCoord origin is upper left 0:43 Branch: Return with expression 0:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -198,11 +198,14 @@ gl_FragCoord origin is upper left Name 99 "g_tTexcdu4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 35(g_tTex2di4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0 MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 74(g_tTex1df4a) DescriptorSet 0 + Decorate 74(g_tTex1df4a) Binding 1 Decorate 75(g_tTex1df4) DescriptorSet 0 + Decorate 75(g_tTex1df4) Binding 0 Decorate 78(g_tTex1di4) DescriptorSet 0 Decorate 81(g_tTex1du4) DescriptorSet 0 Decorate 84(g_tTex3df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out index 7314398..a1f628a 100644 --- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:25 textureGatherOffset (global 4-component vector of float) 0:25 Construct combined texture-sampler (temp sampler2DArray) 0:25 'g_tTex2df4' (uniform texture2DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:26 textureGatherOffset (global 4-component vector of int) 0:26 Construct combined texture-sampler (temp isampler2DArray) 0:26 'g_tTex2di4' (uniform itexture2DArray) -0:26 'g_sSamp' (uniform sampler) +0:26 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:27 textureGatherOffset (global 4-component vector of uint) 0:27 Construct combined texture-sampler (temp usampler2DArray) 0:27 'g_tTex2du4' (uniform utexture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -67,9 +67,9 @@ gl_FragCoord origin is upper left 0:35 Branch: Return with expression 0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -92,7 +92,7 @@ gl_FragCoord origin is upper left 0:25 textureGatherOffset (global 4-component vector of float) 0:25 Construct combined texture-sampler (temp sampler2DArray) 0:25 'g_tTex2df4' (uniform texture2DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -106,7 +106,7 @@ gl_FragCoord origin is upper left 0:26 textureGatherOffset (global 4-component vector of int) 0:26 Construct combined texture-sampler (temp isampler2DArray) 0:26 'g_tTex2di4' (uniform itexture2DArray) -0:26 'g_sSamp' (uniform sampler) +0:26 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -120,7 +120,7 @@ gl_FragCoord origin is upper left 0:27 textureGatherOffset (global 4-component vector of uint) 0:27 Construct combined texture-sampler (temp usampler2DArray) 0:27 'g_tTex2du4' (uniform utexture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -148,9 +148,9 @@ gl_FragCoord origin is upper left 0:35 Branch: Return with expression 0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -186,11 +186,14 @@ gl_FragCoord origin is upper left Name 82 "g_tTex1du4" Decorate 12(g_tTex2df4) DescriptorSet 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 36(g_tTex2di4) DescriptorSet 0 Decorate 51(g_tTex2du4) DescriptorSet 0 MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 75(g_tTex1df4a) DescriptorSet 0 + Decorate 75(g_tTex1df4a) Binding 1 Decorate 76(g_tTex1df4) DescriptorSet 0 + Decorate 76(g_tTex1df4) Binding 0 Decorate 79(g_tTex1di4) DescriptorSet 0 Decorate 82(g_tTex1du4) DescriptorSet 0 2: TypeVoid diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out index 56d83be..dd47567 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out @@ -9,7 +9,7 @@ gl_FragCoord origin is upper left 0:65 move second child to first child (temp uint) 0:65 'sizeQueryTemp' (temp uint) 0:65 textureSize (temp uint) -0:65 'g_tTex1df4' (uniform texture1D) +0:65 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:65 move second child to first child (temp uint) 0:65 'WidthU' (temp uint) 0:65 'sizeQueryTemp' (temp uint) @@ -17,7 +17,7 @@ gl_FragCoord origin is upper left 0:66 move second child to first child (temp uint) 0:66 'sizeQueryTemp' (temp uint) 0:66 textureSize (temp uint) -0:66 'g_tTex1df4' (uniform texture1D) +0:66 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:66 Constant: 0:66 6 (const uint) 0:66 move second child to first child (temp uint) @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left 0:66 move second child to first child (temp uint) 0:66 'NumberOfLevelsU' (temp uint) 0:66 textureQueryLevels (temp uint) -0:66 'g_tTex1df4' (uniform texture1D) +0:66 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:69 Sequence 0:69 move second child to first child (temp uint) 0:69 'sizeQueryTemp' (temp uint) @@ -1063,8 +1063,8 @@ gl_FragCoord origin is upper left 0:279 Branch: Return with expression 0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -1106,7 +1106,7 @@ gl_FragCoord origin is upper left 0:65 move second child to first child (temp uint) 0:65 'sizeQueryTemp' (temp uint) 0:65 textureSize (temp uint) -0:65 'g_tTex1df4' (uniform texture1D) +0:65 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:65 move second child to first child (temp uint) 0:65 'WidthU' (temp uint) 0:65 'sizeQueryTemp' (temp uint) @@ -1114,7 +1114,7 @@ gl_FragCoord origin is upper left 0:66 move second child to first child (temp uint) 0:66 'sizeQueryTemp' (temp uint) 0:66 textureSize (temp uint) -0:66 'g_tTex1df4' (uniform texture1D) +0:66 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:66 Constant: 0:66 6 (const uint) 0:66 move second child to first child (temp uint) @@ -1123,7 +1123,7 @@ gl_FragCoord origin is upper left 0:66 move second child to first child (temp uint) 0:66 'NumberOfLevelsU' (temp uint) 0:66 textureQueryLevels (temp uint) -0:66 'g_tTex1df4' (uniform texture1D) +0:66 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:69 Sequence 0:69 move second child to first child (temp uint) 0:69 'sizeQueryTemp' (temp uint) @@ -2160,8 +2160,8 @@ gl_FragCoord origin is upper left 0:279 Branch: Return with expression 0:279 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -2291,6 +2291,7 @@ gl_FragCoord origin is upper left Name 524 "psout" Name 537 "g_sSamp" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 57(g_tTex1df4a) DescriptorSet 0 @@ -2319,6 +2320,7 @@ gl_FragCoord origin is upper left Decorate 510(g_tTex2dmsu4a) DescriptorSet 0 MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 537(g_sSamp) DescriptorSet 0 + Decorate 537(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out index 27d4dbe..9170402 100644 --- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out +++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out @@ -8,7 +8,7 @@ Shader version: 450 0:21 move second child to first child (temp uint) 0:21 'sizeQueryTemp' (temp uint) 0:21 textureSize (temp uint) -0:21 'g_tTex1df4' (uniform texture1D) +0:21 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:21 move second child to first child (temp uint) 0:21 'WidthU' (temp uint) 0:21 'sizeQueryTemp' (temp uint) @@ -16,7 +16,7 @@ Shader version: 450 0:22 move second child to first child (temp uint) 0:22 'sizeQueryTemp' (temp uint) 0:22 textureSize (temp uint) -0:22 'g_tTex1df4' (uniform texture1D) +0:22 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:22 Constant: 0:22 6 (const uint) 0:22 move second child to first child (temp uint) @@ -25,7 +25,7 @@ Shader version: 450 0:22 move second child to first child (temp uint) 0:22 'NumberOfLevelsU' (temp uint) 0:22 textureQueryLevels (temp uint) -0:22 'g_tTex1df4' (uniform texture1D) +0:22 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:24 move second child to first child (temp 4-component vector of float) 0:24 Pos: direct index for structure (temp 4-component vector of float FragCoord) 0:24 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) @@ -39,8 +39,8 @@ Shader version: 450 0:26 Branch: Return with expression 0:26 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) Linked vertex stage: @@ -55,7 +55,7 @@ Shader version: 450 0:21 move second child to first child (temp uint) 0:21 'sizeQueryTemp' (temp uint) 0:21 textureSize (temp uint) -0:21 'g_tTex1df4' (uniform texture1D) +0:21 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:21 move second child to first child (temp uint) 0:21 'WidthU' (temp uint) 0:21 'sizeQueryTemp' (temp uint) @@ -63,7 +63,7 @@ Shader version: 450 0:22 move second child to first child (temp uint) 0:22 'sizeQueryTemp' (temp uint) 0:22 textureSize (temp uint) -0:22 'g_tTex1df4' (uniform texture1D) +0:22 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:22 Constant: 0:22 6 (const uint) 0:22 move second child to first child (temp uint) @@ -72,7 +72,7 @@ Shader version: 450 0:22 move second child to first child (temp uint) 0:22 'NumberOfLevelsU' (temp uint) 0:22 textureQueryLevels (temp uint) -0:22 'g_tTex1df4' (uniform texture1D) +0:22 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:24 move second child to first child (temp 4-component vector of float) 0:24 Pos: direct index for structure (temp 4-component vector of float FragCoord) 0:24 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) @@ -86,8 +86,8 @@ Shader version: 450 0:26 Branch: Return with expression 0:26 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) // Module Version 10000 // Generated by (magic number): 80001 @@ -111,8 +111,10 @@ Shader version: 450 Name 29 "vsout" Name 39 "g_sSamp" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 MemberDecorate 27(VS_OUTPUT) 0 BuiltIn FragCoord Decorate 39(g_sSamp) DescriptorSet 0 + Decorate 39(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 0 diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out index c1bb40e..e2cf6fe 100644 --- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out +++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out @@ -46,7 +46,7 @@ ERROR: node is still EOpNull! 0:22 Branch: Return with expression 0:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) @@ -96,7 +96,7 @@ ERROR: node is still EOpNull! 0:22 Branch: Return with expression 0:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsf4a' (uniform texture2DMSArray) diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out index 969bd7f..c9f4c91 100644 --- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out +++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out @@ -91,7 +91,7 @@ gl_FragCoord origin is upper left 0:54 Branch: Return with expression 0:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsi4' (uniform itexture2DMS) 0:? 'g_tTex2dmsu4' (uniform utexture2DMS) @@ -203,7 +203,7 @@ gl_FragCoord origin is upper left 0:54 Branch: Return with expression 0:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_tTex2dmsf4' (uniform texture2DMS) 0:? 'g_tTex2dmsi4' (uniform itexture2DMS) 0:? 'g_tTex2dmsu4' (uniform utexture2DMS) @@ -259,6 +259,7 @@ gl_FragCoord origin is upper left Decorate 64(g_tTex2dmsu4a) DescriptorSet 0 MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 95(g_sSamp) DescriptorSet 0 + Decorate 95(g_sSamp) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out index 16e3066..ea7e347 100644 --- a/Test/baseResults/hlsl.load.array.dx10.frag.out +++ b/Test/baseResults/hlsl.load.array.dx10.frag.out @@ -109,8 +109,8 @@ gl_FragCoord origin is upper left 0:70 Branch: Return with expression 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -254,8 +254,8 @@ gl_FragCoord origin is upper left 0:70 Branch: Return with expression 0:70 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -340,7 +340,9 @@ gl_FragCoord origin is upper left Decorate 68(g_tTex2du4a) DescriptorSet 0 MemberDecorate 75(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 90(g_sSamp) DescriptorSet 0 + Decorate 90(g_sSamp) Binding 0 Decorate 93(g_tTex1df4) DescriptorSet 0 + Decorate 93(g_tTex1df4) Binding 0 Decorate 96(g_tTex1di4) DescriptorSet 0 Decorate 99(g_tTex1du4) DescriptorSet 0 Decorate 102(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out index bae29aa..54f964e 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out @@ -6,7 +6,7 @@ gl_FragCoord origin is upper left 0:48 Function Parameters: 0:? Sequence 0:52 textureFetch (global 4-component vector of float) -0:52 'g_tTex1df4' (uniform texture1D) +0:52 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:52 vector swizzle (temp int) 0:52 'c2' (uniform 2-component vector of int) 0:52 Sequence @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:75 Branch: Return with expression 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -184,7 +184,7 @@ gl_FragCoord origin is upper left 0:48 Function Parameters: 0:? Sequence 0:52 textureFetch (global 4-component vector of float) -0:52 'g_tTex1df4' (uniform texture1D) +0:52 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:52 vector swizzle (temp int) 0:52 'c2' (uniform 2-component vector of int) 0:52 Sequence @@ -320,8 +320,8 @@ gl_FragCoord origin is upper left 0:75 Branch: Return with expression 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -399,6 +399,7 @@ gl_FragCoord origin is upper left Name 161 "o3" Name 162 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 + Decorate 9(g_tTex1df4) Binding 0 Decorate 27(g_tTex1di4) DescriptorSet 0 Decorate 37(g_tTex1du4) DescriptorSet 0 Decorate 47(g_tTex2df4) DescriptorSet 0 @@ -409,6 +410,7 @@ gl_FragCoord origin is upper left Decorate 99(g_tTex3du4) DescriptorSet 0 MemberDecorate 106(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 121(g_sSamp) DescriptorSet 0 + Decorate 121(g_sSamp) Binding 0 Decorate 124(g_tTexcdf4) DescriptorSet 0 Decorate 127(g_tTexcdi4) DescriptorSet 0 Decorate 130(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out index d393dba..cd4fea5 100644 --- a/Test/baseResults/hlsl.load.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out @@ -5,7 +5,7 @@ Shader version: 450 0:47 Function Parameters: 0:? Sequence 0:51 textureFetch (global 4-component vector of float) -0:51 'g_tTex1df4' (uniform texture1D) +0:51 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:51 vector swizzle (temp int) 0:51 'c2' (uniform 2-component vector of int) 0:51 Sequence @@ -134,8 +134,8 @@ Shader version: 450 0:69 Branch: Return with expression 0:69 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -175,7 +175,7 @@ Shader version: 450 0:47 Function Parameters: 0:? Sequence 0:51 textureFetch (global 4-component vector of float) -0:51 'g_tTex1df4' (uniform texture1D) +0:51 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:51 vector swizzle (temp int) 0:51 'c2' (uniform 2-component vector of int) 0:51 Sequence @@ -304,8 +304,8 @@ Shader version: 450 0:69 Branch: Return with expression 0:69 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -381,6 +381,7 @@ Shader version: 450 Name 158 "o3" Name 159 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 + Decorate 9(g_tTex1df4) Binding 0 Decorate 27(g_tTex1di4) DescriptorSet 0 Decorate 37(g_tTex1du4) DescriptorSet 0 Decorate 47(g_tTex2df4) DescriptorSet 0 @@ -391,6 +392,7 @@ Shader version: 450 Decorate 99(g_tTex3du4) DescriptorSet 0 MemberDecorate 106(VS_OUTPUT) 0 BuiltIn FragCoord Decorate 118(g_sSamp) DescriptorSet 0 + Decorate 118(g_sSamp) Binding 0 Decorate 121(g_tTexcdf4) DescriptorSet 0 Decorate 124(g_tTexcdi4) DescriptorSet 0 Decorate 127(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out index f00962b..8c77675 100644 --- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out +++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out @@ -43,7 +43,7 @@ gl_FragCoord origin is upper left 0:37 Branch: Return with expression 0:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_tTexbf4_test' (uniform samplerBuffer) +0:? 'g_tTexbf4_test' (layout(binding=0 ) uniform samplerBuffer) 0:? 'g_tTexbf4' (uniform samplerBuffer) 0:? 'g_tTexbi4' (uniform isamplerBuffer) 0:? 'g_tTexbu4' (uniform usamplerBuffer) @@ -104,7 +104,7 @@ gl_FragCoord origin is upper left 0:37 Branch: Return with expression 0:37 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_tTexbf4_test' (uniform samplerBuffer) +0:? 'g_tTexbf4_test' (layout(binding=0 ) uniform samplerBuffer) 0:? 'g_tTexbf4' (uniform samplerBuffer) 0:? 'g_tTexbi4' (uniform isamplerBuffer) 0:? 'g_tTexbu4' (uniform usamplerBuffer) @@ -153,6 +153,7 @@ gl_FragCoord origin is upper left Decorate 39(g_tTexbu4) DescriptorSet 0 MemberDecorate 44(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 56(g_tTexbf4_test) DescriptorSet 0 + Decorate 56(g_tTexbf4_test) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out index fe7330a..da9f2e4 100644 --- a/Test/baseResults/hlsl.load.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out @@ -6,7 +6,7 @@ gl_FragCoord origin is upper left 0:48 Function Parameters: 0:? Sequence 0:52 textureFetchOffset (global 4-component vector of float) -0:52 'g_tTex1df4' (uniform texture1D) +0:52 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:52 vector swizzle (temp int) 0:52 'c2' (uniform 2-component vector of int) 0:52 Sequence @@ -151,8 +151,8 @@ gl_FragCoord origin is upper left 0:75 Branch: Return with expression 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -193,7 +193,7 @@ gl_FragCoord origin is upper left 0:48 Function Parameters: 0:? Sequence 0:52 textureFetchOffset (global 4-component vector of float) -0:52 'g_tTex1df4' (uniform texture1D) +0:52 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:52 vector swizzle (temp int) 0:52 'c2' (uniform 2-component vector of int) 0:52 Sequence @@ -338,8 +338,8 @@ gl_FragCoord origin is upper left 0:75 Branch: Return with expression 0:75 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -418,6 +418,7 @@ gl_FragCoord origin is upper left Name 170 "c1" Name 171 "o4" Decorate 9(g_tTex1df4) DescriptorSet 0 + Decorate 9(g_tTex1df4) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 40(g_tTex1du4) DescriptorSet 0 Decorate 51(g_tTex2df4) DescriptorSet 0 @@ -428,6 +429,7 @@ gl_FragCoord origin is upper left Decorate 110(g_tTex3du4) DescriptorSet 0 MemberDecorate 118(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 133(g_sSamp) DescriptorSet 0 + Decorate 133(g_sSamp) Binding 0 Decorate 136(g_tTexcdf4) DescriptorSet 0 Decorate 139(g_tTexcdi4) DescriptorSet 0 Decorate 142(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out index 16c64a8..97c164c 100644 --- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out @@ -115,8 +115,8 @@ gl_FragCoord origin is upper left 0:68 Branch: Return with expression 0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -266,8 +266,8 @@ gl_FragCoord origin is upper left 0:68 Branch: Return with expression 0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -353,7 +353,9 @@ gl_FragCoord origin is upper left Decorate 76(g_tTex2du4a) DescriptorSet 0 MemberDecorate 84(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 99(g_sSamp) DescriptorSet 0 + Decorate 99(g_sSamp) Binding 0 Decorate 102(g_tTex1df4) DescriptorSet 0 + Decorate 102(g_tTex1df4) Binding 0 Decorate 105(g_tTex1di4) DescriptorSet 0 Decorate 108(g_tTex1du4) DescriptorSet 0 Decorate 111(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out index 8e0cd61..6336cfa 100644 --- a/Test/baseResults/hlsl.sample.array.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 texture (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -21,7 +21,7 @@ gl_FragCoord origin is upper left 0:28 texture (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -31,7 +31,7 @@ gl_FragCoord origin is upper left 0:29 texture (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -52,7 +52,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -63,7 +63,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -74,7 +74,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -98,7 +98,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -124,9 +124,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -151,8 +151,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 texture (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -162,7 +162,7 @@ gl_FragCoord origin is upper left 0:28 texture (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -172,7 +172,7 @@ gl_FragCoord origin is upper left 0:29 texture (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -193,7 +193,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -204,7 +204,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -215,7 +215,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -227,7 +227,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -239,7 +239,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -265,9 +265,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -315,7 +315,9 @@ gl_FragCoord origin is upper left Name 122 "psout" Name 131 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 31(g_tTex1di4) DescriptorSet 0 Decorate 45(g_tTex1du4) DescriptorSet 0 Decorate 56(g_tTex2df4) DescriptorSet 0 @@ -326,6 +328,7 @@ gl_FragCoord origin is upper left Decorate 110(g_tTexcdu4) DescriptorSet 0 MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 131(g_tTex1df4a) DescriptorSet 0 + Decorate 131(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out index 3a94ee5..feb6461 100644 --- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out @@ -96,8 +96,8 @@ gl_FragCoord origin is upper left 0:70 'txval10' (temp 4-component vector of float) 0:70 texture (global 4-component vector of float) 0:70 Construct combined texture-sampler (temp sampler1D) -0:70 'g_tTex1df4' (uniform texture1D) -0:70 'g_sSamp' (uniform sampler) +0:70 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:70 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:70 Constant: 0:70 0.100000 0:71 Sequence @@ -106,7 +106,7 @@ gl_FragCoord origin is upper left 0:71 texture (global 4-component vector of int) 0:71 Construct combined texture-sampler (temp isampler1D) 0:71 'g_tTex1di4' (uniform itexture1D) -0:71 'g_sSamp' (uniform sampler) +0:71 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:71 Constant: 0:71 0.200000 0:72 Sequence @@ -115,7 +115,7 @@ gl_FragCoord origin is upper left 0:72 texture (global 4-component vector of uint) 0:72 Construct combined texture-sampler (temp usampler1D) 0:72 'g_tTex1du4' (uniform utexture1D) -0:72 'g_sSamp' (uniform sampler) +0:72 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:72 Constant: 0:72 0.300000 0:74 Sequence @@ -124,7 +124,7 @@ gl_FragCoord origin is upper left 0:74 texture (global 4-component vector of float) 0:74 Construct combined texture-sampler (temp sampler2D) 0:74 'g_tTex2df4' (uniform texture2D) -0:74 'g_sSamp' (uniform sampler) +0:74 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -134,7 +134,7 @@ gl_FragCoord origin is upper left 0:75 texture (global 4-component vector of int) 0:75 Construct combined texture-sampler (temp isampler2D) 0:75 'g_tTex2di4' (uniform itexture2D) -0:75 'g_sSamp' (uniform sampler) +0:75 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -144,7 +144,7 @@ gl_FragCoord origin is upper left 0:76 texture (global 4-component vector of uint) 0:76 Construct combined texture-sampler (temp usampler2D) 0:76 'g_tTex2du4' (uniform utexture2D) -0:76 'g_sSamp' (uniform sampler) +0:76 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -154,7 +154,7 @@ gl_FragCoord origin is upper left 0:78 texture (global 4-component vector of float) 0:78 Construct combined texture-sampler (temp sampler3D) 0:78 'g_tTex3df4' (uniform texture3D) -0:78 'g_sSamp' (uniform sampler) +0:78 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -165,7 +165,7 @@ gl_FragCoord origin is upper left 0:79 texture (global 4-component vector of int) 0:79 Construct combined texture-sampler (temp isampler3D) 0:79 'g_tTex3di4' (uniform itexture3D) -0:79 'g_sSamp' (uniform sampler) +0:79 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -176,7 +176,7 @@ gl_FragCoord origin is upper left 0:80 texture (global 4-component vector of uint) 0:80 Construct combined texture-sampler (temp usampler3D) 0:80 'g_tTex3du4' (uniform utexture3D) -0:80 'g_sSamp' (uniform sampler) +0:80 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -187,7 +187,7 @@ gl_FragCoord origin is upper left 0:82 texture (global 4-component vector of float) 0:82 Construct combined texture-sampler (temp samplerCube) 0:82 'g_tTexcdf4' (uniform textureCube) -0:82 'g_sSamp' (uniform sampler) +0:82 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -198,7 +198,7 @@ gl_FragCoord origin is upper left 0:83 texture (global 4-component vector of int) 0:83 Construct combined texture-sampler (temp isamplerCube) 0:83 'g_tTexcdi4' (uniform itextureCube) -0:83 'g_sSamp' (uniform sampler) +0:83 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -209,7 +209,7 @@ gl_FragCoord origin is upper left 0:84 texture (global 4-component vector of uint) 0:84 Construct combined texture-sampler (temp usamplerCube) 0:84 'g_tTexcdu4' (uniform utextureCube) -0:84 'g_sSamp' (uniform sampler) +0:84 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -234,11 +234,11 @@ gl_FragCoord origin is upper left 0:89 Branch: Return with expression 0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) 0:? 'g_sSamp2D_b' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -350,8 +350,8 @@ gl_FragCoord origin is upper left 0:70 'txval10' (temp 4-component vector of float) 0:70 texture (global 4-component vector of float) 0:70 Construct combined texture-sampler (temp sampler1D) -0:70 'g_tTex1df4' (uniform texture1D) -0:70 'g_sSamp' (uniform sampler) +0:70 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:70 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:70 Constant: 0:70 0.100000 0:71 Sequence @@ -360,7 +360,7 @@ gl_FragCoord origin is upper left 0:71 texture (global 4-component vector of int) 0:71 Construct combined texture-sampler (temp isampler1D) 0:71 'g_tTex1di4' (uniform itexture1D) -0:71 'g_sSamp' (uniform sampler) +0:71 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:71 Constant: 0:71 0.200000 0:72 Sequence @@ -369,7 +369,7 @@ gl_FragCoord origin is upper left 0:72 texture (global 4-component vector of uint) 0:72 Construct combined texture-sampler (temp usampler1D) 0:72 'g_tTex1du4' (uniform utexture1D) -0:72 'g_sSamp' (uniform sampler) +0:72 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:72 Constant: 0:72 0.300000 0:74 Sequence @@ -378,7 +378,7 @@ gl_FragCoord origin is upper left 0:74 texture (global 4-component vector of float) 0:74 Construct combined texture-sampler (temp sampler2D) 0:74 'g_tTex2df4' (uniform texture2D) -0:74 'g_sSamp' (uniform sampler) +0:74 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -388,7 +388,7 @@ gl_FragCoord origin is upper left 0:75 texture (global 4-component vector of int) 0:75 Construct combined texture-sampler (temp isampler2D) 0:75 'g_tTex2di4' (uniform itexture2D) -0:75 'g_sSamp' (uniform sampler) +0:75 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -398,7 +398,7 @@ gl_FragCoord origin is upper left 0:76 texture (global 4-component vector of uint) 0:76 Construct combined texture-sampler (temp usampler2D) 0:76 'g_tTex2du4' (uniform utexture2D) -0:76 'g_sSamp' (uniform sampler) +0:76 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -408,7 +408,7 @@ gl_FragCoord origin is upper left 0:78 texture (global 4-component vector of float) 0:78 Construct combined texture-sampler (temp sampler3D) 0:78 'g_tTex3df4' (uniform texture3D) -0:78 'g_sSamp' (uniform sampler) +0:78 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -419,7 +419,7 @@ gl_FragCoord origin is upper left 0:79 texture (global 4-component vector of int) 0:79 Construct combined texture-sampler (temp isampler3D) 0:79 'g_tTex3di4' (uniform itexture3D) -0:79 'g_sSamp' (uniform sampler) +0:79 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -430,7 +430,7 @@ gl_FragCoord origin is upper left 0:80 texture (global 4-component vector of uint) 0:80 Construct combined texture-sampler (temp usampler3D) 0:80 'g_tTex3du4' (uniform utexture3D) -0:80 'g_sSamp' (uniform sampler) +0:80 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -441,7 +441,7 @@ gl_FragCoord origin is upper left 0:82 texture (global 4-component vector of float) 0:82 Construct combined texture-sampler (temp samplerCube) 0:82 'g_tTexcdf4' (uniform textureCube) -0:82 'g_sSamp' (uniform sampler) +0:82 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -452,7 +452,7 @@ gl_FragCoord origin is upper left 0:83 texture (global 4-component vector of int) 0:83 Construct combined texture-sampler (temp isamplerCube) 0:83 'g_tTexcdi4' (uniform itextureCube) -0:83 'g_sSamp' (uniform sampler) +0:83 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -463,7 +463,7 @@ gl_FragCoord origin is upper left 0:84 texture (global 4-component vector of uint) 0:84 Construct combined texture-sampler (temp usamplerCube) 0:84 'g_tTexcdu4' (uniform utextureCube) -0:84 'g_sSamp' (uniform sampler) +0:84 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -488,11 +488,11 @@ gl_FragCoord origin is upper left 0:89 Branch: Return with expression 0:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) 0:? 'g_sSamp2D_b' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -564,7 +564,9 @@ gl_FragCoord origin is upper left Name 182 "g_sSamp2D_b" Name 183 "g_tTex1df4a" Decorate 41(g_tTex1df4) DescriptorSet 0 + Decorate 41(g_tTex1df4) Binding 0 Decorate 45(g_sSamp) DescriptorSet 0 + Decorate 45(g_sSamp) Binding 0 Decorate 56(g_tTex1di4) DescriptorSet 0 Decorate 69(g_tTex1du4) DescriptorSet 0 Decorate 79(g_tTex2df4) DescriptorSet 0 @@ -580,6 +582,7 @@ gl_FragCoord origin is upper left Decorate 181(g_sSamp2d) DescriptorSet 0 Decorate 182(g_sSamp2D_b) DescriptorSet 0 Decorate 183(g_tTex1df4a) DescriptorSet 0 + Decorate 183(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeInt 32 1 diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out index 42fe084..ce20777 100644 --- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -22,7 +22,7 @@ gl_FragCoord origin is upper left 0:32 textureOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:33 textureOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:35 textureOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -57,7 +57,7 @@ gl_FragCoord origin is upper left 0:36 textureOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -70,7 +70,7 @@ gl_FragCoord origin is upper left 0:37 textureOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -83,7 +83,7 @@ gl_FragCoord origin is upper left 0:39 textureOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -98,7 +98,7 @@ gl_FragCoord origin is upper left 0:40 textureOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -113,7 +113,7 @@ gl_FragCoord origin is upper left 0:41 textureOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -142,9 +142,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -172,8 +172,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -184,7 +184,7 @@ gl_FragCoord origin is upper left 0:32 textureOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -195,7 +195,7 @@ gl_FragCoord origin is upper left 0:33 textureOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -206,7 +206,7 @@ gl_FragCoord origin is upper left 0:35 textureOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -219,7 +219,7 @@ gl_FragCoord origin is upper left 0:36 textureOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -232,7 +232,7 @@ gl_FragCoord origin is upper left 0:37 textureOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:39 textureOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:40 textureOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -275,7 +275,7 @@ gl_FragCoord origin is upper left 0:41 textureOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -304,9 +304,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -359,7 +359,9 @@ gl_FragCoord origin is upper left Name 143 "g_tTexcdi4" Name 146 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 @@ -370,6 +372,7 @@ gl_FragCoord origin is upper left Decorate 116(g_tTex3du4) DescriptorSet 0 MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 137(g_tTex1df4a) DescriptorSet 0 + Decorate 137(g_tTex1df4a) Binding 1 Decorate 140(g_tTexcdf4) DescriptorSet 0 Decorate 143(g_tTexcdi4) DescriptorSet 0 Decorate 146(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out index ed3838f..008ba94 100644 --- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left 0:24 textureOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -35,7 +35,7 @@ gl_FragCoord origin is upper left 0:25 textureOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -47,7 +47,7 @@ gl_FragCoord origin is upper left 0:27 textureOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -61,7 +61,7 @@ gl_FragCoord origin is upper left 0:28 textureOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -75,7 +75,7 @@ gl_FragCoord origin is upper left 0:29 textureOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -103,9 +103,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -127,8 +127,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -140,7 +140,7 @@ gl_FragCoord origin is upper left 0:24 textureOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -152,7 +152,7 @@ gl_FragCoord origin is upper left 0:25 textureOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -164,7 +164,7 @@ gl_FragCoord origin is upper left 0:27 textureOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -178,7 +178,7 @@ gl_FragCoord origin is upper left 0:28 textureOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -192,7 +192,7 @@ gl_FragCoord origin is upper left 0:29 textureOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -220,9 +220,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -260,7 +260,9 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 103 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 32(g_tTex1di4) DescriptorSet 0 Decorate 47(g_tTex1du4) DescriptorSet 0 Decorate 59(g_tTex2df4) DescriptorSet 0 @@ -268,6 +270,7 @@ gl_FragCoord origin is upper left Decorate 83(g_tTex2du4) DescriptorSet 0 MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 103(g_tTex1df4a) DescriptorSet 0 + Decorate 103(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out index 3702269..b672544 100644 --- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 texture (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left 0:28 texture (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -35,7 +35,7 @@ gl_FragCoord origin is upper left 0:29 texture (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -47,7 +47,7 @@ gl_FragCoord origin is upper left 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -142,9 +142,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -169,8 +169,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 texture (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:28 texture (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -194,7 +194,7 @@ gl_FragCoord origin is upper left 0:29 texture (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -206,7 +206,7 @@ gl_FragCoord origin is upper left 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -219,7 +219,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -232,7 +232,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -259,7 +259,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -273,7 +273,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -301,9 +301,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -351,7 +351,9 @@ gl_FragCoord origin is upper left Name 122 "psout" Name 131 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 32(g_tTex1di4) DescriptorSet 0 Decorate 46(g_tTex1du4) DescriptorSet 0 Decorate 57(g_tTex2df4) DescriptorSet 0 @@ -362,6 +364,7 @@ gl_FragCoord origin is upper left Decorate 110(g_tTexcdu4) DescriptorSet 0 MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 131(g_tTex1df4a) DescriptorSet 0 + Decorate 131(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out index 97d756e..8161a59 100644 --- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -22,7 +22,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:39 texture (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -93,7 +93,7 @@ gl_FragCoord origin is upper left 0:40 texture (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -106,7 +106,7 @@ gl_FragCoord origin is upper left 0:41 texture (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -119,7 +119,7 @@ gl_FragCoord origin is upper left 0:43 texture (global 4-component vector of float) 0:43 Construct combined texture-sampler (temp samplerCube) 0:43 'g_tTexcdf4' (uniform textureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -132,7 +132,7 @@ gl_FragCoord origin is upper left 0:44 texture (global 4-component vector of int) 0:44 Construct combined texture-sampler (temp isamplerCube) 0:44 'g_tTexcdi4' (uniform itextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -145,7 +145,7 @@ gl_FragCoord origin is upper left 0:45 texture (global 4-component vector of uint) 0:45 Construct combined texture-sampler (temp usamplerCube) 0:45 'g_tTexcdu4' (uniform utextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -172,9 +172,9 @@ gl_FragCoord origin is upper left 0:50 Branch: Return with expression 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -202,8 +202,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 texture (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -214,7 +214,7 @@ gl_FragCoord origin is upper left 0:32 texture (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -225,7 +225,7 @@ gl_FragCoord origin is upper left 0:33 texture (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -236,7 +236,7 @@ gl_FragCoord origin is upper left 0:35 texture (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -248,7 +248,7 @@ gl_FragCoord origin is upper left 0:36 texture (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:37 texture (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -272,7 +272,7 @@ gl_FragCoord origin is upper left 0:39 texture (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -285,7 +285,7 @@ gl_FragCoord origin is upper left 0:40 texture (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -298,7 +298,7 @@ gl_FragCoord origin is upper left 0:41 texture (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -311,7 +311,7 @@ gl_FragCoord origin is upper left 0:43 texture (global 4-component vector of float) 0:43 Construct combined texture-sampler (temp samplerCube) 0:43 'g_tTexcdf4' (uniform textureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -324,7 +324,7 @@ gl_FragCoord origin is upper left 0:44 texture (global 4-component vector of int) 0:44 Construct combined texture-sampler (temp isamplerCube) 0:44 'g_tTexcdi4' (uniform itextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -337,7 +337,7 @@ gl_FragCoord origin is upper left 0:45 texture (global 4-component vector of uint) 0:45 Construct combined texture-sampler (temp usamplerCube) 0:45 'g_tTexcdu4' (uniform utextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -364,9 +364,9 @@ gl_FragCoord origin is upper left 0:50 Branch: Return with expression 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -422,7 +422,9 @@ gl_FragCoord origin is upper left Name 145 "psout" Name 155 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 @@ -436,6 +438,7 @@ gl_FragCoord origin is upper left Decorate 137(g_tTexcdu4) DescriptorSet 0 MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 155(g_tTex1df4a) DescriptorSet 0 + Decorate 155(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out index 4219bbc..8c5726c 100644 --- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:32 textureOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:33 textureOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left 0:35 textureOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -65,7 +65,7 @@ gl_FragCoord origin is upper left 0:36 textureOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:37 textureOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left 0:39 textureOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -112,7 +112,7 @@ gl_FragCoord origin is upper left 0:40 textureOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -129,7 +129,7 @@ gl_FragCoord origin is upper left 0:41 textureOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -160,9 +160,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -190,8 +190,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -204,7 +204,7 @@ gl_FragCoord origin is upper left 0:32 textureOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -217,7 +217,7 @@ gl_FragCoord origin is upper left 0:33 textureOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -230,7 +230,7 @@ gl_FragCoord origin is upper left 0:35 textureOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:36 textureOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:37 textureOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -275,7 +275,7 @@ gl_FragCoord origin is upper left 0:39 textureOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -292,7 +292,7 @@ gl_FragCoord origin is upper left 0:40 textureOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -309,7 +309,7 @@ gl_FragCoord origin is upper left 0:41 textureOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -340,9 +340,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -395,7 +395,9 @@ gl_FragCoord origin is upper left Name 143 "g_tTexcdi4" Name 146 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 30(g_tTex1di4) DescriptorSet 0 Decorate 43(g_tTex1du4) DescriptorSet 0 Decorate 53(g_tTex2df4) DescriptorSet 0 @@ -406,6 +408,7 @@ gl_FragCoord origin is upper left Decorate 116(g_tTex3du4) DescriptorSet 0 MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 137(g_tTex1df4a) DescriptorSet 0 + Decorate 137(g_tTex1df4a) Binding 1 Decorate 140(g_tTexcdf4) DescriptorSet 0 Decorate 143(g_tTexcdi4) DescriptorSet 0 Decorate 146(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out index 925c40e..0933594 100644 --- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:24 textureOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:25 textureOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:27 textureOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -69,7 +69,7 @@ gl_FragCoord origin is upper left 0:28 textureOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -85,7 +85,7 @@ gl_FragCoord origin is upper left 0:29 textureOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -115,9 +115,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -154,7 +154,7 @@ gl_FragCoord origin is upper left 0:24 textureOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -168,7 +168,7 @@ gl_FragCoord origin is upper left 0:25 textureOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:27 textureOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -198,7 +198,7 @@ gl_FragCoord origin is upper left 0:28 textureOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -214,7 +214,7 @@ gl_FragCoord origin is upper left 0:29 textureOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -244,9 +244,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -284,7 +284,9 @@ gl_FragCoord origin is upper left Name 95 "psout" Name 103 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 33(g_tTex1di4) DescriptorSet 0 Decorate 48(g_tTex1du4) DescriptorSet 0 Decorate 60(g_tTex2df4) DescriptorSet 0 @@ -292,6 +294,7 @@ gl_FragCoord origin is upper left Decorate 83(g_tTex2du4) DescriptorSet 0 MemberDecorate 93(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 103(g_tTex1df4a) DescriptorSet 0 + Decorate 103(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out index 6114c0f..1b2d27f 100644 --- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:42 texture (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:43 texture (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:44 texture (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left 0:47 texture (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -64,7 +64,7 @@ gl_FragCoord origin is upper left 0:48 texture (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -78,7 +78,7 @@ gl_FragCoord origin is upper left 0:49 texture (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -92,7 +92,7 @@ gl_FragCoord origin is upper left 0:52 texture (global float) 0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow) 0:52 'g_tTexcdf4a' (uniform textureCubeArray) -0:52 'g_sSamp' (uniform sampler) +0:52 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:52 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -107,7 +107,7 @@ gl_FragCoord origin is upper left 0:53 texture (global float) 0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow) 0:53 'g_tTexcdi4a' (uniform itextureCubeArray) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -122,7 +122,7 @@ gl_FragCoord origin is upper left 0:54 texture (global float) 0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow) 0:54 'g_tTexcdu4a' (uniform utextureCubeArray) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -151,8 +151,8 @@ gl_FragCoord origin is upper left 0:59 Branch: Return with expression 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -190,7 +190,7 @@ gl_FragCoord origin is upper left 0:42 texture (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -203,7 +203,7 @@ gl_FragCoord origin is upper left 0:43 texture (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -216,7 +216,7 @@ gl_FragCoord origin is upper left 0:44 texture (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -229,7 +229,7 @@ gl_FragCoord origin is upper left 0:47 texture (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -243,7 +243,7 @@ gl_FragCoord origin is upper left 0:48 texture (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -257,7 +257,7 @@ gl_FragCoord origin is upper left 0:49 texture (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -271,7 +271,7 @@ gl_FragCoord origin is upper left 0:52 texture (global float) 0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow) 0:52 'g_tTexcdf4a' (uniform textureCubeArray) -0:52 'g_sSamp' (uniform sampler) +0:52 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:52 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -286,7 +286,7 @@ gl_FragCoord origin is upper left 0:53 texture (global float) 0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow) 0:53 'g_tTexcdi4a' (uniform itextureCubeArray) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -301,7 +301,7 @@ gl_FragCoord origin is upper left 0:54 texture (global float) 0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow) 0:54 'g_tTexcdu4a' (uniform utextureCubeArray) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -330,8 +330,8 @@ gl_FragCoord origin is upper left 0:59 Branch: Return with expression 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -403,6 +403,7 @@ gl_FragCoord origin is upper left Name 176 "g_tTexcdu4" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 32(g_tTex1di4a) DescriptorSet 0 Decorate 45(g_tTex1du4a) DescriptorSet 0 Decorate 57(g_tTex2df4a) DescriptorSet 0 @@ -413,6 +414,7 @@ gl_FragCoord origin is upper left Decorate 121(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 143(g_tTex1df4) DescriptorSet 0 + Decorate 143(g_tTex1df4) Binding 0 Decorate 146(g_tTex1di4) DescriptorSet 0 Decorate 149(g_tTex1du4) DescriptorSet 0 Decorate 152(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out index f0528de..3068030 100644 --- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:42 'r00' (temp float) 0:42 texture (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left 0:43 texture (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -35,7 +35,7 @@ gl_FragCoord origin is upper left 0:44 texture (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -47,7 +47,7 @@ gl_FragCoord origin is upper left 0:47 texture (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left 0:48 texture (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:49 texture (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left 0:53 texture (global float) 0:53 Construct combined texture-sampler (temp samplerCubeShadow) 0:53 'g_tTexcdf4' (uniform textureCube) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:54 texture (global float) 0:54 Construct combined texture-sampler (temp isamplerCubeShadow) 0:54 'g_tTexcdi4' (uniform itextureCube) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:55 texture (global float) 0:55 Construct combined texture-sampler (temp usamplerCubeShadow) 0:55 'g_tTexcdu4' (uniform utextureCube) -0:55 'g_sSamp' (uniform sampler) +0:55 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:55 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -142,8 +142,8 @@ gl_FragCoord origin is upper left 0:60 Branch: Return with expression 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -180,8 +180,8 @@ gl_FragCoord origin is upper left 0:42 'r00' (temp float) 0:42 texture (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -193,7 +193,7 @@ gl_FragCoord origin is upper left 0:43 texture (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -205,7 +205,7 @@ gl_FragCoord origin is upper left 0:44 texture (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -217,7 +217,7 @@ gl_FragCoord origin is upper left 0:47 texture (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -230,7 +230,7 @@ gl_FragCoord origin is upper left 0:48 texture (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -243,7 +243,7 @@ gl_FragCoord origin is upper left 0:49 texture (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -256,7 +256,7 @@ gl_FragCoord origin is upper left 0:53 texture (global float) 0:53 Construct combined texture-sampler (temp samplerCubeShadow) 0:53 'g_tTexcdf4' (uniform textureCube) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -270,7 +270,7 @@ gl_FragCoord origin is upper left 0:54 texture (global float) 0:54 Construct combined texture-sampler (temp isamplerCubeShadow) 0:54 'g_tTexcdi4' (uniform itextureCube) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -284,7 +284,7 @@ gl_FragCoord origin is upper left 0:55 texture (global float) 0:55 Construct combined texture-sampler (temp usamplerCubeShadow) 0:55 'g_tTexcdu4' (uniform utextureCube) -0:55 'g_sSamp' (uniform sampler) +0:55 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:55 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -312,8 +312,8 @@ gl_FragCoord origin is upper left 0:60 Branch: Return with expression 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -384,7 +384,9 @@ gl_FragCoord origin is upper left Name 171 "g_tTexcdi4a" Name 174 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 + Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 28(g_tTex1di4) DescriptorSet 0 Decorate 40(g_tTex1du4) DescriptorSet 0 Decorate 51(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out index 04d5972..df298da 100644 --- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:42 'r01' (temp float) 0:42 textureOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:43 textureOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:44 textureOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:47 textureOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -69,7 +69,7 @@ gl_FragCoord origin is upper left 0:48 textureOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -85,7 +85,7 @@ gl_FragCoord origin is upper left 0:49 textureOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -115,8 +115,8 @@ gl_FragCoord origin is upper left 0:65 Branch: Return with expression 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -153,8 +153,8 @@ gl_FragCoord origin is upper left 0:42 'r01' (temp float) 0:42 textureOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -168,7 +168,7 @@ gl_FragCoord origin is upper left 0:43 textureOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:44 textureOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -196,7 +196,7 @@ gl_FragCoord origin is upper left 0:47 textureOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -212,7 +212,7 @@ gl_FragCoord origin is upper left 0:48 textureOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -228,7 +228,7 @@ gl_FragCoord origin is upper left 0:49 textureOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -258,8 +258,8 @@ gl_FragCoord origin is upper left 0:65 Branch: Return with expression 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -327,7 +327,9 @@ gl_FragCoord origin is upper left Name 145 "g_tTexcdi4a" Name 148 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 + Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 41(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out index ebafd9e..5d42073 100644 --- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:42 textureOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left 0:43 textureOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left 0:44 textureOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:47 textureOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:48 textureOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -90,7 +90,7 @@ gl_FragCoord origin is upper left 0:49 textureOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -121,8 +121,8 @@ gl_FragCoord origin is upper left 0:66 Branch: Return with expression 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -160,7 +160,7 @@ gl_FragCoord origin is upper left 0:42 textureOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -175,7 +175,7 @@ gl_FragCoord origin is upper left 0:43 textureOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -190,7 +190,7 @@ gl_FragCoord origin is upper left 0:44 textureOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -205,7 +205,7 @@ gl_FragCoord origin is upper left 0:47 textureOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -222,7 +222,7 @@ gl_FragCoord origin is upper left 0:48 textureOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -239,7 +239,7 @@ gl_FragCoord origin is upper left 0:49 textureOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -270,8 +270,8 @@ gl_FragCoord origin is upper left 0:66 Branch: Return with expression 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -340,6 +340,7 @@ gl_FragCoord origin is upper left Name 154 "g_tTexcdu4a" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 33(g_tTex1di4a) DescriptorSet 0 Decorate 46(g_tTex1du4a) DescriptorSet 0 Decorate 58(g_tTex2df4a) DescriptorSet 0 @@ -347,6 +348,7 @@ gl_FragCoord origin is upper left Decorate 88(g_tTex2du4a) DescriptorSet 0 MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 112(g_tTex1df4) DescriptorSet 0 + Decorate 112(g_tTex1df4) Binding 0 Decorate 115(g_tTex1di4) DescriptorSet 0 Decorate 118(g_tTex1du4) DescriptorSet 0 Decorate 121(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out index afe088f..c54e2d5 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:42 textureLod (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left 0:43 textureLod (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:47 textureLod (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -72,7 +72,7 @@ gl_FragCoord origin is upper left 0:48 textureLod (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -88,7 +88,7 @@ gl_FragCoord origin is upper left 0:49 textureLod (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -104,7 +104,7 @@ gl_FragCoord origin is upper left 0:52 textureLod (global float) 0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow) 0:52 'g_tTexcdf4a' (uniform textureCubeArray) -0:52 'g_sSamp' (uniform sampler) +0:52 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:52 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -121,7 +121,7 @@ gl_FragCoord origin is upper left 0:53 textureLod (global float) 0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow) 0:53 'g_tTexcdi4a' (uniform itextureCubeArray) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -138,7 +138,7 @@ gl_FragCoord origin is upper left 0:54 textureLod (global float) 0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow) 0:54 'g_tTexcdu4a' (uniform utextureCubeArray) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -169,8 +169,8 @@ gl_FragCoord origin is upper left 0:59 Branch: Return with expression 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -208,7 +208,7 @@ gl_FragCoord origin is upper left 0:42 textureLod (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -223,7 +223,7 @@ gl_FragCoord origin is upper left 0:43 textureLod (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -238,7 +238,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -253,7 +253,7 @@ gl_FragCoord origin is upper left 0:47 textureLod (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -269,7 +269,7 @@ gl_FragCoord origin is upper left 0:48 textureLod (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -285,7 +285,7 @@ gl_FragCoord origin is upper left 0:49 textureLod (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -301,7 +301,7 @@ gl_FragCoord origin is upper left 0:52 textureLod (global float) 0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow) 0:52 'g_tTexcdf4a' (uniform textureCubeArray) -0:52 'g_sSamp' (uniform sampler) +0:52 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:52 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -318,7 +318,7 @@ gl_FragCoord origin is upper left 0:53 textureLod (global float) 0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow) 0:53 'g_tTexcdi4a' (uniform itextureCubeArray) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -335,7 +335,7 @@ gl_FragCoord origin is upper left 0:54 textureLod (global float) 0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow) 0:54 'g_tTexcdu4a' (uniform utextureCubeArray) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -366,8 +366,8 @@ gl_FragCoord origin is upper left 0:59 Branch: Return with expression 0:59 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -439,6 +439,7 @@ gl_FragCoord origin is upper left Name 177 "g_tTexcdu4" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 33(g_tTex1di4a) DescriptorSet 0 Decorate 46(g_tTex1du4a) DescriptorSet 0 Decorate 58(g_tTex2df4a) DescriptorSet 0 @@ -449,6 +450,7 @@ gl_FragCoord origin is upper left Decorate 122(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 144(g_tTex1df4) DescriptorSet 0 + Decorate 144(g_tTex1df4) Binding 0 Decorate 147(g_tTex1di4) DescriptorSet 0 Decorate 150(g_tTex1du4) DescriptorSet 0 Decorate 153(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out index 324db08..1fbdb48 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:42 'r00' (temp float) 0:42 textureLod (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:43 textureLod (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:47 textureLod (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:48 textureLod (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -83,7 +83,7 @@ gl_FragCoord origin is upper left 0:49 textureLod (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -98,7 +98,7 @@ gl_FragCoord origin is upper left 0:53 textureLod (global float) 0:53 Construct combined texture-sampler (temp samplerCubeShadow) 0:53 'g_tTexcdf4' (uniform textureCube) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:54 textureLod (global float) 0:54 Construct combined texture-sampler (temp isamplerCubeShadow) 0:54 'g_tTexcdi4' (uniform itextureCube) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -130,7 +130,7 @@ gl_FragCoord origin is upper left 0:55 textureLod (global float) 0:55 Construct combined texture-sampler (temp usamplerCubeShadow) 0:55 'g_tTexcdu4' (uniform utextureCube) -0:55 'g_sSamp' (uniform sampler) +0:55 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:55 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:60 Branch: Return with expression 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -198,8 +198,8 @@ gl_FragCoord origin is upper left 0:42 'r00' (temp float) 0:42 textureLod (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -213,7 +213,7 @@ gl_FragCoord origin is upper left 0:43 textureLod (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -227,7 +227,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -241,7 +241,7 @@ gl_FragCoord origin is upper left 0:47 textureLod (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -256,7 +256,7 @@ gl_FragCoord origin is upper left 0:48 textureLod (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -271,7 +271,7 @@ gl_FragCoord origin is upper left 0:49 textureLod (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -286,7 +286,7 @@ gl_FragCoord origin is upper left 0:53 textureLod (global float) 0:53 Construct combined texture-sampler (temp samplerCubeShadow) 0:53 'g_tTexcdf4' (uniform textureCube) -0:53 'g_sSamp' (uniform sampler) +0:53 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:53 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -302,7 +302,7 @@ gl_FragCoord origin is upper left 0:54 textureLod (global float) 0:54 Construct combined texture-sampler (temp isamplerCubeShadow) 0:54 'g_tTexcdi4' (uniform itextureCube) -0:54 'g_sSamp' (uniform sampler) +0:54 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:54 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -318,7 +318,7 @@ gl_FragCoord origin is upper left 0:55 textureLod (global float) 0:55 Construct combined texture-sampler (temp usamplerCubeShadow) 0:55 'g_tTexcdu4' (uniform utextureCube) -0:55 'g_sSamp' (uniform sampler) +0:55 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:55 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -348,8 +348,8 @@ gl_FragCoord origin is upper left 0:60 Branch: Return with expression 0:60 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -420,7 +420,9 @@ gl_FragCoord origin is upper left Name 172 "g_tTexcdi4a" Name 175 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 + Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 41(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out index 0da8ef0..68d07d5 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:42 'r01' (temp float) 0:42 textureLodOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -27,7 +27,7 @@ gl_FragCoord origin is upper left 0:43 textureLodOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -43,7 +43,7 @@ gl_FragCoord origin is upper left 0:44 textureLodOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -59,7 +59,7 @@ gl_FragCoord origin is upper left 0:47 textureLodOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -77,7 +77,7 @@ gl_FragCoord origin is upper left 0:48 textureLodOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left 0:49 textureLodOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -127,8 +127,8 @@ gl_FragCoord origin is upper left 0:65 Branch: Return with expression 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -165,8 +165,8 @@ gl_FragCoord origin is upper left 0:42 'r01' (temp float) 0:42 textureLodOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DShadow) -0:42 'g_tTex1df4' (uniform texture1D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec2 (temp float) 0:42 Constant: 0:42 0.100000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:43 textureLodOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DShadow) 0:43 'g_tTex1di4' (uniform itexture1D) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec2 (temp float) 0:43 Constant: 0:43 0.100000 @@ -198,7 +198,7 @@ gl_FragCoord origin is upper left 0:44 textureLodOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DShadow) 0:44 'g_tTex1du4' (uniform utexture1D) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec2 (temp float) 0:44 Constant: 0:44 0.100000 @@ -214,7 +214,7 @@ gl_FragCoord origin is upper left 0:47 textureLodOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DShadow) 0:47 'g_tTex2df4' (uniform texture2D) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -232,7 +232,7 @@ gl_FragCoord origin is upper left 0:48 textureLodOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DShadow) 0:48 'g_tTex2di4' (uniform itexture2D) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -250,7 +250,7 @@ gl_FragCoord origin is upper left 0:49 textureLodOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DShadow) 0:49 'g_tTex2du4' (uniform utexture2D) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -282,8 +282,8 @@ gl_FragCoord origin is upper left 0:65 Branch: Return with expression 0:65 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -351,7 +351,9 @@ gl_FragCoord origin is upper left Name 146 "g_tTexcdi4a" Name 149 "g_tTexcdu4a" Decorate 11(g_tTex1df4) DescriptorSet 0 + Decorate 11(g_tTex1df4) Binding 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 30(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 53(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out index 0e26ce4..627b023 100644 --- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out @@ -11,7 +11,7 @@ gl_FragCoord origin is upper left 0:42 textureLodOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -28,7 +28,7 @@ gl_FragCoord origin is upper left 0:43 textureLodOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -45,7 +45,7 @@ gl_FragCoord origin is upper left 0:44 textureLodOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -62,7 +62,7 @@ gl_FragCoord origin is upper left 0:47 textureLodOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -81,7 +81,7 @@ gl_FragCoord origin is upper left 0:48 textureLodOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:49 textureLodOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -133,8 +133,8 @@ gl_FragCoord origin is upper left 0:66 Branch: Return with expression 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -172,7 +172,7 @@ gl_FragCoord origin is upper left 0:42 textureLodOffset (global float) 0:42 Construct combined texture-sampler (temp sampler1DArrayShadow) 0:42 'g_tTex1df4a' (uniform texture1DArray) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:42 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -189,7 +189,7 @@ gl_FragCoord origin is upper left 0:43 textureLodOffset (global float) 0:43 Construct combined texture-sampler (temp isampler1DArrayShadow) 0:43 'g_tTex1di4a' (uniform itexture1DArray) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:43 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -206,7 +206,7 @@ gl_FragCoord origin is upper left 0:44 textureLodOffset (global float) 0:44 Construct combined texture-sampler (temp usampler1DArrayShadow) 0:44 'g_tTex1du4a' (uniform utexture1DArray) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:44 Construct vec3 (temp float) 0:? Constant: 0:? 0.100000 @@ -223,7 +223,7 @@ gl_FragCoord origin is upper left 0:47 textureLodOffset (global float) 0:47 Construct combined texture-sampler (temp sampler2DArrayShadow) 0:47 'g_tTex2df4a' (uniform texture2DArray) -0:47 'g_sSamp' (uniform sampler) +0:47 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:47 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -242,7 +242,7 @@ gl_FragCoord origin is upper left 0:48 textureLodOffset (global float) 0:48 Construct combined texture-sampler (temp isampler2DArrayShadow) 0:48 'g_tTex2di4a' (uniform itexture2DArray) -0:48 'g_sSamp' (uniform sampler) +0:48 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:48 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -261,7 +261,7 @@ gl_FragCoord origin is upper left 0:49 textureLodOffset (global float) 0:49 Construct combined texture-sampler (temp usampler2DArrayShadow) 0:49 'g_tTex2du4a' (uniform utexture2DArray) -0:49 'g_sSamp' (uniform sampler) +0:49 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:49 Construct vec4 (temp float) 0:? Constant: 0:? 0.100000 @@ -294,8 +294,8 @@ gl_FragCoord origin is upper left 0:66 Branch: Return with expression 0:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -364,6 +364,7 @@ gl_FragCoord origin is upper left Name 155 "g_tTexcdu4a" Decorate 11(g_tTex1df4a) DescriptorSet 0 Decorate 15(g_sSamp) DescriptorSet 0 + Decorate 15(g_sSamp) Binding 0 Decorate 34(g_tTex1di4a) DescriptorSet 0 Decorate 47(g_tTex1du4a) DescriptorSet 0 Decorate 59(g_tTex2df4a) DescriptorSet 0 @@ -371,6 +372,7 @@ gl_FragCoord origin is upper left Decorate 89(g_tTex2du4a) DescriptorSet 0 MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 113(g_tTex1df4) DescriptorSet 0 + Decorate 113(g_tTex1df4) Binding 0 Decorate 116(g_tTex1di4) DescriptorSet 0 Decorate 119(g_tTex1du4) DescriptorSet 0 Decorate 122(g_tTex2df4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out index 0fbb413..6da919a 100644 --- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureGrad (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:28 textureGrad (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:29 textureGrad (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:31 textureGrad (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -70,7 +70,7 @@ gl_FragCoord origin is upper left 0:32 textureGrad (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -87,7 +87,7 @@ gl_FragCoord origin is upper left 0:33 textureGrad (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -104,7 +104,7 @@ gl_FragCoord origin is upper left 0:35 textureGrad (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -124,7 +124,7 @@ gl_FragCoord origin is upper left 0:36 textureGrad (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -144,7 +144,7 @@ gl_FragCoord origin is upper left 0:37 textureGrad (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -178,9 +178,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -205,8 +205,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureGrad (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -220,7 +220,7 @@ gl_FragCoord origin is upper left 0:28 textureGrad (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -234,7 +234,7 @@ gl_FragCoord origin is upper left 0:29 textureGrad (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -248,7 +248,7 @@ gl_FragCoord origin is upper left 0:31 textureGrad (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -265,7 +265,7 @@ gl_FragCoord origin is upper left 0:32 textureGrad (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -282,7 +282,7 @@ gl_FragCoord origin is upper left 0:33 textureGrad (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -299,7 +299,7 @@ gl_FragCoord origin is upper left 0:35 textureGrad (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -319,7 +319,7 @@ gl_FragCoord origin is upper left 0:36 textureGrad (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -339,7 +339,7 @@ gl_FragCoord origin is upper left 0:37 textureGrad (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -373,9 +373,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -423,7 +423,9 @@ gl_FragCoord origin is upper left Name 115 "psout" Name 125 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 33(g_tTex1di4) DescriptorSet 0 Decorate 45(g_tTex1du4) DescriptorSet 0 Decorate 54(g_tTex2df4) DescriptorSet 0 @@ -434,6 +436,7 @@ gl_FragCoord origin is upper left Decorate 107(g_tTexcdu4) DescriptorSet 0 MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 125(g_tTex1df4a) DescriptorSet 0 + Decorate 125(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out index 97b08f7..0685dc2 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureGrad (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:32 textureGrad (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:33 textureGrad (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left 0:35 textureGrad (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -66,7 +66,7 @@ gl_FragCoord origin is upper left 0:36 textureGrad (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -82,7 +82,7 @@ gl_FragCoord origin is upper left 0:37 textureGrad (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -98,7 +98,7 @@ gl_FragCoord origin is upper left 0:39 textureGrad (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -117,7 +117,7 @@ gl_FragCoord origin is upper left 0:40 textureGrad (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -136,7 +136,7 @@ gl_FragCoord origin is upper left 0:41 textureGrad (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -155,7 +155,7 @@ gl_FragCoord origin is upper left 0:43 textureGrad (global 4-component vector of float) 0:43 Construct combined texture-sampler (temp samplerCube) 0:43 'g_tTexcdf4' (uniform textureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -174,7 +174,7 @@ gl_FragCoord origin is upper left 0:44 textureGrad (global 4-component vector of int) 0:44 Construct combined texture-sampler (temp isamplerCube) 0:44 'g_tTexcdi4' (uniform itextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -193,7 +193,7 @@ gl_FragCoord origin is upper left 0:45 textureGrad (global 4-component vector of uint) 0:45 Construct combined texture-sampler (temp usamplerCube) 0:45 'g_tTexcdu4' (uniform utextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -226,9 +226,9 @@ gl_FragCoord origin is upper left 0:50 Branch: Return with expression 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -256,8 +256,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureGrad (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -270,7 +270,7 @@ gl_FragCoord origin is upper left 0:32 textureGrad (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -283,7 +283,7 @@ gl_FragCoord origin is upper left 0:33 textureGrad (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -296,7 +296,7 @@ gl_FragCoord origin is upper left 0:35 textureGrad (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -312,7 +312,7 @@ gl_FragCoord origin is upper left 0:36 textureGrad (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -328,7 +328,7 @@ gl_FragCoord origin is upper left 0:37 textureGrad (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -344,7 +344,7 @@ gl_FragCoord origin is upper left 0:39 textureGrad (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -363,7 +363,7 @@ gl_FragCoord origin is upper left 0:40 textureGrad (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -382,7 +382,7 @@ gl_FragCoord origin is upper left 0:41 textureGrad (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -401,7 +401,7 @@ gl_FragCoord origin is upper left 0:43 textureGrad (global 4-component vector of float) 0:43 Construct combined texture-sampler (temp samplerCube) 0:43 'g_tTexcdf4' (uniform textureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -420,7 +420,7 @@ gl_FragCoord origin is upper left 0:44 textureGrad (global 4-component vector of int) 0:44 Construct combined texture-sampler (temp isamplerCube) 0:44 'g_tTexcdi4' (uniform itextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -439,7 +439,7 @@ gl_FragCoord origin is upper left 0:45 textureGrad (global 4-component vector of uint) 0:45 Construct combined texture-sampler (temp usamplerCube) 0:45 'g_tTexcdu4' (uniform utextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -472,9 +472,9 @@ gl_FragCoord origin is upper left 0:50 Branch: Return with expression 0:50 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -530,7 +530,9 @@ gl_FragCoord origin is upper left Name 150 "psout" Name 160 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 30(g_tTex1di4) DescriptorSet 0 Decorate 43(g_tTex1du4) DescriptorSet 0 Decorate 53(g_tTex2df4) DescriptorSet 0 @@ -544,6 +546,7 @@ gl_FragCoord origin is upper left Decorate 142(g_tTexcdu4) DescriptorSet 0 MemberDecorate 148(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 160(g_tTex1df4a) DescriptorSet 0 + Decorate 160(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out index 7b4cbde..eacddae 100644 --- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out @@ -9,8 +9,8 @@ Shader version: 450 0:30 'txval10' (temp 4-component vector of float) 0:30 textureGrad (global 4-component vector of float) 0:30 Construct combined texture-sampler (temp sampler1D) -0:30 'g_tTex1df4' (uniform texture1D) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.100000 0:30 Constant: @@ -23,7 +23,7 @@ Shader version: 450 0:31 textureGrad (global 4-component vector of int) 0:31 Construct combined texture-sampler (temp isampler1D) 0:31 'g_tTex1di4' (uniform itexture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.200000 0:31 Constant: @@ -36,7 +36,7 @@ Shader version: 450 0:32 textureGrad (global 4-component vector of uint) 0:32 Construct combined texture-sampler (temp usampler1D) 0:32 'g_tTex1du4' (uniform utexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.300000 0:32 Constant: @@ -49,7 +49,7 @@ Shader version: 450 0:34 textureGrad (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -65,7 +65,7 @@ Shader version: 450 0:35 textureGrad (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -81,7 +81,7 @@ Shader version: 450 0:36 textureGrad (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -97,7 +97,7 @@ Shader version: 450 0:38 textureGrad (global 4-component vector of float) 0:38 Construct combined texture-sampler (temp sampler3D) 0:38 'g_tTex3df4' (uniform texture3D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -116,7 +116,7 @@ Shader version: 450 0:39 textureGrad (global 4-component vector of int) 0:39 Construct combined texture-sampler (temp isampler3D) 0:39 'g_tTex3di4' (uniform itexture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -135,7 +135,7 @@ Shader version: 450 0:40 textureGrad (global 4-component vector of uint) 0:40 Construct combined texture-sampler (temp usampler3D) 0:40 'g_tTex3du4' (uniform utexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -154,7 +154,7 @@ Shader version: 450 0:42 textureGrad (global 4-component vector of float) 0:42 Construct combined texture-sampler (temp samplerCube) 0:42 'g_tTexcdf4' (uniform textureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -173,7 +173,7 @@ Shader version: 450 0:43 textureGrad (global 4-component vector of int) 0:43 Construct combined texture-sampler (temp isamplerCube) 0:43 'g_tTexcdi4' (uniform itextureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -192,7 +192,7 @@ Shader version: 450 0:44 textureGrad (global 4-component vector of uint) 0:44 Construct combined texture-sampler (temp usamplerCube) 0:44 'g_tTexcdu4' (uniform utextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -218,9 +218,9 @@ Shader version: 450 0:48 Branch: Return with expression 0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -247,8 +247,8 @@ Shader version: 450 0:30 'txval10' (temp 4-component vector of float) 0:30 textureGrad (global 4-component vector of float) 0:30 Construct combined texture-sampler (temp sampler1D) -0:30 'g_tTex1df4' (uniform texture1D) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.100000 0:30 Constant: @@ -261,7 +261,7 @@ Shader version: 450 0:31 textureGrad (global 4-component vector of int) 0:31 Construct combined texture-sampler (temp isampler1D) 0:31 'g_tTex1di4' (uniform itexture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.200000 0:31 Constant: @@ -274,7 +274,7 @@ Shader version: 450 0:32 textureGrad (global 4-component vector of uint) 0:32 Construct combined texture-sampler (temp usampler1D) 0:32 'g_tTex1du4' (uniform utexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.300000 0:32 Constant: @@ -287,7 +287,7 @@ Shader version: 450 0:34 textureGrad (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -303,7 +303,7 @@ Shader version: 450 0:35 textureGrad (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -319,7 +319,7 @@ Shader version: 450 0:36 textureGrad (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -335,7 +335,7 @@ Shader version: 450 0:38 textureGrad (global 4-component vector of float) 0:38 Construct combined texture-sampler (temp sampler3D) 0:38 'g_tTex3df4' (uniform texture3D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -354,7 +354,7 @@ Shader version: 450 0:39 textureGrad (global 4-component vector of int) 0:39 Construct combined texture-sampler (temp isampler3D) 0:39 'g_tTex3di4' (uniform itexture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -373,7 +373,7 @@ Shader version: 450 0:40 textureGrad (global 4-component vector of uint) 0:40 Construct combined texture-sampler (temp usampler3D) 0:40 'g_tTex3du4' (uniform utexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -392,7 +392,7 @@ Shader version: 450 0:42 textureGrad (global 4-component vector of float) 0:42 Construct combined texture-sampler (temp samplerCube) 0:42 'g_tTexcdf4' (uniform textureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -411,7 +411,7 @@ Shader version: 450 0:43 textureGrad (global 4-component vector of int) 0:43 Construct combined texture-sampler (temp isamplerCube) 0:43 'g_tTexcdi4' (uniform itextureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -430,7 +430,7 @@ Shader version: 450 0:44 textureGrad (global 4-component vector of uint) 0:44 Construct combined texture-sampler (temp usamplerCube) 0:44 'g_tTexcdu4' (uniform utextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -456,9 +456,9 @@ Shader version: 450 0:48 Branch: Return with expression 0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -512,7 +512,9 @@ Shader version: 450 Name 150 "vsout" Name 157 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 30(g_tTex1di4) DescriptorSet 0 Decorate 43(g_tTex1du4) DescriptorSet 0 Decorate 53(g_tTex2df4) DescriptorSet 0 @@ -526,6 +528,7 @@ Shader version: 450 Decorate 142(g_tTexcdu4) DescriptorSet 0 MemberDecorate 148(VS_OUTPUT) 0 BuiltIn FragCoord Decorate 157(g_tTex1df4a) DescriptorSet 0 + Decorate 157(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out index 6751d1e..343babc 100644 --- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureGradOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -26,7 +26,7 @@ gl_FragCoord origin is upper left 0:32 textureGradOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -41,7 +41,7 @@ gl_FragCoord origin is upper left 0:33 textureGradOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:35 textureGradOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -75,7 +75,7 @@ gl_FragCoord origin is upper left 0:36 textureGradOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -94,7 +94,7 @@ gl_FragCoord origin is upper left 0:37 textureGradOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -113,7 +113,7 @@ gl_FragCoord origin is upper left 0:39 textureGradOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -136,7 +136,7 @@ gl_FragCoord origin is upper left 0:40 textureGradOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -159,7 +159,7 @@ gl_FragCoord origin is upper left 0:41 textureGradOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -196,9 +196,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -226,8 +226,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureGradOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -242,7 +242,7 @@ gl_FragCoord origin is upper left 0:32 textureGradOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -257,7 +257,7 @@ gl_FragCoord origin is upper left 0:33 textureGradOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -272,7 +272,7 @@ gl_FragCoord origin is upper left 0:35 textureGradOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -291,7 +291,7 @@ gl_FragCoord origin is upper left 0:36 textureGradOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -310,7 +310,7 @@ gl_FragCoord origin is upper left 0:37 textureGradOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -329,7 +329,7 @@ gl_FragCoord origin is upper left 0:39 textureGradOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -352,7 +352,7 @@ gl_FragCoord origin is upper left 0:40 textureGradOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -375,7 +375,7 @@ gl_FragCoord origin is upper left 0:41 textureGradOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -412,9 +412,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -467,7 +467,9 @@ gl_FragCoord origin is upper left Name 148 "g_tTexcdi4" Name 151 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 31(g_tTex1di4) DescriptorSet 0 Decorate 44(g_tTex1du4) DescriptorSet 0 Decorate 54(g_tTex2df4) DescriptorSet 0 @@ -478,6 +480,7 @@ gl_FragCoord origin is upper left Decorate 121(g_tTex3du4) DescriptorSet 0 MemberDecorate 132(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 142(g_tTex1df4a) DescriptorSet 0 + Decorate 142(g_tTex1df4a) Binding 1 Decorate 145(g_tTexcdf4) DescriptorSet 0 Decorate 148(g_tTexcdi4) DescriptorSet 0 Decorate 151(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out index ce80880..3318e46 100644 --- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureGradOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -27,7 +27,7 @@ gl_FragCoord origin is upper left 0:28 textureGradOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -43,7 +43,7 @@ gl_FragCoord origin is upper left 0:29 textureGradOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -59,7 +59,7 @@ gl_FragCoord origin is upper left 0:31 textureGradOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -79,7 +79,7 @@ gl_FragCoord origin is upper left 0:32 textureGradOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -99,7 +99,7 @@ gl_FragCoord origin is upper left 0:33 textureGradOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -133,9 +133,9 @@ gl_FragCoord origin is upper left 0:38 Branch: Return with expression 0:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -160,8 +160,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureGradOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -177,7 +177,7 @@ gl_FragCoord origin is upper left 0:28 textureGradOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -193,7 +193,7 @@ gl_FragCoord origin is upper left 0:29 textureGradOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -209,7 +209,7 @@ gl_FragCoord origin is upper left 0:31 textureGradOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -229,7 +229,7 @@ gl_FragCoord origin is upper left 0:32 textureGradOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -249,7 +249,7 @@ gl_FragCoord origin is upper left 0:33 textureGradOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -283,9 +283,9 @@ gl_FragCoord origin is upper left 0:38 Branch: Return with expression 0:38 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -330,7 +330,9 @@ gl_FragCoord origin is upper left Name 102 "g_tTexcdi4" Name 105 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 34(g_tTex1di4) DescriptorSet 0 Decorate 46(g_tTex1du4) DescriptorSet 0 Decorate 55(g_tTex2df4) DescriptorSet 0 @@ -338,6 +340,7 @@ gl_FragCoord origin is upper left Decorate 80(g_tTex2du4) DescriptorSet 0 MemberDecorate 86(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 96(g_tTex1df4a) DescriptorSet 0 + Decorate 96(g_tTex1df4a) Binding 1 Decorate 99(g_tTexcdf4) DescriptorSet 0 Decorate 102(g_tTexcdi4) DescriptorSet 0 Decorate 105(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out index 9d66749..dd042de 100644 --- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureLod (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4a' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -23,7 +23,7 @@ gl_FragCoord origin is upper left 0:28 textureLod (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4a' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -35,7 +35,7 @@ gl_FragCoord origin is upper left 0:29 textureLod (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4a' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -47,7 +47,7 @@ gl_FragCoord origin is upper left 0:31 textureLod (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4a' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -60,7 +60,7 @@ gl_FragCoord origin is upper left 0:32 textureLod (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4a' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -73,7 +73,7 @@ gl_FragCoord origin is upper left 0:33 textureLod (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4a' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -86,7 +86,7 @@ gl_FragCoord origin is upper left 0:35 textureLod (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4a' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -100,7 +100,7 @@ gl_FragCoord origin is upper left 0:36 textureLod (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4a' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -114,7 +114,7 @@ gl_FragCoord origin is upper left 0:37 textureLod (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4a' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -142,9 +142,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -169,8 +169,8 @@ gl_FragCoord origin is upper left 0:27 'txval10' (temp 4-component vector of float) 0:27 textureLod (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler1DArray) -0:27 'g_tTex1df4a' (uniform texture1DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:28 textureLod (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler1DArray) 0:28 'g_tTex1di4a' (uniform itexture1DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -194,7 +194,7 @@ gl_FragCoord origin is upper left 0:29 textureLod (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler1DArray) 0:29 'g_tTex1du4a' (uniform utexture1DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -206,7 +206,7 @@ gl_FragCoord origin is upper left 0:31 textureLod (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler2DArray) 0:31 'g_tTex2df4a' (uniform texture2DArray) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -219,7 +219,7 @@ gl_FragCoord origin is upper left 0:32 textureLod (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler2DArray) 0:32 'g_tTex2di4a' (uniform itexture2DArray) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -232,7 +232,7 @@ gl_FragCoord origin is upper left 0:33 textureLod (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler2DArray) 0:33 'g_tTex2du4a' (uniform utexture2DArray) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:35 textureLod (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp samplerCubeArray) 0:35 'g_tTexcdf4a' (uniform textureCubeArray) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -259,7 +259,7 @@ gl_FragCoord origin is upper left 0:36 textureLod (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isamplerCubeArray) 0:36 'g_tTexcdi4a' (uniform itextureCubeArray) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -273,7 +273,7 @@ gl_FragCoord origin is upper left 0:37 textureLod (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usamplerCubeArray) 0:37 'g_tTexcdu4a' (uniform utextureCubeArray) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -301,9 +301,9 @@ gl_FragCoord origin is upper left 0:42 Branch: Return with expression 0:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4a' (uniform itexture1DArray) 0:? 'g_tTex1du4a' (uniform utexture1DArray) 0:? 'g_tTex2df4a' (uniform texture2DArray) @@ -351,7 +351,9 @@ gl_FragCoord origin is upper left Name 123 "psout" Name 132 "g_tTex1df4" Decorate 12(g_tTex1df4a) DescriptorSet 0 + Decorate 12(g_tTex1df4a) Binding 1 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 32(g_tTex1di4a) DescriptorSet 0 Decorate 46(g_tTex1du4a) DescriptorSet 0 Decorate 57(g_tTex2df4a) DescriptorSet 0 @@ -362,6 +364,7 @@ gl_FragCoord origin is upper left Decorate 111(g_tTexcdu4a) DescriptorSet 0 MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 132(g_tTex1df4) DescriptorSet 0 + Decorate 132(g_tTex1df4) Binding 0 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out index d0005df..52c635d 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:32 'txval10' (temp 4-component vector of float) 0:32 textureLod (global 4-component vector of float) 0:32 Construct combined texture-sampler (temp sampler1D) -0:32 'g_tTex1df4' (uniform texture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.100000 0:32 Constant: @@ -22,7 +22,7 @@ gl_FragCoord origin is upper left 0:33 textureLod (global 4-component vector of int) 0:33 Construct combined texture-sampler (temp isampler1D) 0:33 'g_tTex1di4' (uniform itexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.200000 0:33 Constant: @@ -33,7 +33,7 @@ gl_FragCoord origin is upper left 0:34 textureLod (global 4-component vector of uint) 0:34 Construct combined texture-sampler (temp usampler1D) 0:34 'g_tTex1du4' (uniform utexture1D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:34 Constant: 0:34 0.300000 0:34 Constant: @@ -44,7 +44,7 @@ gl_FragCoord origin is upper left 0:36 textureLod (global 4-component vector of float) 0:36 Construct combined texture-sampler (temp sampler2D) 0:36 'g_tTex2df4' (uniform texture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -56,7 +56,7 @@ gl_FragCoord origin is upper left 0:37 textureLod (global 4-component vector of int) 0:37 Construct combined texture-sampler (temp isampler2D) 0:37 'g_tTex2di4' (uniform itexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -68,7 +68,7 @@ gl_FragCoord origin is upper left 0:38 textureLod (global 4-component vector of uint) 0:38 Construct combined texture-sampler (temp usampler2D) 0:38 'g_tTex2du4' (uniform utexture2D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:40 textureLod (global 4-component vector of float) 0:40 Construct combined texture-sampler (temp sampler3D) 0:40 'g_tTex3df4' (uniform texture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -93,7 +93,7 @@ gl_FragCoord origin is upper left 0:41 textureLod (global 4-component vector of int) 0:41 Construct combined texture-sampler (temp isampler3D) 0:41 'g_tTex3di4' (uniform itexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -106,7 +106,7 @@ gl_FragCoord origin is upper left 0:42 textureLod (global 4-component vector of uint) 0:42 Construct combined texture-sampler (temp usampler3D) 0:42 'g_tTex3du4' (uniform utexture3D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -119,7 +119,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global 4-component vector of float) 0:44 Construct combined texture-sampler (temp samplerCube) 0:44 'g_tTexcdf4' (uniform textureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -132,7 +132,7 @@ gl_FragCoord origin is upper left 0:45 textureLod (global 4-component vector of int) 0:45 Construct combined texture-sampler (temp isamplerCube) 0:45 'g_tTexcdi4' (uniform itextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -145,7 +145,7 @@ gl_FragCoord origin is upper left 0:46 textureLod (global 4-component vector of uint) 0:46 Construct combined texture-sampler (temp usamplerCube) 0:46 'g_tTexcdu4' (uniform utextureCube) -0:46 'g_sSamp' (uniform sampler) +0:46 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -172,10 +172,10 @@ gl_FragCoord origin is upper left 0:51 Branch: Return with expression 0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -203,8 +203,8 @@ gl_FragCoord origin is upper left 0:32 'txval10' (temp 4-component vector of float) 0:32 textureLod (global 4-component vector of float) 0:32 Construct combined texture-sampler (temp sampler1D) -0:32 'g_tTex1df4' (uniform texture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.100000 0:32 Constant: @@ -215,7 +215,7 @@ gl_FragCoord origin is upper left 0:33 textureLod (global 4-component vector of int) 0:33 Construct combined texture-sampler (temp isampler1D) 0:33 'g_tTex1di4' (uniform itexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.200000 0:33 Constant: @@ -226,7 +226,7 @@ gl_FragCoord origin is upper left 0:34 textureLod (global 4-component vector of uint) 0:34 Construct combined texture-sampler (temp usampler1D) 0:34 'g_tTex1du4' (uniform utexture1D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:34 Constant: 0:34 0.300000 0:34 Constant: @@ -237,7 +237,7 @@ gl_FragCoord origin is upper left 0:36 textureLod (global 4-component vector of float) 0:36 Construct combined texture-sampler (temp sampler2D) 0:36 'g_tTex2df4' (uniform texture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -249,7 +249,7 @@ gl_FragCoord origin is upper left 0:37 textureLod (global 4-component vector of int) 0:37 Construct combined texture-sampler (temp isampler2D) 0:37 'g_tTex2di4' (uniform itexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -261,7 +261,7 @@ gl_FragCoord origin is upper left 0:38 textureLod (global 4-component vector of uint) 0:38 Construct combined texture-sampler (temp usampler2D) 0:38 'g_tTex2du4' (uniform utexture2D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -273,7 +273,7 @@ gl_FragCoord origin is upper left 0:40 textureLod (global 4-component vector of float) 0:40 Construct combined texture-sampler (temp sampler3D) 0:40 'g_tTex3df4' (uniform texture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -286,7 +286,7 @@ gl_FragCoord origin is upper left 0:41 textureLod (global 4-component vector of int) 0:41 Construct combined texture-sampler (temp isampler3D) 0:41 'g_tTex3di4' (uniform itexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -299,7 +299,7 @@ gl_FragCoord origin is upper left 0:42 textureLod (global 4-component vector of uint) 0:42 Construct combined texture-sampler (temp usampler3D) 0:42 'g_tTex3du4' (uniform utexture3D) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -312,7 +312,7 @@ gl_FragCoord origin is upper left 0:44 textureLod (global 4-component vector of float) 0:44 Construct combined texture-sampler (temp samplerCube) 0:44 'g_tTexcdf4' (uniform textureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -325,7 +325,7 @@ gl_FragCoord origin is upper left 0:45 textureLod (global 4-component vector of int) 0:45 Construct combined texture-sampler (temp isamplerCube) 0:45 'g_tTexcdi4' (uniform itextureCube) -0:45 'g_sSamp' (uniform sampler) +0:45 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -338,7 +338,7 @@ gl_FragCoord origin is upper left 0:46 textureLod (global 4-component vector of uint) 0:46 Construct combined texture-sampler (temp usamplerCube) 0:46 'g_tTexcdu4' (uniform utextureCube) -0:46 'g_sSamp' (uniform sampler) +0:46 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -365,10 +365,10 @@ gl_FragCoord origin is upper left 0:51 Branch: Return with expression 0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? 'g_sSamp2d' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -425,7 +425,9 @@ gl_FragCoord origin is upper left Name 156 "g_sSamp2d" Name 157 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 @@ -440,6 +442,7 @@ gl_FragCoord origin is upper left MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 156(g_sSamp2d) DescriptorSet 0 Decorate 157(g_tTex1df4a) DescriptorSet 0 + Decorate 157(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out index b8b5902..4bef16d 100644 --- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out +++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out @@ -9,8 +9,8 @@ Shader version: 450 0:30 'txval10' (temp 4-component vector of float) 0:30 textureLod (global 4-component vector of float) 0:30 Construct combined texture-sampler (temp sampler1D) -0:30 'g_tTex1df4' (uniform texture1D) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.100000 0:30 Constant: @@ -21,7 +21,7 @@ Shader version: 450 0:31 textureLod (global 4-component vector of int) 0:31 Construct combined texture-sampler (temp isampler1D) 0:31 'g_tTex1di4' (uniform itexture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.200000 0:31 Constant: @@ -32,7 +32,7 @@ Shader version: 450 0:32 textureLod (global 4-component vector of uint) 0:32 Construct combined texture-sampler (temp usampler1D) 0:32 'g_tTex1du4' (uniform utexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.300000 0:32 Constant: @@ -43,7 +43,7 @@ Shader version: 450 0:34 textureLod (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -55,7 +55,7 @@ Shader version: 450 0:35 textureLod (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -67,7 +67,7 @@ Shader version: 450 0:36 textureLod (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -79,7 +79,7 @@ Shader version: 450 0:38 textureLod (global 4-component vector of float) 0:38 Construct combined texture-sampler (temp sampler3D) 0:38 'g_tTex3df4' (uniform texture3D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -92,7 +92,7 @@ Shader version: 450 0:39 textureLod (global 4-component vector of int) 0:39 Construct combined texture-sampler (temp isampler3D) 0:39 'g_tTex3di4' (uniform itexture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -105,7 +105,7 @@ Shader version: 450 0:40 textureLod (global 4-component vector of uint) 0:40 Construct combined texture-sampler (temp usampler3D) 0:40 'g_tTex3du4' (uniform utexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -118,7 +118,7 @@ Shader version: 450 0:42 textureLod (global 4-component vector of float) 0:42 Construct combined texture-sampler (temp samplerCube) 0:42 'g_tTexcdf4' (uniform textureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -131,7 +131,7 @@ Shader version: 450 0:43 textureLod (global 4-component vector of int) 0:43 Construct combined texture-sampler (temp isamplerCube) 0:43 'g_tTexcdi4' (uniform itextureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -144,7 +144,7 @@ Shader version: 450 0:44 textureLod (global 4-component vector of uint) 0:44 Construct combined texture-sampler (temp usamplerCube) 0:44 'g_tTexcdu4' (uniform utextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -164,9 +164,9 @@ Shader version: 450 0:48 Branch: Return with expression 0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -193,8 +193,8 @@ Shader version: 450 0:30 'txval10' (temp 4-component vector of float) 0:30 textureLod (global 4-component vector of float) 0:30 Construct combined texture-sampler (temp sampler1D) -0:30 'g_tTex1df4' (uniform texture1D) -0:30 'g_sSamp' (uniform sampler) +0:30 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:30 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:30 Constant: 0:30 0.100000 0:30 Constant: @@ -205,7 +205,7 @@ Shader version: 450 0:31 textureLod (global 4-component vector of int) 0:31 Construct combined texture-sampler (temp isampler1D) 0:31 'g_tTex1di4' (uniform itexture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.200000 0:31 Constant: @@ -216,7 +216,7 @@ Shader version: 450 0:32 textureLod (global 4-component vector of uint) 0:32 Construct combined texture-sampler (temp usampler1D) 0:32 'g_tTex1du4' (uniform utexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.300000 0:32 Constant: @@ -227,7 +227,7 @@ Shader version: 450 0:34 textureLod (global 4-component vector of float) 0:34 Construct combined texture-sampler (temp sampler2D) 0:34 'g_tTex2df4' (uniform texture2D) -0:34 'g_sSamp' (uniform sampler) +0:34 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -239,7 +239,7 @@ Shader version: 450 0:35 textureLod (global 4-component vector of int) 0:35 Construct combined texture-sampler (temp isampler2D) 0:35 'g_tTex2di4' (uniform itexture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -251,7 +251,7 @@ Shader version: 450 0:36 textureLod (global 4-component vector of uint) 0:36 Construct combined texture-sampler (temp usampler2D) 0:36 'g_tTex2du4' (uniform utexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -263,7 +263,7 @@ Shader version: 450 0:38 textureLod (global 4-component vector of float) 0:38 Construct combined texture-sampler (temp sampler3D) 0:38 'g_tTex3df4' (uniform texture3D) -0:38 'g_sSamp' (uniform sampler) +0:38 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -276,7 +276,7 @@ Shader version: 450 0:39 textureLod (global 4-component vector of int) 0:39 Construct combined texture-sampler (temp isampler3D) 0:39 'g_tTex3di4' (uniform itexture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -289,7 +289,7 @@ Shader version: 450 0:40 textureLod (global 4-component vector of uint) 0:40 Construct combined texture-sampler (temp usampler3D) 0:40 'g_tTex3du4' (uniform utexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -302,7 +302,7 @@ Shader version: 450 0:42 textureLod (global 4-component vector of float) 0:42 Construct combined texture-sampler (temp samplerCube) 0:42 'g_tTexcdf4' (uniform textureCube) -0:42 'g_sSamp' (uniform sampler) +0:42 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -315,7 +315,7 @@ Shader version: 450 0:43 textureLod (global 4-component vector of int) 0:43 Construct combined texture-sampler (temp isamplerCube) 0:43 'g_tTexcdi4' (uniform itextureCube) -0:43 'g_sSamp' (uniform sampler) +0:43 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -328,7 +328,7 @@ Shader version: 450 0:44 textureLod (global 4-component vector of uint) 0:44 Construct combined texture-sampler (temp usamplerCube) 0:44 'g_tTexcdu4' (uniform utextureCube) -0:44 'g_sSamp' (uniform sampler) +0:44 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -348,9 +348,9 @@ Shader version: 450 0:48 Branch: Return with expression 0:48 'vsout' (temp structure{temp 4-component vector of float FragCoord Pos}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -404,7 +404,9 @@ Shader version: 450 Name 146 "vsout" Name 153 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 29(g_tTex1di4) DescriptorSet 0 Decorate 42(g_tTex1du4) DescriptorSet 0 Decorate 52(g_tTex2df4) DescriptorSet 0 @@ -418,6 +420,7 @@ Shader version: 450 Decorate 138(g_tTexcdu4) DescriptorSet 0 MemberDecorate 144(VS_OUTPUT) 0 BuiltIn FragCoord Decorate 153(g_tTex1df4a) DescriptorSet 0 + Decorate 153(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out index 25a77ca..4f7a1a0 100644 --- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureLodOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -24,7 +24,7 @@ gl_FragCoord origin is upper left 0:32 textureLodOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -37,7 +37,7 @@ gl_FragCoord origin is upper left 0:33 textureLodOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -50,7 +50,7 @@ gl_FragCoord origin is upper left 0:35 textureLodOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -65,7 +65,7 @@ gl_FragCoord origin is upper left 0:36 textureLodOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -80,7 +80,7 @@ gl_FragCoord origin is upper left 0:37 textureLodOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -95,7 +95,7 @@ gl_FragCoord origin is upper left 0:39 textureLodOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -112,7 +112,7 @@ gl_FragCoord origin is upper left 0:40 textureLodOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -129,7 +129,7 @@ gl_FragCoord origin is upper left 0:41 textureLodOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -160,9 +160,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -190,8 +190,8 @@ gl_FragCoord origin is upper left 0:31 'txval10' (temp 4-component vector of float) 0:31 textureLodOffset (global 4-component vector of float) 0:31 Construct combined texture-sampler (temp sampler1D) -0:31 'g_tTex1df4' (uniform texture1D) -0:31 'g_sSamp' (uniform sampler) +0:31 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) +0:31 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:31 Constant: 0:31 0.100000 0:31 Constant: @@ -204,7 +204,7 @@ gl_FragCoord origin is upper left 0:32 textureLodOffset (global 4-component vector of int) 0:32 Construct combined texture-sampler (temp isampler1D) 0:32 'g_tTex1di4' (uniform itexture1D) -0:32 'g_sSamp' (uniform sampler) +0:32 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:32 Constant: 0:32 0.200000 0:32 Constant: @@ -217,7 +217,7 @@ gl_FragCoord origin is upper left 0:33 textureLodOffset (global 4-component vector of uint) 0:33 Construct combined texture-sampler (temp usampler1D) 0:33 'g_tTex1du4' (uniform utexture1D) -0:33 'g_sSamp' (uniform sampler) +0:33 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:33 Constant: 0:33 0.300000 0:33 Constant: @@ -230,7 +230,7 @@ gl_FragCoord origin is upper left 0:35 textureLodOffset (global 4-component vector of float) 0:35 Construct combined texture-sampler (temp sampler2D) 0:35 'g_tTex2df4' (uniform texture2D) -0:35 'g_sSamp' (uniform sampler) +0:35 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -245,7 +245,7 @@ gl_FragCoord origin is upper left 0:36 textureLodOffset (global 4-component vector of int) 0:36 Construct combined texture-sampler (temp isampler2D) 0:36 'g_tTex2di4' (uniform itexture2D) -0:36 'g_sSamp' (uniform sampler) +0:36 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -260,7 +260,7 @@ gl_FragCoord origin is upper left 0:37 textureLodOffset (global 4-component vector of uint) 0:37 Construct combined texture-sampler (temp usampler2D) 0:37 'g_tTex2du4' (uniform utexture2D) -0:37 'g_sSamp' (uniform sampler) +0:37 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -275,7 +275,7 @@ gl_FragCoord origin is upper left 0:39 textureLodOffset (global 4-component vector of float) 0:39 Construct combined texture-sampler (temp sampler3D) 0:39 'g_tTex3df4' (uniform texture3D) -0:39 'g_sSamp' (uniform sampler) +0:39 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -292,7 +292,7 @@ gl_FragCoord origin is upper left 0:40 textureLodOffset (global 4-component vector of int) 0:40 Construct combined texture-sampler (temp isampler3D) 0:40 'g_tTex3di4' (uniform itexture3D) -0:40 'g_sSamp' (uniform sampler) +0:40 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.400000 0:? 0.500000 @@ -309,7 +309,7 @@ gl_FragCoord origin is upper left 0:41 textureLodOffset (global 4-component vector of uint) 0:41 Construct combined texture-sampler (temp usampler3D) 0:41 'g_tTex3du4' (uniform utexture3D) -0:41 'g_sSamp' (uniform sampler) +0:41 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.700000 0:? 0.800000 @@ -340,9 +340,9 @@ gl_FragCoord origin is upper left 0:48 Branch: Return with expression 0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1D) -0:? 'g_tTex1df4' (uniform texture1D) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1D) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1D) 0:? 'g_tTex1di4' (uniform itexture1D) 0:? 'g_tTex1du4' (uniform utexture1D) 0:? 'g_tTex2df4' (uniform texture2D) @@ -395,7 +395,9 @@ gl_FragCoord origin is upper left Name 144 "g_tTexcdi4" Name 147 "g_tTexcdu4" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 30(g_tTex1di4) DescriptorSet 0 Decorate 43(g_tTex1du4) DescriptorSet 0 Decorate 53(g_tTex2df4) DescriptorSet 0 @@ -406,6 +408,7 @@ gl_FragCoord origin is upper left Decorate 117(g_tTex3du4) DescriptorSet 0 MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 138(g_tTex1df4a) DescriptorSet 0 + Decorate 138(g_tTex1df4a) Binding 1 Decorate 141(g_tTexcdf4) DescriptorSet 0 Decorate 144(g_tTexcdi4) DescriptorSet 0 Decorate 147(g_tTexcdu4) DescriptorSet 0 diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out index 7cdef7f..0d18428 100644 --- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out +++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out @@ -10,8 +10,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureLodOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -25,7 +25,7 @@ gl_FragCoord origin is upper left 0:24 textureLodOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -39,7 +39,7 @@ gl_FragCoord origin is upper left 0:25 textureLodOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -53,7 +53,7 @@ gl_FragCoord origin is upper left 0:27 textureLodOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -69,7 +69,7 @@ gl_FragCoord origin is upper left 0:28 textureLodOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -85,7 +85,7 @@ gl_FragCoord origin is upper left 0:29 textureLodOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -115,9 +115,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -139,8 +139,8 @@ gl_FragCoord origin is upper left 0:23 'txval10' (temp 4-component vector of float) 0:23 textureLodOffset (global 4-component vector of float) 0:23 Construct combined texture-sampler (temp sampler1DArray) -0:23 'g_tTex1df4' (uniform texture1DArray) -0:23 'g_sSamp' (uniform sampler) +0:23 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) +0:23 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -154,7 +154,7 @@ gl_FragCoord origin is upper left 0:24 textureLodOffset (global 4-component vector of int) 0:24 Construct combined texture-sampler (temp isampler1DArray) 0:24 'g_tTex1di4' (uniform itexture1DArray) -0:24 'g_sSamp' (uniform sampler) +0:24 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.200000 0:? 0.300000 @@ -168,7 +168,7 @@ gl_FragCoord origin is upper left 0:25 textureLodOffset (global 4-component vector of uint) 0:25 Construct combined texture-sampler (temp usampler1DArray) 0:25 'g_tTex1du4' (uniform utexture1DArray) -0:25 'g_sSamp' (uniform sampler) +0:25 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -182,7 +182,7 @@ gl_FragCoord origin is upper left 0:27 textureLodOffset (global 4-component vector of float) 0:27 Construct combined texture-sampler (temp sampler2DArray) 0:27 'g_tTex2df4' (uniform texture2DArray) -0:27 'g_sSamp' (uniform sampler) +0:27 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.100000 0:? 0.200000 @@ -198,7 +198,7 @@ gl_FragCoord origin is upper left 0:28 textureLodOffset (global 4-component vector of int) 0:28 Construct combined texture-sampler (temp isampler2DArray) 0:28 'g_tTex2di4' (uniform itexture2DArray) -0:28 'g_sSamp' (uniform sampler) +0:28 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.300000 0:? 0.400000 @@ -214,7 +214,7 @@ gl_FragCoord origin is upper left 0:29 textureLodOffset (global 4-component vector of uint) 0:29 Construct combined texture-sampler (temp usampler2DArray) 0:29 'g_tTex2du4' (uniform utexture2DArray) -0:29 'g_sSamp' (uniform sampler) +0:29 'g_sSamp' (layout(binding=0 ) uniform sampler) 0:? Constant: 0:? 0.500000 0:? 0.600000 @@ -244,9 +244,9 @@ gl_FragCoord origin is upper left 0:36 Branch: Return with expression 0:36 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth}) 0:? Linker Objects -0:? 'g_sSamp' (uniform sampler) -0:? 'g_tTex1df4a' (uniform texture1DArray) -0:? 'g_tTex1df4' (uniform texture1DArray) +0:? 'g_sSamp' (layout(binding=0 ) uniform sampler) +0:? 'g_tTex1df4a' (layout(binding=1 ) uniform texture1DArray) +0:? 'g_tTex1df4' (layout(binding=0 ) uniform texture1DArray) 0:? 'g_tTex1di4' (uniform itexture1DArray) 0:? 'g_tTex1du4' (uniform utexture1DArray) 0:? 'g_tTex2df4' (uniform texture2DArray) @@ -284,7 +284,9 @@ gl_FragCoord origin is upper left Name 96 "psout" Name 104 "g_tTex1df4a" Decorate 12(g_tTex1df4) DescriptorSet 0 + Decorate 12(g_tTex1df4) Binding 0 Decorate 16(g_sSamp) DescriptorSet 0 + Decorate 16(g_sSamp) Binding 0 Decorate 33(g_tTex1di4) DescriptorSet 0 Decorate 48(g_tTex1du4) DescriptorSet 0 Decorate 60(g_tTex2df4) DescriptorSet 0 @@ -292,6 +294,7 @@ gl_FragCoord origin is upper left Decorate 84(g_tTex2du4) DescriptorSet 0 MemberDecorate 94(PS_OUTPUT) 1 BuiltIn FragDepth Decorate 104(g_tTex1df4a) DescriptorSet 0 + Decorate 104(g_tTex1df4a) Binding 1 2: TypeVoid 3: TypeFunction 2 6: TypeFloat 32 diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out index 684d4c8..08b4193 100755 --- a/Test/baseResults/hlsl.struct.frag.out +++ b/Test/baseResults/hlsl.struct.frag.out @@ -1,4 +1,7 @@ hlsl.struct.frag +WARNING: 0:26: 'register' : ignoring shader_profile +WARNING: 0:27: 'register' : ignoring shader_profile + Shader version: 450 gl_FragCoord origin is upper left 0:? Sequence @@ -14,8 +17,8 @@ gl_FragCoord origin is upper left 0:37 's2' (global structure{temp 4-component vector of float i}) 0:37 Constant: 0:37 0 (const int) -0:37 ff4: direct index for structure (layout(offset=4 ) temp 4-component vector of float FragCoord) -0:37 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(offset=4 ) temp bool ff3, layout(offset=4 ) temp 4-component vector of float FragCoord ff4}) +0:37 ff4: direct index for structure (layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord) +0:37 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord ff4}) 0:37 Constant: 0:37 7 (const int) 0:39 Branch: Return with expression @@ -23,7 +26,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 's1' (global structure{temp bool b, temp bool c, temp 4-component vector of float a, temp 4-component vector of float d}) 0:? 's2' (global structure{temp 4-component vector of float i}) -0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(offset=4 ) temp bool ff3, layout(offset=4 ) temp 4-component vector of float FragCoord ff4}) +0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord ff4}) Linked fragment stage: @@ -44,8 +47,8 @@ gl_FragCoord origin is upper left 0:37 's2' (global structure{temp 4-component vector of float i}) 0:37 Constant: 0:37 0 (const int) -0:37 ff4: direct index for structure (layout(offset=4 ) temp 4-component vector of float FragCoord) -0:37 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(offset=4 ) temp bool ff3, layout(offset=4 ) temp 4-component vector of float FragCoord ff4}) +0:37 ff4: direct index for structure (layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord) +0:37 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord ff4}) 0:37 Constant: 0:37 7 (const int) 0:39 Branch: Return with expression @@ -53,7 +56,7 @@ gl_FragCoord origin is upper left 0:? Linker Objects 0:? 's1' (global structure{temp bool b, temp bool c, temp 4-component vector of float a, temp 4-component vector of float d}) 0:? 's2' (global structure{temp 4-component vector of float i}) -0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(offset=4 ) temp bool ff3, layout(offset=4 ) temp 4-component vector of float FragCoord ff4}) +0:? 's4' (global structure{smooth in 4-component vector of float a, flat temp bool b, centroid noperspective temp 1-component vector of float c, centroid sample temp 2-component vector of float d, temp bool Face ff1, layout(offset=4 ) temp bool ff2, layout(binding=0 offset=4 ) temp bool ff3, layout(binding=0 offset=4 ) temp 4-component vector of float FragCoord ff4}) // Module Version 10000 // Generated by (magic number): 80001 diff --git a/Test/hlsl.float4.frag b/Test/hlsl.float4.frag index df87122..5ae70db 100644 --- a/Test/hlsl.float4.frag +++ b/Test/hlsl.float4.frag @@ -2,8 +2,8 @@ float4 AmbientColor = float4(1, 0.5, 0, 1); bool ff1 : SV_IsFrontFace; float4 ff2 : packoffset(c0.y); -float4 ff3 : packoffset(c0.y) : register(ps_5_0, s[0]) ; -float4 ff4 : VPOS : packoffset(c0.y) : register(ps_5_0, s[0]) ; +float4 ff3 : packoffset(c0.y) : register(ps_5_0, s0) ; +float4 ff4 : VPOS : packoffset(c0.y) : register(ps_5_0, s1) ; float4 ShaderFunction(float4 input) : COLOR0 { diff --git a/Test/hlsl.struct.frag b/Test/hlsl.struct.frag index 25c803d..7989d25 100644 --- a/Test/hlsl.struct.frag +++ b/Test/hlsl.struct.frag @@ -23,8 +23,8 @@ struct { sample centroid float2 d; bool ff1 : SV_IsFrontFace; bool ff2 : packoffset(c0.y); - bool ff3 : packoffset(c0.y) : register(ps_5_0, s[0]) ; - float4 ff4 : VPOS : packoffset(c0.y) : register(ps_5_0, s[0]) ; + bool ff3 : packoffset(c0.y) : register(ps_5_0, s0) ; + float4 ff4 : VPOS : packoffset(c0.y) : register(ps_5_0, s0) ; } s4; float4 PixelShaderFunction(float4 input) : COLOR0 diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index fcaa435..f8fb279 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "SPIRV99.1362" +#define GLSLANG_REVISION "SPIRV99.1365" #define GLSLANG_DATE "29-Jul-2016" diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index a6c7ac9..e3e5df7 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -2521,10 +2521,10 @@ void HlslGrammar::acceptArraySpecifier(TArraySizes*& arraySizes) } // post_decls -// : COLON semantic // optional -// COLON PACKOFFSET LEFT_PAREN ... RIGHT_PAREN // optional -// COLON REGISTER // optional -// annotations // optional +// : COLON semantic // optional +// COLON PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN // optional +// COLON REGISTER LEFT_PAREN [shader_profile,] Type# RIGHT_PAREN // optional +// annotations // optional // void HlslGrammar::acceptPostDecls(TType& type) { @@ -2533,6 +2533,7 @@ void HlslGrammar::acceptPostDecls(TType& type) if (acceptTokenClass(EHTokColon)) { HlslToken idToken; if (acceptTokenClass(EHTokPackOffset)) { + // PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN if (! acceptTokenClass(EHTokLeftParen)) { expected("("); return; @@ -2558,23 +2559,31 @@ void HlslGrammar::acceptPostDecls(TType& type) expected("semantic or packoffset or register"); return; } else if (*idToken.string == "register") { + // REGISTER LEFT_PAREN [shader_profile,] Type# RIGHT_PAREN if (! acceptTokenClass(EHTokLeftParen)) { expected("("); return; } - acceptTokenClass(EHTokIdentifier); - acceptTokenClass(EHTokComma); - acceptTokenClass(EHTokIdentifier); - acceptTokenClass(EHTokLeftBracket); - if (peekTokenClass(EHTokIntConstant)) - advanceToken(); - acceptTokenClass(EHTokRightBracket); + HlslToken registerDesc; + if (! acceptIdentifier(registerDesc)) { + expected("register number description"); + return; + } + HlslToken profile; + if (acceptTokenClass(EHTokComma)) { + // then we didn't really see the registerDesc yet, it was + // actually the profile + profile = registerDesc; + if (! acceptIdentifier(registerDesc)) { + expected("register number description"); + return; + } + } if (! acceptTokenClass(EHTokRightParen)) { expected(")"); break; } - // TODO: process the register information - // b2 means buffer 2 + parseContext.handleRegister(registerDesc.loc, type, profile.string, *registerDesc.string); } else { // semantic, in idToken.string parseContext.handleSemantic(type, *idToken.string); diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp index 6022e7d..5989f29 100755 --- a/hlsl/hlslParseHelper.cpp +++ b/hlsl/hlslParseHelper.cpp @@ -2135,7 +2135,7 @@ void HlslParseContext::handleSemantic(TType& type, const TString& semantic) } // -// Handle seeing something like ": packoffset( c[Subcomponent][.component] )" +// Handle seeing something like "PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN" // // 'location' has the "c[Subcomponent]" part. // 'component' points to the "component" part, or nullptr if not present. @@ -2155,7 +2155,7 @@ void HlslParseContext::handlePackOffset(const TSourceLoc& loc, TType& type, cons } type.getQualifier().layoutOffset = 16 * atoi(location.substr(1, location.size()).c_str()); - if (component) { + if (component != nullptr) { int componentOffset = 0; switch ((*component)[0]) { case 'x': componentOffset = 0; break; @@ -2175,6 +2175,41 @@ void HlslParseContext::handlePackOffset(const TSourceLoc& loc, TType& type, cons } // +// Handle seeing something like "REGISTER LEFT_PAREN [shader_profile,] Type# RIGHT_PAREN" +// +// 'profile' points to the shader_profile part, or nullptr if not present. +// 'desc' is the type# part. +// +void HlslParseContext::handleRegister(const TSourceLoc& loc, TType& type, const glslang::TString* profile, + const glslang::TString& desc) +{ + if (profile != nullptr) + warn(loc, "ignoring shader_profile", "register", ""); + + if (desc.size() < 2) { + error(loc, "expected register type and number", "register", ""); + return; + } + + if (! isdigit(desc[1])) { + error(loc, "expected register number after register type", "register", ""); + return; + } + + switch (desc[0]) { + case 'b': + case 't': + case 'c': + case 's': + type.getQualifier().layoutBinding = atoi(desc.substr(1, desc.size()).c_str()); + break; + default: + warn(loc, "ignoring unrecognized register type", "register", "%c", desc[0]); + break; + } +} + +// // Same error message for all places assignments don't work. // void HlslParseContext::assignError(const TSourceLoc& loc, const char* op, TString left, TString right) diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h index 7a02ebb..40bf851 100755 --- a/hlsl/hlslParseHelper.h +++ b/hlsl/hlslParseHelper.h @@ -96,6 +96,7 @@ public: TFunction* handleConstructorCall(const TSourceLoc&, const TType&); void handleSemantic(TType& type, const TString& semantic); void handlePackOffset(const TSourceLoc&, TType& type, const glslang::TString& location, const glslang::TString* component); + void handleRegister(const TSourceLoc&, TType& type, const glslang::TString* profile, const glslang::TString& desc); TIntermAggregate* handleSamplerTextureCombine(const TSourceLoc& loc, TIntermTyped* argTex, TIntermTyped* argSampler); -- 2.7.4