mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Allow use of $Global members in between function calls.

Browse Source 
This allows global initializers to use $Global members.
This commit is contained in:
John Kessenich
2017-03-22 23:21:34 -06:00
parent 7a41f96d10
commit 000c818efb
53 changed files with 4566 additions and 4558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
View File

@@ -12,8 +12,8 @@ gl_FragCoord origin is upper left
0:45 Construct combined texture-sampler ( temp sampler2DShadow)
0:45 'g_tTex2df4' ( uniform texture2D)
0:45 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:45 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:45 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:45 c2: direct index for structure ( uniform 2-component vector of float)
0:45 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:45 Constant:
0:45 1 (const uint)
0:45 Constant:
@@ -28,8 +28,8 @@ gl_FragCoord origin is upper left
0:46 Construct combined texture-sampler ( temp isampler2DShadow)
0:46 'g_tTex2di4' ( uniform itexture2D)
0:46 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:46 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:46 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:46 c2: direct index for structure ( uniform 2-component vector of float)
0:46 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:46 Constant:
0:46 1 (const uint)
0:46 Constant:
@@ -44,8 +44,8 @@ gl_FragCoord origin is upper left
0:47 Construct combined texture-sampler ( temp usampler2DShadow)
0:47 'g_tTex2du4' ( uniform utexture2D)
0:47 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:47 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:47 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:47 c2: direct index for structure ( uniform 2-component vector of float)
0:47 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:47 Constant:
0:47 1 (const uint)
0:47 Constant:
@@ -60,8 +60,8 @@ gl_FragCoord origin is upper left
0:49 Construct combined texture-sampler ( temp sampler2DShadow)
0:49 'g_tTex2df4' ( uniform texture2D)
0:49 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:49 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:49 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:49 c2: direct index for structure ( uniform 2-component vector of float)
0:49 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:49 Constant:
0:49 1 (const uint)
0:49 Constant:
@@ -82,8 +82,8 @@ gl_FragCoord origin is upper left
0:50 Construct combined texture-sampler ( temp isampler2DShadow)
0:50 'g_tTex2di4' ( uniform itexture2D)
0:50 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:50 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:50 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:50 c2: direct index for structure ( uniform 2-component vector of float)
0:50 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:50 Constant:
0:50 1 (const uint)
0:50 Constant:
@@ -104,8 +104,8 @@ gl_FragCoord origin is upper left
0:51 Construct combined texture-sampler ( temp usampler2DShadow)
0:51 'g_tTex2du4' ( uniform utexture2D)
0:51 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:51 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:51 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:51 c2: direct index for structure ( uniform 2-component vector of float)
0:51 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:51 Constant:
0:51 1 (const uint)
0:51 Constant:
@@ -172,9 +172,9 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' ( uniform textureCube)
0:? 'g_tTexcdi4' ( uniform itextureCube)
0:? 'g_tTexcdu4' ( uniform utextureCube)
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:? 'Color' (layout( location=0) out 4-component vector of float)
0:? 'Depth' ( out float FragDepth)
0:? 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
Linked fragment stage:
@@ -193,8 +193,8 @@ gl_FragCoord origin is upper left
0:45 Construct combined texture-sampler ( temp sampler2DShadow)
0:45 'g_tTex2df4' ( uniform texture2D)
0:45 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:45 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:45 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:45 c2: direct index for structure ( uniform 2-component vector of float)
0:45 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:45 Constant:
0:45 1 (const uint)
0:45 Constant:
@@ -209,8 +209,8 @@ gl_FragCoord origin is upper left
0:46 Construct combined texture-sampler ( temp isampler2DShadow)
0:46 'g_tTex2di4' ( uniform itexture2D)
0:46 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:46 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:46 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:46 c2: direct index for structure ( uniform 2-component vector of float)
0:46 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:46 Constant:
0:46 1 (const uint)
0:46 Constant:
@@ -225,8 +225,8 @@ gl_FragCoord origin is upper left
0:47 Construct combined texture-sampler ( temp usampler2DShadow)
0:47 'g_tTex2du4' ( uniform utexture2D)
0:47 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:47 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:47 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:47 c2: direct index for structure ( uniform 2-component vector of float)
0:47 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:47 Constant:
0:47 1 (const uint)
0:47 Constant:
@@ -241,8 +241,8 @@ gl_FragCoord origin is upper left
0:49 Construct combined texture-sampler ( temp sampler2DShadow)
0:49 'g_tTex2df4' ( uniform texture2D)
0:49 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:49 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:49 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:49 c2: direct index for structure ( uniform 2-component vector of float)
0:49 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:49 Constant:
0:49 1 (const uint)
0:49 Constant:
@@ -263,8 +263,8 @@ gl_FragCoord origin is upper left
0:50 Construct combined texture-sampler ( temp isampler2DShadow)
0:50 'g_tTex2di4' ( uniform itexture2D)
0:50 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:50 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:50 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:50 c2: direct index for structure ( uniform 2-component vector of float)
0:50 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:50 Constant:
0:50 1 (const uint)
0:50 Constant:
@@ -285,8 +285,8 @@ gl_FragCoord origin is upper left
0:51 Construct combined texture-sampler ( temp usampler2DShadow)
0:51 'g_tTex2du4' ( uniform utexture2D)
0:51 'g_sSampCmp' (layout( binding=0) uniform sampler)
0:51 c2: direct index for structure (layout( offset=8) uniform 2-component vector of float)
0:51 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
0:51 c2: direct index for structure ( uniform 2-component vector of float)
0:51 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:51 Constant:
0:51 1 (const uint)
0:51 Constant:
@@ -353,9 +353,9 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' ( uniform textureCube)
0:? 'g_tTexcdi4' ( uniform itextureCube)
0:? 'g_tTexcdu4' ( uniform utextureCube)
0:? 'anon@0' (layout( row_major std140) uniform block{ uniform float c1, uniform 2-component vector of float c2, uniform 3-component vector of float c3, uniform 4-component vector of float c4})
0:? 'Color' (layout( location=0) out 4-component vector of float)
0:? 'Depth' ( out float FragDepth)
0:? 'anon@0' (layout( row_major std140) uniform block{layout( offset=0) uniform float c1, layout( offset=8) uniform 2-component vector of float c2, layout( offset=16) uniform 3-component vector of float c3, layout( offset=32) uniform 4-component vector of float c4})
// Module Version 10000
// Generated by (magic number): 80001