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

fix error message for hlslGrammar::acceptConstructor

Browse Source 
Fix the error message for when an erroneous HLSL constructor statement
is detected.

Prior to this change, such error messages would not show correct file
path and line number information.

Additionally, update test data to account for updated error messages.
This commit is contained in:
tgfrerer
2021-05-11 09:42:11 +01:00
parent 9431c53c84
commit adfa0938a2
117 changed files with 6243 additions and 6243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Test/baseResults/hlsl.gather.basic.dx10.vert.out
View File

@@ -11,9 +11,9 @@ Shader version: 500
0:33 Construct combined texture-sampler ( temp sampler2D)
0:33 'g_tTex2df4' ( uniform texture2D)
0:33 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.100000
0:? 0.200000
0:33 Constant:
0:33 0.100000
0:33 0.200000
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)
@@ -21,9 +21,9 @@ Shader version: 500
0:34 Construct combined texture-sampler ( temp isampler2D)
0:34 'g_tTex2di4' ( uniform itexture2D)
0:34 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.300000
0:? 0.400000
0:34 Constant:
0:34 0.300000
0:34 0.400000
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)
@@ -31,9 +31,9 @@ Shader version: 500
0:35 Construct combined texture-sampler ( temp usampler2D)
0:35 'g_tTex2du4' ( uniform utexture2D)
0:35 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.500000
0:? 0.600000
0:35 Constant:
0:35 0.500000
0:35 0.600000
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)
@@ -41,10 +41,10 @@ Shader version: 500
0:39 Construct combined texture-sampler ( temp samplerCube)
0:39 'g_tTexcdf4' ( uniform textureCube)
0:39 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.100000
0:? 0.200000
0:? 0.300000
0:39 Constant:
0:39 0.100000
0:39 0.200000
0:39 0.300000
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)
@@ -52,10 +52,10 @@ Shader version: 500
0:40 Construct combined texture-sampler ( temp isamplerCube)
0:40 'g_tTexcdi4' ( uniform itextureCube)
0:40 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.400000
0:? 0.500000
0:? 0.600000
0:40 Constant:
0:40 0.400000
0:40 0.500000
0:40 0.600000
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)
@@ -63,20 +63,20 @@ Shader version: 500
0:41 Construct combined texture-sampler ( temp usamplerCube)
0:41 'g_tTexcdu4' ( uniform utextureCube)
0:41 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.700000
0:? 0.800000
0:? 0.900000
0:41 Constant:
0:41 0.700000
0:41 0.800000
0:41 0.900000
0:43 move second child to first child ( temp 4-component vector of float)
0:43 Pos: direct index for structure ( temp 4-component vector of float)
0:43 'vsout' ( temp structure{ temp 4-component vector of float Pos})
0:43 Constant:
0:43 0 (const int)
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:43 Constant:
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:45 Branch: Return with expression
0:45 'vsout' ( temp structure{ temp 4-component vector of float Pos})
0:28 Function Definition: main( ( temp void)
@@ -123,9 +123,9 @@ Shader version: 500
0:33 Construct combined texture-sampler ( temp sampler2D)
0:33 'g_tTex2df4' ( uniform texture2D)
0:33 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.100000
0:? 0.200000
0:33 Constant:
0:33 0.100000
0:33 0.200000
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)
@@ -133,9 +133,9 @@ Shader version: 500
0:34 Construct combined texture-sampler ( temp isampler2D)
0:34 'g_tTex2di4' ( uniform itexture2D)
0:34 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.300000
0:? 0.400000
0:34 Constant:
0:34 0.300000
0:34 0.400000
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)
@@ -143,9 +143,9 @@ Shader version: 500
0:35 Construct combined texture-sampler ( temp usampler2D)
0:35 'g_tTex2du4' ( uniform utexture2D)
0:35 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.500000
0:? 0.600000
0:35 Constant:
0:35 0.500000
0:35 0.600000
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)
@@ -153,10 +153,10 @@ Shader version: 500
0:39 Construct combined texture-sampler ( temp samplerCube)
0:39 'g_tTexcdf4' ( uniform textureCube)
0:39 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.100000
0:? 0.200000
0:? 0.300000
0:39 Constant:
0:39 0.100000
0:39 0.200000
0:39 0.300000
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)
@@ -164,10 +164,10 @@ Shader version: 500
0:40 Construct combined texture-sampler ( temp isamplerCube)
0:40 'g_tTexcdi4' ( uniform itextureCube)
0:40 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.400000
0:? 0.500000
0:? 0.600000
0:40 Constant:
0:40 0.400000
0:40 0.500000
0:40 0.600000
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)
@@ -175,20 +175,20 @@ Shader version: 500
0:41 Construct combined texture-sampler ( temp usamplerCube)
0:41 'g_tTexcdu4' ( uniform utextureCube)
0:41 'g_sSamp' (layout( binding=0) uniform sampler)
0:? Constant:
0:? 0.700000
0:? 0.800000
0:? 0.900000
0:41 Constant:
0:41 0.700000
0:41 0.800000
0:41 0.900000
0:43 move second child to first child ( temp 4-component vector of float)
0:43 Pos: direct index for structure ( temp 4-component vector of float)
0:43 'vsout' ( temp structure{ temp 4-component vector of float Pos})
0:43 Constant:
0:43 0 (const int)
0:? Constant:
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:43 Constant:
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:45 Branch: Return with expression
0:45 'vsout' ( temp structure{ temp 4-component vector of float Pos})
0:28 Function Definition: main( ( temp void)