Skip to content

G
glslang
Commit 0842dbb3 by steve-lunarg
Options

HLSL: use HLSL parser to parse HLSL intrinsic prototypes, enable int/bool mats

This PR adds a CreateParseContext() fn analogous to CreateBuiltInParseables(), to create a language specific built in parser. (This code was present before but not encapsualted in a fn). This can now be used to create a source language specific parser for builtins. Along with this, the code creating HLSL intrinsic prototypes can now produce them in HLSL syntax, rather than GLSL syntax. This relaxes certain prior restrictions at the parser level. Lower layers (e.g, SPIR-V) may still have such restrictions, such as around Nx1 matrices: this code does not impact that. This PR also fleshes out matrix types for bools and ints, both of which were partially in place before. This was easier than maintaining the restrictions in the HLSL prototype generator to avoid creating protoypes with those types. Many tests change because the result type from intrinsics moves from "global" to "temp". Several new tests are added for the new types.
parent fabe7d6a
Showing with 579 additions and 301 deletions
Test/baseResults/hlsl.doLoop.frag.out
......@@ -18,7 +18,7 @@ gl_FragCoord origin is upper left
0:4 No loop body
0:5 Loop with condition not tested first
0:5 Loop Condition
0:5 all (global bool)
0:5 all (temp bool)
0:5 Equal (temp 4-component vector of bool)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -55,7 +55,7 @@ gl_FragCoord origin is upper left
0:4 No loop body
0:5 Loop with condition not tested first
0:5 Loop Condition
0:5 all (global bool)
0:5 all (temp bool)
0:5 Equal (temp 4-component vector of bool)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
......
Test/baseResults/hlsl.forLoop.frag.out
......@@ -19,7 +19,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Loop with condition tested first
0:5 Loop Condition
0:5 any (global bool)
0:5 any (temp bool)
0:5 NotEqual (temp 4-component vector of bool)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -27,7 +27,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:6 Loop with condition tested first
0:6 Loop Condition
0:6 any (global bool)
0:6 any (temp bool)
0:6 NotEqual (temp 4-component vector of bool)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -44,7 +44,7 @@ gl_FragCoord origin is upper left
0:7 'input' (layout(location=0 ) in 4-component vector of float)
0:7 Loop with condition tested first
0:7 Loop Condition
0:7 any (global bool)
0:7 any (temp bool)
0:7 NotEqual (temp 4-component vector of bool)
0:7 'input' (layout(location=0 ) in 4-component vector of float)
0:7 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -144,7 +144,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:5 Loop with condition tested first
0:5 Loop Condition
0:5 any (global bool)
0:5 any (temp bool)
0:5 NotEqual (temp 4-component vector of bool)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
0:5 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -152,7 +152,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:6 Loop with condition tested first
0:6 Loop Condition
0:6 any (global bool)
0:6 any (temp bool)
0:6 NotEqual (temp 4-component vector of bool)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -169,7 +169,7 @@ gl_FragCoord origin is upper left
0:7 'input' (layout(location=0 ) in 4-component vector of float)
0:7 Loop with condition tested first
0:7 Loop Condition
0:7 any (global bool)
0:7 any (temp bool)
0:7 NotEqual (temp 4-component vector of bool)
0:7 'input' (layout(location=0 ) in 4-component vector of float)
0:7 'input' (layout(location=0 ) in 4-component vector of float)
......
Test/baseResults/hlsl.gather.array.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:29 Sequence
0:29 move second child to first child (temp 4-component vector of float)
0:29 'txval20' (temp 4-component vector of float)
0:29 textureGather (global 4-component vector of float)
0:29 textureGather (temp 4-component vector of float)
0:29 Construct combined texture-sampler (temp sampler2DArray)
0:29 'g_tTex2df4a' (uniform texture2DArray)
0:29 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -19,7 +19,7 @@ gl_FragCoord origin is upper left
0:30 Sequence
0:30 move second child to first child (temp 4-component vector of int)
0:30 'txval21' (temp 4-component vector of int)
0:30 textureGather (global 4-component vector of int)
0:30 textureGather (temp 4-component vector of int)
0:30 Construct combined texture-sampler (temp isampler2DArray)
0:30 'g_tTex2di4a' (uniform itexture2DArray)
0:30 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -30,7 +30,7 @@ gl_FragCoord origin is upper left
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of uint)
0:31 'txval22' (temp 4-component vector of uint)
0:31 textureGather (global 4-component vector of uint)
0:31 textureGather (temp 4-component vector of uint)
0:31 Construct combined texture-sampler (temp usampler2DArray)
0:31 'g_tTex2du4a' (uniform utexture2DArray)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -41,7 +41,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of float)
0:35 'txval40' (temp 4-component vector of float)
0:35 textureGather (global 4-component vector of float)
0:35 textureGather (temp 4-component vector of float)
0:35 Construct combined texture-sampler (temp samplerCubeArray)
0:35 'g_tTexcdf4a' (uniform textureCubeArray)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of int)
0:36 'txval41' (temp 4-component vector of int)
0:36 textureGather (global 4-component vector of int)
0:36 textureGather (temp 4-component vector of int)
0:36 Construct combined texture-sampler (temp isamplerCubeArray)
0:36 'g_tTexcdi4a' (uniform itextureCubeArray)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
0:37 Sequence
0:37 move second child to first child (temp 4-component vector of uint)
0:37 'txval42' (temp 4-component vector of uint)
0:37 textureGather (global 4-component vector of uint)
0:37 textureGather (temp 4-component vector of uint)
0:37 Construct combined texture-sampler (temp usamplerCubeArray)
0:37 'g_tTexcdu4a' (uniform utextureCubeArray)
0:37 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -134,7 +134,7 @@ gl_FragCoord origin is upper left
0:29 Sequence
0:29 move second child to first child (temp 4-component vector of float)
0:29 'txval20' (temp 4-component vector of float)
0:29 textureGather (global 4-component vector of float)
0:29 textureGather (temp 4-component vector of float)
0:29 Construct combined texture-sampler (temp sampler2DArray)
0:29 'g_tTex2df4a' (uniform texture2DArray)
0:29 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -145,7 +145,7 @@ gl_FragCoord origin is upper left
0:30 Sequence
0:30 move second child to first child (temp 4-component vector of int)
0:30 'txval21' (temp 4-component vector of int)
0:30 textureGather (global 4-component vector of int)
0:30 textureGather (temp 4-component vector of int)
0:30 Construct combined texture-sampler (temp isampler2DArray)
0:30 'g_tTex2di4a' (uniform itexture2DArray)
0:30 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -156,7 +156,7 @@ gl_FragCoord origin is upper left
0:31 Sequence
0:31 move second child to first child (temp 4-component vector of uint)
0:31 'txval22' (temp 4-component vector of uint)
0:31 textureGather (global 4-component vector of uint)
0:31 textureGather (temp 4-component vector of uint)
0:31 Construct combined texture-sampler (temp usampler2DArray)
0:31 'g_tTex2du4a' (uniform utexture2DArray)
0:31 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -167,7 +167,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of float)
0:35 'txval40' (temp 4-component vector of float)
0:35 textureGather (global 4-component vector of float)
0:35 textureGather (temp 4-component vector of float)
0:35 Construct combined texture-sampler (temp samplerCubeArray)
0:35 'g_tTexcdf4a' (uniform textureCubeArray)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -179,7 +179,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of int)
0:36 'txval41' (temp 4-component vector of int)
0:36 textureGather (global 4-component vector of int)
0:36 textureGather (temp 4-component vector of int)
0:36 Construct combined texture-sampler (temp isamplerCubeArray)
0:36 'g_tTexcdi4a' (uniform itextureCubeArray)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -191,7 +191,7 @@ gl_FragCoord origin is upper left
0:37 Sequence
0:37 move second child to first child (temp 4-component vector of uint)
0:37 'txval42' (temp 4-component vector of uint)
0:37 textureGather (global 4-component vector of uint)
0:37 textureGather (temp 4-component vector of uint)
0:37 Construct combined texture-sampler (temp usamplerCubeArray)
0:37 'g_tTexcdu4a' (uniform utextureCubeArray)
0:37 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.gather.basic.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of float)
0:34 'txval20' (temp 4-component vector of float)
0:34 textureGather (global 4-component vector of float)
0:34 textureGather (temp 4-component vector of float)
0:34 Construct combined texture-sampler (temp sampler2D)
0:34 'g_tTex2df4' (uniform texture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -18,7 +18,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of int)
0:35 'txval21' (temp 4-component vector of int)
0:35 textureGather (global 4-component vector of int)
0:35 textureGather (temp 4-component vector of int)
0:35 Construct combined texture-sampler (temp isampler2D)
0:35 'g_tTex2di4' (uniform itexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -28,7 +28,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of uint)
0:36 'txval22' (temp 4-component vector of uint)
0:36 textureGather (global 4-component vector of uint)
0:36 textureGather (temp 4-component vector of uint)
0:36 Construct combined texture-sampler (temp usampler2D)
0:36 'g_tTex2du4' (uniform utexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -38,7 +38,7 @@ gl_FragCoord origin is upper left
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of float)
0:40 'txval40' (temp 4-component vector of float)
0:40 textureGather (global 4-component vector of float)
0:40 textureGather (temp 4-component vector of float)
0:40 Construct combined texture-sampler (temp samplerCube)
0:40 'g_tTexcdf4' (uniform textureCube)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -49,7 +49,7 @@ gl_FragCoord origin is upper left
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of int)
0:41 'txval41' (temp 4-component vector of int)
0:41 textureGather (global 4-component vector of int)
0:41 textureGather (temp 4-component vector of int)
0:41 Construct combined texture-sampler (temp isamplerCube)
0:41 'g_tTexcdi4' (uniform itextureCube)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -60,7 +60,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of uint)
0:42 'txval42' (temp 4-component vector of uint)
0:42 textureGather (global 4-component vector of uint)
0:42 textureGather (temp 4-component vector of uint)
0:42 Construct combined texture-sampler (temp usamplerCube)
0:42 'g_tTexcdu4' (uniform utextureCube)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -132,7 +132,7 @@ gl_FragCoord origin is upper left
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of float)
0:34 'txval20' (temp 4-component vector of float)
0:34 textureGather (global 4-component vector of float)
0:34 textureGather (temp 4-component vector of float)
0:34 Construct combined texture-sampler (temp sampler2D)
0:34 'g_tTex2df4' (uniform texture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -142,7 +142,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of int)
0:35 'txval21' (temp 4-component vector of int)
0:35 textureGather (global 4-component vector of int)
0:35 textureGather (temp 4-component vector of int)
0:35 Construct combined texture-sampler (temp isampler2D)
0:35 'g_tTex2di4' (uniform itexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -152,7 +152,7 @@ gl_FragCoord origin is upper left
0:36 Sequence
0:36 move second child to first child (temp 4-component vector of uint)
0:36 'txval22' (temp 4-component vector of uint)
0:36 textureGather (global 4-component vector of uint)
0:36 textureGather (temp 4-component vector of uint)
0:36 Construct combined texture-sampler (temp usampler2D)
0:36 'g_tTex2du4' (uniform utexture2D)
0:36 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -162,7 +162,7 @@ gl_FragCoord origin is upper left
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of float)
0:40 'txval40' (temp 4-component vector of float)
0:40 textureGather (global 4-component vector of float)
0:40 textureGather (temp 4-component vector of float)
0:40 Construct combined texture-sampler (temp samplerCube)
0:40 'g_tTexcdf4' (uniform textureCube)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -173,7 +173,7 @@ gl_FragCoord origin is upper left
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of int)
0:41 'txval41' (temp 4-component vector of int)
0:41 textureGather (global 4-component vector of int)
0:41 textureGather (temp 4-component vector of int)
0:41 Construct combined texture-sampler (temp isamplerCube)
0:41 'g_tTexcdi4' (uniform itextureCube)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -184,7 +184,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp 4-component vector of uint)
0:42 'txval42' (temp 4-component vector of uint)
0:42 textureGather (global 4-component vector of uint)
0:42 textureGather (temp 4-component vector of uint)
0:42 Construct combined texture-sampler (temp usamplerCube)
0:42 'g_tTexcdu4' (uniform utextureCube)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.gather.basic.dx10.vert.out
......@@ -7,7 +7,7 @@ Shader version: 450
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of float)
0:33 'txval20' (temp 4-component vector of float)
0:33 textureGather (global 4-component vector of float)
0:33 textureGather (temp 4-component vector of float)
0:33 Construct combined texture-sampler (temp sampler2D)
0:33 'g_tTex2df4' (uniform texture2D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -17,7 +17,7 @@ Shader version: 450
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of int)
0:34 'txval21' (temp 4-component vector of int)
0:34 textureGather (global 4-component vector of int)
0:34 textureGather (temp 4-component vector of int)
0:34 Construct combined texture-sampler (temp isampler2D)
0:34 'g_tTex2di4' (uniform itexture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -27,7 +27,7 @@ Shader version: 450
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of uint)
0:35 'txval22' (temp 4-component vector of uint)
0:35 textureGather (global 4-component vector of uint)
0:35 textureGather (temp 4-component vector of uint)
0:35 Construct combined texture-sampler (temp usampler2D)
0:35 'g_tTex2du4' (uniform utexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -37,7 +37,7 @@ Shader version: 450
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of float)
0:39 'txval40' (temp 4-component vector of float)
0:39 textureGather (global 4-component vector of float)
0:39 textureGather (temp 4-component vector of float)
0:39 Construct combined texture-sampler (temp samplerCube)
0:39 'g_tTexcdf4' (uniform textureCube)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -48,7 +48,7 @@ Shader version: 450
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of int)
0:40 'txval41' (temp 4-component vector of int)
0:40 textureGather (global 4-component vector of int)
0:40 textureGather (temp 4-component vector of int)
0:40 Construct combined texture-sampler (temp isamplerCube)
0:40 'g_tTexcdi4' (uniform itextureCube)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -59,7 +59,7 @@ Shader version: 450
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of uint)
0:41 'txval42' (temp 4-component vector of uint)
0:41 textureGather (global 4-component vector of uint)
0:41 textureGather (temp 4-component vector of uint)
0:41 Construct combined texture-sampler (temp usamplerCube)
0:41 'g_tTexcdu4' (uniform utextureCube)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -116,7 +116,7 @@ Shader version: 450
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of float)
0:33 'txval20' (temp 4-component vector of float)
0:33 textureGather (global 4-component vector of float)
0:33 textureGather (temp 4-component vector of float)
0:33 Construct combined texture-sampler (temp sampler2D)
0:33 'g_tTex2df4' (uniform texture2D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -126,7 +126,7 @@ Shader version: 450
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of int)
0:34 'txval21' (temp 4-component vector of int)
0:34 textureGather (global 4-component vector of int)
0:34 textureGather (temp 4-component vector of int)
0:34 Construct combined texture-sampler (temp isampler2D)
0:34 'g_tTex2di4' (uniform itexture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -136,7 +136,7 @@ Shader version: 450
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of uint)
0:35 'txval22' (temp 4-component vector of uint)
0:35 textureGather (global 4-component vector of uint)
0:35 textureGather (temp 4-component vector of uint)
0:35 Construct combined texture-sampler (temp usampler2D)
0:35 'g_tTex2du4' (uniform utexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -146,7 +146,7 @@ Shader version: 450
0:39 Sequence
0:39 move second child to first child (temp 4-component vector of float)
0:39 'txval40' (temp 4-component vector of float)
0:39 textureGather (global 4-component vector of float)
0:39 textureGather (temp 4-component vector of float)
0:39 Construct combined texture-sampler (temp samplerCube)
0:39 'g_tTexcdf4' (uniform textureCube)
0:39 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -157,7 +157,7 @@ Shader version: 450
0:40 Sequence
0:40 move second child to first child (temp 4-component vector of int)
0:40 'txval41' (temp 4-component vector of int)
0:40 textureGather (global 4-component vector of int)
0:40 textureGather (temp 4-component vector of int)
0:40 Construct combined texture-sampler (temp isamplerCube)
0:40 'g_tTexcdi4' (uniform itextureCube)
0:40 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -168,7 +168,7 @@ Shader version: 450
0:41 Sequence
0:41 move second child to first child (temp 4-component vector of uint)
0:41 'txval42' (temp 4-component vector of uint)
0:41 textureGather (global 4-component vector of uint)
0:41 textureGather (temp 4-component vector of uint)
0:41 Construct combined texture-sampler (temp usamplerCube)
0:41 'g_tTexcdu4' (uniform utextureCube)
0:41 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.gather.offset.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of float)
0:33 'txval20' (temp 4-component vector of float)
0:33 textureGatherOffset (global 4-component vector of float)
0:33 textureGatherOffset (temp 4-component vector of float)
0:33 Construct combined texture-sampler (temp sampler2D)
0:33 'g_tTex2df4' (uniform texture2D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -21,7 +21,7 @@ gl_FragCoord origin is upper left
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of int)
0:34 'txval21' (temp 4-component vector of int)
0:34 textureGatherOffset (global 4-component vector of int)
0:34 textureGatherOffset (temp 4-component vector of int)
0:34 Construct combined texture-sampler (temp isampler2D)
0:34 'g_tTex2di4' (uniform itexture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -34,7 +34,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of uint)
0:35 'txval22' (temp 4-component vector of uint)
0:35 textureGatherOffset (global 4-component vector of uint)
0:35 textureGatherOffset (temp 4-component vector of uint)
0:35 Construct combined texture-sampler (temp usampler2D)
0:35 'g_tTex2du4' (uniform utexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -107,7 +107,7 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child (temp 4-component vector of float)
0:33 'txval20' (temp 4-component vector of float)
0:33 textureGatherOffset (global 4-component vector of float)
0:33 textureGatherOffset (temp 4-component vector of float)
0:33 Construct combined texture-sampler (temp sampler2D)
0:33 'g_tTex2df4' (uniform texture2D)
0:33 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -120,7 +120,7 @@ gl_FragCoord origin is upper left
0:34 Sequence
0:34 move second child to first child (temp 4-component vector of int)
0:34 'txval21' (temp 4-component vector of int)
0:34 textureGatherOffset (global 4-component vector of int)
0:34 textureGatherOffset (temp 4-component vector of int)
0:34 Construct combined texture-sampler (temp isampler2D)
0:34 'g_tTex2di4' (uniform itexture2D)
0:34 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -133,7 +133,7 @@ gl_FragCoord origin is upper left
0:35 Sequence
0:35 move second child to first child (temp 4-component vector of uint)
0:35 'txval22' (temp 4-component vector of uint)
0:35 textureGatherOffset (global 4-component vector of uint)
0:35 textureGatherOffset (temp 4-component vector of uint)
0:35 Construct combined texture-sampler (temp usampler2D)
0:35 'g_tTex2du4' (uniform utexture2D)
0:35 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:25 Sequence
0:25 move second child to first child (temp 4-component vector of float)
0:25 'txval20' (temp 4-component vector of float)
0:25 textureGatherOffset (global 4-component vector of float)
0:25 textureGatherOffset (temp 4-component vector of float)
0:25 Construct combined texture-sampler (temp sampler2DArray)
0:25 'g_tTex2df4' (uniform texture2DArray)
0:25 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -22,7 +22,7 @@ gl_FragCoord origin is upper left
0:26 Sequence
0:26 move second child to first child (temp 4-component vector of int)
0:26 'txval21' (temp 4-component vector of int)
0:26 textureGatherOffset (global 4-component vector of int)
0:26 textureGatherOffset (temp 4-component vector of int)
0:26 Construct combined texture-sampler (temp isampler2DArray)
0:26 'g_tTex2di4' (uniform itexture2DArray)
0:26 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
0:27 Sequence
0:27 move second child to first child (temp 4-component vector of uint)
0:27 'txval22' (temp 4-component vector of uint)
0:27 textureGatherOffset (global 4-component vector of uint)
0:27 textureGatherOffset (temp 4-component vector of uint)
0:27 Construct combined texture-sampler (temp usampler2DArray)
0:27 'g_tTex2du4' (uniform utexture2DArray)
0:27 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -104,7 +104,7 @@ gl_FragCoord origin is upper left
0:25 Sequence
0:25 move second child to first child (temp 4-component vector of float)
0:25 'txval20' (temp 4-component vector of float)
0:25 textureGatherOffset (global 4-component vector of float)
0:25 textureGatherOffset (temp 4-component vector of float)
0:25 Construct combined texture-sampler (temp sampler2DArray)
0:25 'g_tTex2df4' (uniform texture2DArray)
0:25 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -118,7 +118,7 @@ gl_FragCoord origin is upper left
0:26 Sequence
0:26 move second child to first child (temp 4-component vector of int)
0:26 'txval21' (temp 4-component vector of int)
0:26 textureGatherOffset (global 4-component vector of int)
0:26 textureGatherOffset (temp 4-component vector of int)
0:26 Construct combined texture-sampler (temp isampler2DArray)
0:26 'g_tTex2di4' (uniform itexture2DArray)
0:26 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -132,7 +132,7 @@ gl_FragCoord origin is upper left
0:27 Sequence
0:27 move second child to first child (temp 4-component vector of uint)
0:27 'txval22' (temp 4-component vector of uint)
0:27 textureGatherOffset (global 4-component vector of uint)
0:27 textureGatherOffset (temp 4-component vector of uint)
0:27 Construct combined texture-sampler (temp usampler2DArray)
0:27 'g_tTex2du4' (uniform utexture2DArray)
0:27 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.getsampleposition.dx10.frag.out
......@@ -14,7 +14,7 @@ ERROR: node is still EOpNull!
0:16 move second child to first child (temp 2-component vector of float)
0:16 'r00' (temp 2-component vector of float)
0:16 ERROR: Bad aggregation op
(global 2-component vector of float)
(temp 2-component vector of float)
0:16 'g_tTex2dmsf4' (uniform texture2DMS)
0:16 Constant:
0:16 1 (const int)
......@@ -22,7 +22,7 @@ ERROR: node is still EOpNull!
0:17 move second child to first child (temp 2-component vector of float)
0:17 'r01' (temp 2-component vector of float)
0:17 ERROR: Bad aggregation op
(global 2-component vector of float)
(temp 2-component vector of float)
0:17 'g_tTex2dmsf4a' (uniform texture2DMSArray)
0:17 Constant:
0:17 2 (const int)
......@@ -79,7 +79,7 @@ ERROR: node is still EOpNull!
0:16 move second child to first child (temp 2-component vector of float)
0:16 'r00' (temp 2-component vector of float)
0:16 ERROR: Bad aggregation op
(global 2-component vector of float)
(temp 2-component vector of float)
0:16 'g_tTex2dmsf4' (uniform texture2DMS)
0:16 Constant:
0:16 1 (const int)
......@@ -87,7 +87,7 @@ ERROR: node is still EOpNull!
0:17 move second child to first child (temp 2-component vector of float)
0:17 'r01' (temp 2-component vector of float)
0:17 ERROR: Bad aggregation op
(global 2-component vector of float)
(temp 2-component vector of float)
0:17 'g_tTex2dmsf4a' (uniform texture2DMSArray)
0:17 Constant:
0:17 2 (const int)
......
Test/baseResults/hlsl.if.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:3 Test condition and select (temp void)
0:3 Condition
0:3 all (global bool)
0:3 all (temp bool)
0:3 Equal (temp 4-component vector of bool)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -20,7 +20,7 @@ gl_FragCoord origin is upper left
0:4 Branch: Return
0:6 Test condition and select (temp void)
0:6 Condition
0:6 all (global bool)
0:6 all (temp bool)
0:6 Equal (temp 4-component vector of bool)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -39,21 +39,21 @@ gl_FragCoord origin is upper left
0:9 Branch: Return
0:11 Test condition and select (temp void)
0:11 Condition
0:11 all (global bool)
0:11 all (temp bool)
0:11 Equal (temp 4-component vector of bool)
0:11 'input' (layout(location=0 ) in 4-component vector of float)
0:11 'input' (layout(location=0 ) in 4-component vector of float)
0:11 true case is null
0:14 Test condition and select (temp void)
0:14 Condition
0:14 all (global bool)
0:14 all (temp bool)
0:14 Equal (temp 4-component vector of bool)
0:14 'input' (layout(location=0 ) in 4-component vector of float)
0:14 'input' (layout(location=0 ) in 4-component vector of float)
0:14 true case is null
0:19 Test condition and select (temp void)
0:19 Condition
0:19 all (global bool)
0:19 all (temp bool)
0:19 Equal (temp 4-component vector of bool)
0:19 'input' (layout(location=0 ) in 4-component vector of float)
0:19 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -66,7 +66,7 @@ gl_FragCoord origin is upper left
0:20 Branch: Return
0:23 Test condition and select (temp void)
0:23 Condition
0:23 all (global bool)
0:23 all (temp bool)
0:23 Equal (temp 4-component vector of bool)
0:23 'input' (layout(location=0 ) in 4-component vector of float)
0:23 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -115,7 +115,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:3 Test condition and select (temp void)
0:3 Condition
0:3 all (global bool)
0:3 all (temp bool)
0:3 Equal (temp 4-component vector of bool)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -127,7 +127,7 @@ gl_FragCoord origin is upper left
0:4 Branch: Return
0:6 Test condition and select (temp void)
0:6 Condition
0:6 all (global bool)
0:6 all (temp bool)
0:6 Equal (temp 4-component vector of bool)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
0:6 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -146,21 +146,21 @@ gl_FragCoord origin is upper left
0:9 Branch: Return
0:11 Test condition and select (temp void)
0:11 Condition
0:11 all (global bool)
0:11 all (temp bool)
0:11 Equal (temp 4-component vector of bool)
0:11 'input' (layout(location=0 ) in 4-component vector of float)
0:11 'input' (layout(location=0 ) in 4-component vector of float)
0:11 true case is null
0:14 Test condition and select (temp void)
0:14 Condition
0:14 all (global bool)
0:14 all (temp bool)
0:14 Equal (temp 4-component vector of bool)
0:14 'input' (layout(location=0 ) in 4-component vector of float)
0:14 'input' (layout(location=0 ) in 4-component vector of float)
0:14 true case is null
0:19 Test condition and select (temp void)
0:19 Condition
0:19 all (global bool)
0:19 all (temp bool)
0:19 Equal (temp 4-component vector of bool)
0:19 'input' (layout(location=0 ) in 4-component vector of float)
0:19 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -173,7 +173,7 @@ gl_FragCoord origin is upper left
0:20 Branch: Return
0:23 Test condition and select (temp void)
0:23 Condition
0:23 all (global bool)
0:23 all (temp bool)
0:23 Equal (temp 4-component vector of bool)
0:23 'input' (layout(location=0 ) in 4-component vector of float)
0:23 'input' (layout(location=0 ) in 4-component vector of float)
......
Test/baseResults/hlsl.intrinsics.barriers.comp.out
......@@ -5,12 +5,12 @@ local_size = (1, 1, 1)
0:3 Function Definition: ComputeShaderFunction( (temp float)
0:3 Function Parameters:
0:? Sequence
0:4 MemoryBarrier (global void)
0:5 AllMemoryBarrierWithGroupSync (global void)
0:6 GroupMemoryBarrier (global void)
0:7 GroupMemoryBarrierWithGroupSync (global void)
0:8 WorkgroupMemoryBarrier (global void)
0:9 WorkgroupMemoryBarrierWithGroupSync (global void)
0:4 MemoryBarrier (temp void)
0:5 AllMemoryBarrierWithGroupSync (temp void)
0:6 GroupMemoryBarrier (temp void)
0:7 GroupMemoryBarrierWithGroupSync (temp void)
0:8 WorkgroupMemoryBarrier (temp void)
0:9 WorkgroupMemoryBarrierWithGroupSync (temp void)
0:11 Sequence
0:11 move second child to first child (temp float)
0:? '@entryPointOutput' (layout(location=0 ) out float)
......@@ -30,12 +30,12 @@ local_size = (1, 1, 1)
0:3 Function Definition: ComputeShaderFunction( (temp float)
0:3 Function Parameters:
0:? Sequence
0:4 MemoryBarrier (global void)
0:5 AllMemoryBarrierWithGroupSync (global void)
0:6 GroupMemoryBarrier (global void)
0:7 GroupMemoryBarrierWithGroupSync (global void)
0:8 WorkgroupMemoryBarrier (global void)
0:9 WorkgroupMemoryBarrierWithGroupSync (global void)
0:4 MemoryBarrier (temp void)
0:5 AllMemoryBarrierWithGroupSync (temp void)
0:6 GroupMemoryBarrier (temp void)
0:7 GroupMemoryBarrierWithGroupSync (temp void)
0:8 WorkgroupMemoryBarrier (temp void)
0:9 WorkgroupMemoryBarrierWithGroupSync (temp void)
0:11 Sequence
0:11 move second child to first child (temp float)
0:? '@entryPointOutput' (layout(location=0 ) out float)
......
Test/baseResults/hlsl.intrinsics.double.frag.out
......@@ -16,7 +16,7 @@ gl_FragCoord origin is upper left
0:6 Sequence
0:6 move second child to first child (temp double)
0:6 'r00' (temp double)
0:6 fma (global double)
0:6 fma (temp double)
0:6 'inDV1a' (layout(location=0 ) in double)
0:6 'inDV1b' (layout(location=1 ) in double)
0:6 'inDV1c' (layout(location=2 ) in double)
......@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
0:6 Sequence
0:6 move second child to first child (temp double)
0:6 'r00' (temp double)
0:6 fma (global double)
0:6 fma (temp double)
0:6 'inDV1a' (layout(location=0 ) in double)
0:6 'inDV1b' (layout(location=1 ) in double)
0:6 'inDV1c' (layout(location=2 ) in double)
......
Test/baseResults/hlsl.intrinsics.f1632.frag.out
......@@ -14,7 +14,7 @@ ERROR: node is still EOpNull!
0:2 'inF0' (in float)
0:? Sequence
0:3 ERROR: Bad unary op
(global uint)
(temp uint)
0:3 'inF0' (in float)
0:5 Branch: Return with expression
0:5 Constant:
......@@ -31,7 +31,7 @@ ERROR: node is still EOpNull!
0:15 'inF0' (in 2-component vector of float)
0:? Sequence
0:16 ERROR: Bad unary op
(global 2-component vector of uint)
(temp 2-component vector of uint)
0:16 'inF0' (in 2-component vector of float)
0:18 Branch: Return with expression
0:? Constant:
......@@ -42,7 +42,7 @@ ERROR: node is still EOpNull!
0:22 'inF0' (in 3-component vector of float)
0:? Sequence
0:23 ERROR: Bad unary op
(global 3-component vector of uint)
(temp 3-component vector of uint)
0:23 'inF0' (in 3-component vector of float)
0:25 Branch: Return with expression
0:? Constant:
......@@ -54,7 +54,7 @@ ERROR: node is still EOpNull!
0:29 'inF0' (layout(location=0 ) in 4-component vector of float)
0:? Sequence
0:30 ERROR: Bad unary op
(global 4-component vector of uint)
(temp 4-component vector of uint)
0:30 'inF0' (layout(location=0 ) in 4-component vector of float)
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of float)
......@@ -81,7 +81,7 @@ ERROR: node is still EOpNull!
0:2 'inF0' (in float)
0:? Sequence
0:3 ERROR: Bad unary op
(global uint)
(temp uint)
0:3 'inF0' (in float)
0:5 Branch: Return with expression
0:5 Constant:
......@@ -98,7 +98,7 @@ ERROR: node is still EOpNull!
0:15 'inF0' (in 2-component vector of float)
0:? Sequence
0:16 ERROR: Bad unary op
(global 2-component vector of uint)
(temp 2-component vector of uint)
0:16 'inF0' (in 2-component vector of float)
0:18 Branch: Return with expression
0:? Constant:
......@@ -109,7 +109,7 @@ ERROR: node is still EOpNull!
0:22 'inF0' (in 3-component vector of float)
0:? Sequence
0:23 ERROR: Bad unary op
(global 3-component vector of uint)
(temp 3-component vector of uint)
0:23 'inF0' (in 3-component vector of float)
0:25 Branch: Return with expression
0:? Constant:
......@@ -121,7 +121,7 @@ ERROR: node is still EOpNull!
0:29 'inF0' (layout(location=0 ) in 4-component vector of float)
0:? Sequence
0:30 ERROR: Bad unary op
(global 4-component vector of uint)
(temp 4-component vector of uint)
0:30 'inF0' (layout(location=0 ) in 4-component vector of float)
0:32 Sequence
0:32 move second child to first child (temp 4-component vector of float)
......
Test/baseResults/hlsl.intrinsics.frag.out
This source diff could not be displayed because it is too large. You can view the blob instead.
Test/baseResults/hlsl.intrinsics.vert.out
This source diff could not be displayed because it is too large. You can view the blob instead.
Test/baseResults/hlsl.max.frag.out
......@@ -10,7 +10,7 @@ gl_FragCoord origin is upper left
0:3 Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 max (global 4-component vector of float)
0:3 max (temp 4-component vector of float)
0:3 'input1' (layout(location=0 ) in 4-component vector of float)
0:3 'input2' (layout(location=1 ) in 4-component vector of float)
0:3 Branch: Return
......@@ -34,7 +34,7 @@ gl_FragCoord origin is upper left
0:3 Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 max (global 4-component vector of float)
0:3 max (temp 4-component vector of float)
0:3 'input1' (layout(location=0 ) in 4-component vector of float)
0:3 'input2' (layout(location=1 ) in 4-component vector of float)
0:3 Branch: Return
......
Test/baseResults/hlsl.promote.vec1.frag.out
......@@ -13,13 +13,13 @@ gl_FragCoord origin is upper left
0:8 'f1b' (temp 1-component vector of float)
0:8 Construct float (temp 1-component vector of float)
0:8 'f1a' (temp float)
0:11 step (global 3-component vector of float)
0:11 step (temp 3-component vector of float)
0:11 Constant:
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 'f3' (temp 3-component vector of float)
0:13 sine (global float)
0:13 sine (temp float)
0:13 Construct float (in float)
0:13 'f1b' (temp 1-component vector of float)
0:15 Sequence
......@@ -52,13 +52,13 @@ gl_FragCoord origin is upper left
0:8 'f1b' (temp 1-component vector of float)
0:8 Construct float (temp 1-component vector of float)
0:8 'f1a' (temp float)
0:11 step (global 3-component vector of float)
0:11 step (temp 3-component vector of float)
0:11 Constant:
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 'f3' (temp 3-component vector of float)
0:13 sine (global float)
0:13 sine (temp float)
0:13 Construct float (in float)
0:13 'f1b' (temp 1-component vector of float)
0:15 Sequence
......
Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r10' (temp float)
0:42 texture (global float)
0:42 texture (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -21,7 +21,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r12' (temp float)
0:43 texture (global float)
0:43 texture (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -34,7 +34,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r14' (temp float)
0:44 texture (global float)
0:44 texture (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -47,7 +47,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r30' (temp float)
0:47 texture (global float)
0:47 texture (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -61,7 +61,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r32' (temp float)
0:48 texture (global float)
0:48 texture (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -75,7 +75,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r34' (temp float)
0:49 texture (global float)
0:49 texture (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -89,7 +89,7 @@ gl_FragCoord origin is upper left
0:52 Sequence
0:52 move second child to first child (temp float)
0:52 'r60' (temp float)
0:52 texture (global float)
0:52 texture (temp float)
0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow)
0:52 'g_tTexcdf4a' (uniform textureCubeArray)
0:52 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -104,7 +104,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r62' (temp float)
0:53 texture (global float)
0:53 texture (temp float)
0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow)
0:53 'g_tTexcdi4a' (uniform itextureCubeArray)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -119,7 +119,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r64' (temp float)
0:54 texture (global float)
0:54 texture (temp float)
0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow)
0:54 'g_tTexcdu4a' (uniform utextureCubeArray)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -202,7 +202,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r10' (temp float)
0:42 texture (global float)
0:42 texture (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -215,7 +215,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r12' (temp float)
0:43 texture (global float)
0:43 texture (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -228,7 +228,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r14' (temp float)
0:44 texture (global float)
0:44 texture (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -241,7 +241,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r30' (temp float)
0:47 texture (global float)
0:47 texture (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -255,7 +255,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r32' (temp float)
0:48 texture (global float)
0:48 texture (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -269,7 +269,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r34' (temp float)
0:49 texture (global float)
0:49 texture (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -283,7 +283,7 @@ gl_FragCoord origin is upper left
0:52 Sequence
0:52 move second child to first child (temp float)
0:52 'r60' (temp float)
0:52 texture (global float)
0:52 texture (temp float)
0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow)
0:52 'g_tTexcdf4a' (uniform textureCubeArray)
0:52 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -298,7 +298,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r62' (temp float)
0:53 texture (global float)
0:53 texture (temp float)
0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow)
0:53 'g_tTexcdi4a' (uniform itextureCubeArray)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -313,7 +313,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r64' (temp float)
0:54 texture (global float)
0:54 texture (temp float)
0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow)
0:54 'g_tTexcdu4a' (uniform utextureCubeArray)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r00' (temp float)
0:42 texture (global float)
0:42 texture (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -20,7 +20,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r02' (temp float)
0:43 texture (global float)
0:43 texture (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -32,7 +32,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r04' (temp float)
0:44 texture (global float)
0:44 texture (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -44,7 +44,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r20' (temp float)
0:47 texture (global float)
0:47 texture (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -57,7 +57,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r22' (temp float)
0:48 texture (global float)
0:48 texture (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -70,7 +70,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r24' (temp float)
0:49 texture (global float)
0:49 texture (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -83,7 +83,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r50' (temp float)
0:53 texture (global float)
0:53 texture (temp float)
0:53 Construct combined texture-sampler (temp samplerCubeShadow)
0:53 'g_tTexcdf4' (uniform textureCube)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r52' (temp float)
0:54 texture (global float)
0:54 texture (temp float)
0:54 Construct combined texture-sampler (temp isamplerCubeShadow)
0:54 'g_tTexcdi4' (uniform itextureCube)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -111,7 +111,7 @@ gl_FragCoord origin is upper left
0:55 Sequence
0:55 move second child to first child (temp float)
0:55 'r54' (temp float)
0:55 texture (global float)
0:55 texture (temp float)
0:55 Construct combined texture-sampler (temp usamplerCubeShadow)
0:55 'g_tTexcdu4' (uniform utextureCube)
0:55 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -193,7 +193,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r00' (temp float)
0:42 texture (global float)
0:42 texture (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -205,7 +205,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r02' (temp float)
0:43 texture (global float)
0:43 texture (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -217,7 +217,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r04' (temp float)
0:44 texture (global float)
0:44 texture (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -229,7 +229,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r20' (temp float)
0:47 texture (global float)
0:47 texture (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -242,7 +242,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r22' (temp float)
0:48 texture (global float)
0:48 texture (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -255,7 +255,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r24' (temp float)
0:49 texture (global float)
0:49 texture (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -268,7 +268,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r50' (temp float)
0:53 texture (global float)
0:53 texture (temp float)
0:53 Construct combined texture-sampler (temp samplerCubeShadow)
0:53 'g_tTexcdf4' (uniform textureCube)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -282,7 +282,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r52' (temp float)
0:54 texture (global float)
0:54 texture (temp float)
0:54 Construct combined texture-sampler (temp isamplerCubeShadow)
0:54 'g_tTexcdi4' (uniform itextureCube)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -296,7 +296,7 @@ gl_FragCoord origin is upper left
0:55 Sequence
0:55 move second child to first child (temp float)
0:55 'r54' (temp float)
0:55 texture (global float)
0:55 texture (temp float)
0:55 Construct combined texture-sampler (temp usamplerCubeShadow)
0:55 'g_tTexcdu4' (uniform utextureCube)
0:55 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r01' (temp float)
0:42 textureOffset (global float)
0:42 textureOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -22,7 +22,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r03' (temp float)
0:43 textureOffset (global float)
0:43 textureOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r05' (temp float)
0:44 textureOffset (global float)
0:44 textureOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -50,7 +50,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r21' (temp float)
0:47 textureOffset (global float)
0:47 textureOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -66,7 +66,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r23' (temp float)
0:48 textureOffset (global float)
0:48 textureOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -82,7 +82,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r25' (temp float)
0:49 textureOffset (global float)
0:49 textureOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -166,7 +166,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r01' (temp float)
0:42 textureOffset (global float)
0:42 textureOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -180,7 +180,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r03' (temp float)
0:43 textureOffset (global float)
0:43 textureOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -194,7 +194,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r05' (temp float)
0:44 textureOffset (global float)
0:44 textureOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -208,7 +208,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r21' (temp float)
0:47 textureOffset (global float)
0:47 textureOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -224,7 +224,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r23' (temp float)
0:48 textureOffset (global float)
0:48 textureOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -240,7 +240,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r25' (temp float)
0:49 textureOffset (global float)
0:49 textureOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r11' (temp float)
0:42 textureOffset (global float)
0:42 textureOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -23,7 +23,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r13' (temp float)
0:43 textureOffset (global float)
0:43 textureOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -38,7 +38,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r15' (temp float)
0:44 textureOffset (global float)
0:44 textureOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r31' (temp float)
0:47 textureOffset (global float)
0:47 textureOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -70,7 +70,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r33' (temp float)
0:48 textureOffset (global float)
0:48 textureOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -87,7 +87,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r35' (temp float)
0:49 textureOffset (global float)
0:49 textureOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -172,7 +172,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r11' (temp float)
0:42 textureOffset (global float)
0:42 textureOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -187,7 +187,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r13' (temp float)
0:43 textureOffset (global float)
0:43 textureOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -202,7 +202,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r15' (temp float)
0:44 textureOffset (global float)
0:44 textureOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -217,7 +217,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r31' (temp float)
0:47 textureOffset (global float)
0:47 textureOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -234,7 +234,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r33' (temp float)
0:48 textureOffset (global float)
0:48 textureOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -251,7 +251,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r35' (temp float)
0:49 textureOffset (global float)
0:49 textureOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r10' (temp float)
0:42 textureLod (global float)
0:42 textureLod (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -23,7 +23,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r12' (temp float)
0:43 textureLod (global float)
0:43 textureLod (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -38,7 +38,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r14' (temp float)
0:44 textureLod (global float)
0:44 textureLod (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r30' (temp float)
0:47 textureLod (global float)
0:47 textureLod (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -69,7 +69,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r32' (temp float)
0:48 textureLod (global float)
0:48 textureLod (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -85,7 +85,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r34' (temp float)
0:49 textureLod (global float)
0:49 textureLod (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -101,7 +101,7 @@ gl_FragCoord origin is upper left
0:52 Sequence
0:52 move second child to first child (temp float)
0:52 'r60' (temp float)
0:52 textureLod (global float)
0:52 textureLod (temp float)
0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow)
0:52 'g_tTexcdf4a' (uniform textureCubeArray)
0:52 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -118,7 +118,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r62' (temp float)
0:53 textureLod (global float)
0:53 textureLod (temp float)
0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow)
0:53 'g_tTexcdi4a' (uniform itextureCubeArray)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -135,7 +135,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r64' (temp float)
0:54 textureLod (global float)
0:54 textureLod (temp float)
0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow)
0:54 'g_tTexcdu4a' (uniform utextureCubeArray)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -220,7 +220,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r10' (temp float)
0:42 textureLod (global float)
0:42 textureLod (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -235,7 +235,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r12' (temp float)
0:43 textureLod (global float)
0:43 textureLod (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -250,7 +250,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r14' (temp float)
0:44 textureLod (global float)
0:44 textureLod (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -265,7 +265,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r30' (temp float)
0:47 textureLod (global float)
0:47 textureLod (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -281,7 +281,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r32' (temp float)
0:48 textureLod (global float)
0:48 textureLod (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -297,7 +297,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r34' (temp float)
0:49 textureLod (global float)
0:49 textureLod (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -313,7 +313,7 @@ gl_FragCoord origin is upper left
0:52 Sequence
0:52 move second child to first child (temp float)
0:52 'r60' (temp float)
0:52 textureLod (global float)
0:52 textureLod (temp float)
0:52 Construct combined texture-sampler (temp samplerCubeArrayShadow)
0:52 'g_tTexcdf4a' (uniform textureCubeArray)
0:52 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -330,7 +330,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r62' (temp float)
0:53 textureLod (global float)
0:53 textureLod (temp float)
0:53 Construct combined texture-sampler (temp isamplerCubeArrayShadow)
0:53 'g_tTexcdi4a' (uniform itextureCubeArray)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -347,7 +347,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r64' (temp float)
0:54 textureLod (global float)
0:54 textureLod (temp float)
0:54 Construct combined texture-sampler (temp usamplerCubeArrayShadow)
0:54 'g_tTexcdu4a' (uniform utextureCubeArray)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r00' (temp float)
0:42 textureLod (global float)
0:42 textureLod (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -22,7 +22,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r02' (temp float)
0:43 textureLod (global float)
0:43 textureLod (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -36,7 +36,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r04' (temp float)
0:44 textureLod (global float)
0:44 textureLod (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -50,7 +50,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r20' (temp float)
0:47 textureLod (global float)
0:47 textureLod (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r22' (temp float)
0:48 textureLod (global float)
0:48 textureLod (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -80,7 +80,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r24' (temp float)
0:49 textureLod (global float)
0:49 textureLod (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -95,7 +95,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r50' (temp float)
0:53 textureLod (global float)
0:53 textureLod (temp float)
0:53 Construct combined texture-sampler (temp samplerCubeShadow)
0:53 'g_tTexcdf4' (uniform textureCube)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -111,7 +111,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r52' (temp float)
0:54 textureLod (global float)
0:54 textureLod (temp float)
0:54 Construct combined texture-sampler (temp isamplerCubeShadow)
0:54 'g_tTexcdi4' (uniform itextureCube)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -127,7 +127,7 @@ gl_FragCoord origin is upper left
0:55 Sequence
0:55 move second child to first child (temp float)
0:55 'r54' (temp float)
0:55 textureLod (global float)
0:55 textureLod (temp float)
0:55 Construct combined texture-sampler (temp usamplerCubeShadow)
0:55 'g_tTexcdu4' (uniform utextureCube)
0:55 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -211,7 +211,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r00' (temp float)
0:42 textureLod (global float)
0:42 textureLod (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -225,7 +225,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r02' (temp float)
0:43 textureLod (global float)
0:43 textureLod (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -239,7 +239,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r04' (temp float)
0:44 textureLod (global float)
0:44 textureLod (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -253,7 +253,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r20' (temp float)
0:47 textureLod (global float)
0:47 textureLod (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -268,7 +268,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r22' (temp float)
0:48 textureLod (global float)
0:48 textureLod (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -283,7 +283,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r24' (temp float)
0:49 textureLod (global float)
0:49 textureLod (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -298,7 +298,7 @@ gl_FragCoord origin is upper left
0:53 Sequence
0:53 move second child to first child (temp float)
0:53 'r50' (temp float)
0:53 textureLod (global float)
0:53 textureLod (temp float)
0:53 Construct combined texture-sampler (temp samplerCubeShadow)
0:53 'g_tTexcdf4' (uniform textureCube)
0:53 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -314,7 +314,7 @@ gl_FragCoord origin is upper left
0:54 Sequence
0:54 move second child to first child (temp float)
0:54 'r52' (temp float)
0:54 textureLod (global float)
0:54 textureLod (temp float)
0:54 Construct combined texture-sampler (temp isamplerCubeShadow)
0:54 'g_tTexcdi4' (uniform itextureCube)
0:54 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -330,7 +330,7 @@ gl_FragCoord origin is upper left
0:55 Sequence
0:55 move second child to first child (temp float)
0:55 'r54' (temp float)
0:55 textureLod (global float)
0:55 textureLod (temp float)
0:55 Construct combined texture-sampler (temp usamplerCubeShadow)
0:55 'g_tTexcdu4' (uniform utextureCube)
0:55 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r01' (temp float)
0:42 textureLodOffset (global float)
0:42 textureLodOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -24,7 +24,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r03' (temp float)
0:43 textureLodOffset (global float)
0:43 textureLodOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -40,7 +40,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r05' (temp float)
0:44 textureLodOffset (global float)
0:44 textureLodOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -56,7 +56,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r21' (temp float)
0:47 textureLodOffset (global float)
0:47 textureLodOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -74,7 +74,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r23' (temp float)
0:48 textureLodOffset (global float)
0:48 textureLodOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -92,7 +92,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r25' (temp float)
0:49 textureLodOffset (global float)
0:49 textureLodOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -178,7 +178,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r01' (temp float)
0:42 textureLodOffset (global float)
0:42 textureLodOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DShadow)
0:42 'g_tTex1df4' (layout(binding=0 ) uniform texture1D)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -194,7 +194,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r03' (temp float)
0:43 textureLodOffset (global float)
0:43 textureLodOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DShadow)
0:43 'g_tTex1di4' (uniform itexture1D)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -210,7 +210,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r05' (temp float)
0:44 textureLodOffset (global float)
0:44 textureLodOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DShadow)
0:44 'g_tTex1du4' (uniform utexture1D)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -226,7 +226,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r21' (temp float)
0:47 textureLodOffset (global float)
0:47 textureLodOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DShadow)
0:47 'g_tTex2df4' (uniform texture2D)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -244,7 +244,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r23' (temp float)
0:48 textureLodOffset (global float)
0:48 textureLodOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DShadow)
0:48 'g_tTex2di4' (uniform itexture2D)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -262,7 +262,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r25' (temp float)
0:49 textureLodOffset (global float)
0:49 textureLodOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DShadow)
0:49 'g_tTex2du4' (uniform utexture2D)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r11' (temp float)
0:42 textureLodOffset (global float)
0:42 textureLodOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -25,7 +25,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r13' (temp float)
0:43 textureLodOffset (global float)
0:43 textureLodOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -42,7 +42,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r15' (temp float)
0:44 textureLodOffset (global float)
0:44 textureLodOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -59,7 +59,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r31' (temp float)
0:47 textureLodOffset (global float)
0:47 textureLodOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -78,7 +78,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r33' (temp float)
0:48 textureLodOffset (global float)
0:48 textureLodOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r35' (temp float)
0:49 textureLodOffset (global float)
0:49 textureLodOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -184,7 +184,7 @@ gl_FragCoord origin is upper left
0:42 Sequence
0:42 move second child to first child (temp float)
0:42 'r11' (temp float)
0:42 textureLodOffset (global float)
0:42 textureLodOffset (temp float)
0:42 Construct combined texture-sampler (temp sampler1DArrayShadow)
0:42 'g_tTex1df4a' (uniform texture1DArray)
0:42 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -201,7 +201,7 @@ gl_FragCoord origin is upper left
0:43 Sequence
0:43 move second child to first child (temp float)
0:43 'r13' (temp float)
0:43 textureLodOffset (global float)
0:43 textureLodOffset (temp float)
0:43 Construct combined texture-sampler (temp isampler1DArrayShadow)
0:43 'g_tTex1di4a' (uniform itexture1DArray)
0:43 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -218,7 +218,7 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child (temp float)
0:44 'r15' (temp float)
0:44 textureLodOffset (global float)
0:44 textureLodOffset (temp float)
0:44 Construct combined texture-sampler (temp usampler1DArrayShadow)
0:44 'g_tTex1du4a' (uniform utexture1DArray)
0:44 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -235,7 +235,7 @@ gl_FragCoord origin is upper left
0:47 Sequence
0:47 move second child to first child (temp float)
0:47 'r31' (temp float)
0:47 textureLodOffset (global float)
0:47 textureLodOffset (temp float)
0:47 Construct combined texture-sampler (temp sampler2DArrayShadow)
0:47 'g_tTex2df4a' (uniform texture2DArray)
0:47 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -254,7 +254,7 @@ gl_FragCoord origin is upper left
0:48 Sequence
0:48 move second child to first child (temp float)
0:48 'r33' (temp float)
0:48 textureLodOffset (global float)
0:48 textureLodOffset (temp float)
0:48 Construct combined texture-sampler (temp isampler2DArrayShadow)
0:48 'g_tTex2di4a' (uniform itexture2DArray)
0:48 'g_sSamp' (layout(binding=0 ) uniform sampler)
......@@ -273,7 +273,7 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child (temp float)
0:49 'r35' (temp float)
0:49 textureLodOffset (global float)
0:49 textureLodOffset (temp float)
0:49 Construct combined texture-sampler (temp usampler2DArrayShadow)
0:49 'g_tTex2du4a' (uniform utexture2DArray)
0:49 'g_sSamp' (layout(binding=0 ) uniform sampler)
......
Test/baseResults/hlsl.shapeConv.frag.out
......@@ -82,7 +82,7 @@ gl_FragCoord origin is upper left
0:19 7.000000
0:19 7.000000
0:19 'foo' (temp 3-component vector of float)
0:21 all (global bool)
0:21 all (temp bool)
0:21 Equal (temp 4-component vector of bool)
0:21 Construct vec4 (temp 4-component vector of float)
0:21 direct index (temp float)
......@@ -90,7 +90,7 @@ gl_FragCoord origin is upper left
0:21 Constant:
0:21 0 (const int)
0:21 'v' (temp 4-component vector of float)
0:22 any (global bool)
0:22 any (temp bool)
0:22 NotEqual (temp 4-component vector of bool)
0:22 Construct vec4 (temp 4-component vector of float)
0:22 'f' (in float)
......@@ -199,7 +199,7 @@ gl_FragCoord origin is upper left
0:19 7.000000
0:19 7.000000
0:19 'foo' (temp 3-component vector of float)
0:21 all (global bool)
0:21 all (temp bool)
0:21 Equal (temp 4-component vector of bool)
0:21 Construct vec4 (temp 4-component vector of float)
0:21 direct index (temp float)
......@@ -207,7 +207,7 @@ gl_FragCoord origin is upper left
0:21 Constant:
0:21 0 (const int)
0:21 'v' (temp 4-component vector of float)
0:22 any (global bool)
0:22 any (temp bool)
0:22 NotEqual (temp 4-component vector of bool)
0:22 Construct vec4 (temp 4-component vector of float)
0:22 'f' (in float)
......
Test/baseResults/hlsl.sin.frag.out
......@@ -9,7 +9,7 @@ gl_FragCoord origin is upper left
0:3 Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 sine (global 4-component vector of float)
0:3 sine (temp 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 Branch: Return
0:? Linker Objects
......@@ -30,7 +30,7 @@ gl_FragCoord origin is upper left
0:3 Sequence
0:3 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:3 sine (global 4-component vector of float)
0:3 sine (temp 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 Branch: Return
0:? Linker Objects
......
Test/baseResults/hlsl.whileLoop.frag.out
......@@ -8,7 +8,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:3 Loop with condition tested first
0:3 Loop Condition
0:3 any (global bool)
0:3 any (temp bool)
0:3 NotEqual (temp 4-component vector of bool)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
......@@ -51,7 +51,7 @@ gl_FragCoord origin is upper left
0:? Sequence
0:3 Loop with condition tested first
0:3 Loop Condition
0:3 any (global bool)
0:3 any (temp bool)
0:3 NotEqual (temp 4-component vector of bool)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
0:3 'input' (layout(location=0 ) in 4-component vector of float)
......
Test/hlsl.matNx1.frag 0 → 100644
void TestMatNx1()
{
float1x1 f1x1;
float2x1 f2x1;
float3x1 f3x1;
float4x1 f4x1;
float1x2 f1x2;
float1x3 f1x3;
float1x4 f1x4;
float1x1 r00 = transpose(f1x1);
float1x2 r01 = transpose(f2x1);
float1x3 r02 = transpose(f3x1);
float1x4 r03 = transpose(f4x1);
float1x1 r10 = transpose(f1x1);
float2x1 r11 = transpose(f1x2);
float3x1 r12 = transpose(f1x3);
float4x1 r13 = transpose(f1x4);
}
struct PS_OUTPUT { float4 color : SV_Target0; };
PS_OUTPUT main()
{
PS_OUTPUT ps_output;
ps_output.color = 1.0;
return ps_output;
};
Test/hlsl.matType.bool.frag 0 → 100644
void TestBoolMatTypes()
{
bool1x1 b1x1;
bool2x1 b2x1;
bool3x1 b3x1;
bool4x1 b4x1;
bool1x2 b1x2;
bool2x2 b2x2;
bool3x2 b3x2;
bool4x2 b4x2;
bool1x3 b1x3;
bool2x3 b2x3;
bool3x3 b3x3;
bool4x3 b4x3;
bool1x4 b1x4;
bool2x4 b2x4;
bool3x4 b3x4;
bool4x4 b4x4;
// TODO: Currently SPIR-V disallows Nx1 or 1xN mats.
bool1x1 r00 = transpose(b1x1);
bool1x2 r01 = transpose(b2x1);
bool1x3 r02 = transpose(b3x1);
bool1x4 r03 = transpose(b4x1);
bool2x1 r10 = transpose(b1x2);
bool2x2 r11 = transpose(b2x2);
bool2x3 r12 = transpose(b3x2);
bool2x4 r13 = transpose(b4x2);
bool3x1 r20 = transpose(b1x3);
bool3x2 r21 = transpose(b2x3);
bool3x3 r22 = transpose(b3x3);
bool3x4 r23 = transpose(b4x3);
bool4x1 r30 = transpose(b1x4);
bool4x2 r31 = transpose(b2x4);
bool4x3 r32 = transpose(b3x4);
bool4x4 r33 = transpose(b4x4);
}
struct PS_OUTPUT { float4 color : SV_Target0; };
PS_OUTPUT main()
{
PS_OUTPUT ps_output;
ps_output.color = float4(0,0,0,0);
return ps_output;
};
Test/hlsl.matType.int.frag 0 → 100644
void TestIntMatTypes()
{
int1x1 i1x1;
int2x1 i2x1;
int3x1 i3x1;
int4x1 i4x1;
int1x2 i1x2;
int2x2 i2x2;
int3x2 i3x2;
int4x2 i4x2;
int1x3 i1x3;
int2x3 i2x3;
int3x3 i3x3;
int4x3 i4x3;
int1x4 i1x4;
int2x4 i2x4;
int3x4 i3x4;
int4x4 i4x4;
// TODO: Currently SPIR-V disallows Nx1 or 1xN mats.
int1x1 r00 = transpose(i1x1);
int1x2 r01 = transpose(i2x1);
int1x3 r02 = transpose(i3x1);
int1x4 r03 = transpose(i4x1);
int2x1 r10 = transpose(i1x2);
int2x2 r11 = transpose(i2x2);
int2x3 r12 = transpose(i3x2);
int2x4 r13 = transpose(i4x2);
int3x1 r20 = transpose(i1x3);
int3x2 r21 = transpose(i2x3);
int3x3 r22 = transpose(i3x3);
int3x4 r23 = transpose(i4x3);
int4x1 r30 = transpose(i1x4);
int4x2 r31 = transpose(i2x4);
int4x3 r32 = transpose(i3x4);
int4x4 r33 = transpose(i4x4);
}
void TestUintMatTypes()
{
uint1x1 u1x1;
uint2x1 u2x1;
uint3x1 u3x1;
uint4x1 u4x1;
uint1x2 u1x2;
uint2x2 u2x2;
uint3x2 u3x2;
uint4x2 u4x2;
uint1x3 u1x3;
uint2x3 u2x3;
uint3x3 u3x3;
uint4x3 u4x3;
uint1x4 u1x4;
uint2x4 u2x4;
uint3x4 u3x4;
uint4x4 u4x4;
// TODO: Currently SPIR-V disallows Nx1 or 1xN mats.
uint1x1 r00 = transpose(u1x1);
uint1x2 r01 = transpose(u2x1);
uint1x3 r02 = transpose(u3x1);
uint1x4 r03 = transpose(u4x1);
uint2x1 r10 = transpose(u1x2);
uint2x2 r11 = transpose(u2x2);
uint2x3 r12 = transpose(u3x2);
uint2x4 r13 = transpose(u4x2);
uint3x1 r20 = transpose(u1x3);
uint3x2 r21 = transpose(u2x3);
uint3x3 r22 = transpose(u3x3);
uint3x4 r23 = transpose(u4x3);
uint4x1 r30 = transpose(u1x4);
uint4x2 r31 = transpose(u2x4);
uint4x3 r32 = transpose(u3x4);
uint4x4 r33 = transpose(u4x4);
}
struct PS_OUTPUT { float4 color : SV_Target0; };
PS_OUTPUT main()
{
PS_OUTPUT ps_output;
ps_output.color = float4(0,0,0,0);
return ps_output;
};
gtests/Hlsl.FromFile.cpp
......@@ -147,6 +147,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.logical.unary.frag", "main"},
{"hlsl.logical.binary.frag", "main"},
{"hlsl.logical.binary.vec.frag", "main"},
{"hlsl.matNx1.frag", "main"},
{"hlsl.mintypes.frag", "main"},
{"hlsl.multiEntry.vert", "RealEntrypoint"},
{"hlsl.multiReturn.frag", "main"},
......@@ -199,6 +200,8 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.structin.vert", "main"},
{"hlsl.intrinsics.vert", "VertexShaderFunction"},
{"hlsl.matType.frag", "PixelShaderFunction"},
{"hlsl.matType.bool.frag", "main"},
{"hlsl.matType.int.frag", "main"},
{"hlsl.max.frag", "PixelShaderFunction"},
{"hlsl.precedence.frag", "PixelShaderFunction"},
{"hlsl.precedence2.frag", "PixelShaderFunction"},
......
hlsl/hlslParseables.cpp
......@@ -55,7 +55,7 @@
namespace { // anonymous namespace functions
const bool UseHlslTypes = false;
const bool UseHlslTypes = true;
const char* BaseTypeName(const char argOrder, const char* scalarName, const char* vecName, const char* matName)
{
......@@ -246,24 +246,24 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
if (UseHlslTypes) {
switch (type) {
case '-': s += "void"; break;
case 'F': s += "float"; break;
case 'D': s += "double"; break;
case 'I': s += "int"; break;
case 'U': s += "uint"; break;
case 'B': s += "bool"; break;
case 'S': s += "sampler"; break;
case 's': s += "SamplerComparisonState"; break;
case '-': s += "void"; break;
case 'F': s += "float"; break;
case 'D': s += "double"; break;
case 'I': s += "int"; break;
case 'U': s += "uint"; break;
case 'B': s += "bool"; break;
case 'S': s += "sampler"; break;
case 's': s += "SamplerComparisonState"; break;
case 'T': s += ((isBuffer && isImage) ? "RWBuffer" :
isBuffer ? "Buffer" :
isImage ? "RWTexture" : "Texture"); break;
case 'i': s += ((isBuffer && isImage) ? "RWBuffer <int4>" :
isBuffer ? "Buffer <int4>" :
isImage ? "RWTexture <int4>" : "Texture <int4>"); break;
case 'u': s += ((isBuffer && isImage) ? "RWBuffer <uint4>" :
isBuffer ? "Buffer <uint4>" :
isImage ? "RWTexture <uint4>" : "Texture <uint4>");break;
default: s += "UNKNOWN_TYPE"; break;
isImage ? "RWTexture" : "Texture"); break;
case 'i': s += ((isBuffer && isImage) ? "RWBuffer" :
isBuffer ? "Buffer" :
isImage ? "RWTexture" : "Texture"); break;
case 'u': s += ((isBuffer && isImage) ? "RWBuffer" :
isBuffer ? "Buffer" :
isImage ? "RWTexture" : "Texture"); break;
default: s += "UNKNOWN_TYPE"; break;
}
} else {
switch (type) {
......@@ -336,36 +336,55 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
if (isArrayed)
s += "Array";
// For HLSL, append return type for texture types
if (UseHlslTypes) {
switch (type) {
case 'i': s += "<int4>"; break;
case 'u': s += "<uint4>"; break;
case 'T': s += "<float4>"; break;
default: break;
}
}
return s;
}
// TODO: the GLSL parser is currently used to parse HLSL prototypes. However, many valid HLSL prototypes
// The GLSL parser can be used to parse a subset of HLSL prototypes. However, many valid HLSL prototypes
// are not valid GLSL prototypes. This rejects the invalid ones. Thus, there is a single switch below
// to enable creation of the entire HLSL space.
inline bool IsValidGlsl(const char* cname, char retOrder, char retType, char argOrder, char argType,
int dim0, int dim1, int dim0Max, int dim1Max)
inline bool IsValid(const char* cname, char retOrder, char retType, char argOrder, char argType, int dim0, int dim1)
{
const bool isVec = dim0Max > 1 || argType == 'V';
const bool isMat = dim1Max > 1 || argType == 'M';
if (!IsTextureType(argOrder) &&
((isVec && dim0 == 1) || // avoid vec1
(isMat && dim0 == 1 && dim1 == 1))) // avoid mat1x1
return false;
const bool isVec = (argOrder == 'V');
const bool isMat = (argOrder == 'M');
const std::string name(cname); // for ease of comparison. slow, but temporary, until HLSL parser is online.
const std::string name(cname);
if (isMat && dim1 == 1) // TODO: avoid mat Nx1 until we find the right GLSL profile
// these do not have vec1 versions
if (dim0 == 1 && (name == "length" || name == "normalize" || name == "reflect" || name == "refract"))
return false;
if ((isMat && (argType == 'I' || argType == 'U' || argType == 'B')) ||
(retOrder == 'M' && (retType == 'I' || retType == 'U' || retType == 'B')))
if (!IsTextureType(argOrder) && (isVec && dim0 == 1)) // avoid vec1
return false;
if (name == "GetRenderTargetSamplePosition" ||
name == "tex1D" ||
name == "tex1Dgrad")
return false;
if (UseHlslTypes) {
// NO further restrictions for HLSL
} else {
// GLSL parser restrictions
if ((isMat && (argType == 'I' || argType == 'U' || argType == 'B')) ||
(retOrder == 'M' && (retType == 'I' || retType == 'U' || retType == 'B')))
return false;
if (isMat && dim0 == 1 && dim1 == 1) // avoid mat1x1
return false;
if (isMat && dim1 == 1) // TODO: avoid mat Nx1 until we find the right GLSL profile
return false;
if (name == "GetRenderTargetSamplePosition" ||
name == "tex1D" ||
name == "tex1Dgrad")
return false;
}
return true;
}
......@@ -534,10 +553,10 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{ "abort", nullptr, nullptr, "-", "-", EShLangAll },
{ "abs", nullptr, nullptr, "SVM", "DFUI", EShLangAll },
{ "acos", nullptr, nullptr, "SVM", "F", EShLangAll },
{ "all", "S", "B", "SVM", "BFI", EShLangAll },
{ "all", "S", "B", "SVM", "BFIU", EShLangAll },
{ "AllMemoryBarrier", nullptr, nullptr, "-", "-", EShLangCS },
{ "AllMemoryBarrierWithGroupSync", nullptr, nullptr, "-", "-", EShLangCS },
{ "any", "S", "B", "SVM", "BFI", EShLangAll },
{ "any", "S", "B", "SVM", "BFIU", EShLangAll },
{ "asdouble", "S", "D", "S,", "U,", EShLangAll },
{ "asdouble", "V2", "D", "V2,", "U,", EShLangAll },
{ "asfloat", nullptr, "F", "SVM", "BFIU", EShLangAll },
......@@ -682,7 +701,7 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{ "texCUBEgrad", "V4", "F", "V4,V3,,", "S,F,,", EShLangPS },
{ "texCUBElod", "V4", "F", "V4,", "S,F", EShLangPS },
{ "texCUBEproj", "V4", "F", "V4,", "S,F", EShLangPS },
{ "transpose", "^M", nullptr, "M", "F", EShLangAll },
{ "transpose", "^M", nullptr, "M", "FUIB", EShLangAll },
{ "trunc", nullptr, nullptr, "SVM", "F", EShLangAll },
// Texture object methods. Return type can be overridden by shader declaration.
......@@ -835,10 +854,6 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 },
};
// Set this to true to avoid generating prototypes that will be invalid for the GLSL parser.
// TODO: turn it off (and remove the code) when the HLSL parser can be used to parse builtins.
static const bool skipInvalidGlsl = true;
// Create prototypes for the intrinsics. TODO: Avoid ranged based for until all compilers can handle it.
for (int icount = 0; hlslIntrinsics[icount].name; ++icount) {
const auto& intrinsic = hlslIntrinsics[icount];
......@@ -874,8 +889,7 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
const char* retOrder = intrinsic.retOrder ? intrinsic.retOrder : argOrder;
const char* retType = intrinsic.retType ? intrinsic.retType : argType;
if (skipInvalidGlsl && !IsValidGlsl(intrinsic.name, *retOrder, *retType, *argOrder, *argType,
dim0, dim1, dim0Max, dim1Max))
if (!IsValid(intrinsic.name, *retOrder, *retType, *argOrder, *argType, dim0, dim1))
continue;
// Reject some forms of sample methods that don't exist.
......
hlsl/hlslScanContext.cpp
......@@ -180,6 +180,22 @@ void HlslScanContext::fillInKeywordMap()
(*KeywordMap)["min16uint3"] = EHTokMin16uint3;
(*KeywordMap)["min16uint4"] = EHTokMin16uint4;
(*KeywordMap)["bool1x1"] = EHTokBool1x1;
(*KeywordMap)["bool1x2"] = EHTokBool1x2;
(*KeywordMap)["bool1x3"] = EHTokBool1x3;
(*KeywordMap)["bool1x4"] = EHTokBool1x4;
(*KeywordMap)["bool2x1"] = EHTokBool2x1;
(*KeywordMap)["bool2x2"] = EHTokBool2x2;
(*KeywordMap)["bool2x3"] = EHTokBool2x3;
(*KeywordMap)["bool2x4"] = EHTokBool2x4;
(*KeywordMap)["bool3x1"] = EHTokBool3x1;
(*KeywordMap)["bool3x2"] = EHTokBool3x2;
(*KeywordMap)["bool3x3"] = EHTokBool3x3;
(*KeywordMap)["bool3x4"] = EHTokBool3x4;
(*KeywordMap)["bool4x1"] = EHTokBool4x1;
(*KeywordMap)["bool4x2"] = EHTokBool4x2;
(*KeywordMap)["bool4x3"] = EHTokBool4x3;
(*KeywordMap)["bool4x4"] = EHTokBool4x4;
(*KeywordMap)["int1x1"] = EHTokInt1x1;
(*KeywordMap)["int1x2"] = EHTokInt1x2;
(*KeywordMap)["int1x3"] = EHTokInt1x3;
......@@ -561,6 +577,22 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
case EHTokMin16uint4:
// matrix types
case EHTokBool1x1:
case EHTokBool1x2:
case EHTokBool1x3:
case EHTokBool1x4:
case EHTokBool2x1:
case EHTokBool2x2:
case EHTokBool2x3:
case EHTokBool2x4:
case EHTokBool3x1:
case EHTokBool3x2:
case EHTokBool3x3:
case EHTokBool3x4:
case EHTokBool4x1:
case EHTokBool4x2:
case EHTokBool4x3:
case EHTokBool4x4:
case EHTokInt1x1:
case EHTokInt1x2:
case EHTokInt1x3:
......@@ -577,6 +609,22 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
case EHTokInt4x2:
case EHTokInt4x3:
case EHTokInt4x4:
case EHTokUint1x1:
case EHTokUint1x2:
case EHTokUint1x3:
case EHTokUint1x4:
case EHTokUint2x1:
case EHTokUint2x2:
case EHTokUint2x3:
case EHTokUint2x4:
case EHTokUint3x1:
case EHTokUint3x2:
case EHTokUint3x3:
case EHTokUint3x4:
case EHTokUint4x1:
case EHTokUint4x2:
case EHTokUint4x3:
case EHTokUint4x4:
case EHTokFloat1x1:
case EHTokFloat1x2:
case EHTokFloat1x3:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment