fix error message for hlslGrammar::acceptConstructor
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:
@@ -13,10 +13,10 @@ using depth_any
|
||||
0:29 Construct combined texture-sampler ( temp sampler2DArray)
|
||||
0:29 'g_tTex2df4a' ( uniform texture2DArray)
|
||||
0:29 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.100000
|
||||
0:? 0.200000
|
||||
0:? 0.300000
|
||||
0:29 Constant:
|
||||
0:29 0.100000
|
||||
0:29 0.200000
|
||||
0:29 0.300000
|
||||
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)
|
||||
@@ -24,10 +24,10 @@ using depth_any
|
||||
0:30 Construct combined texture-sampler ( temp isampler2DArray)
|
||||
0:30 'g_tTex2di4a' ( uniform itexture2DArray)
|
||||
0:30 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.300000
|
||||
0:? 0.400000
|
||||
0:? 0.500000
|
||||
0:30 Constant:
|
||||
0:30 0.300000
|
||||
0:30 0.400000
|
||||
0:30 0.500000
|
||||
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)
|
||||
@@ -35,10 +35,10 @@ using depth_any
|
||||
0:31 Construct combined texture-sampler ( temp usampler2DArray)
|
||||
0:31 'g_tTex2du4a' ( uniform utexture2DArray)
|
||||
0:31 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.500000
|
||||
0:? 0.600000
|
||||
0:? 0.700000
|
||||
0:31 Constant:
|
||||
0:31 0.500000
|
||||
0:31 0.600000
|
||||
0:31 0.700000
|
||||
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)
|
||||
@@ -46,11 +46,11 @@ using depth_any
|
||||
0:35 Construct combined texture-sampler ( temp samplerCubeArray)
|
||||
0:35 'g_tTexcdf4a' ( uniform textureCubeArray)
|
||||
0:35 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.100000
|
||||
0:? 0.200000
|
||||
0:? 0.300000
|
||||
0:? 0.400000
|
||||
0:35 Constant:
|
||||
0:35 0.100000
|
||||
0:35 0.200000
|
||||
0:35 0.300000
|
||||
0:35 0.400000
|
||||
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)
|
||||
@@ -58,11 +58,11 @@ using depth_any
|
||||
0:36 Construct combined texture-sampler ( temp isamplerCubeArray)
|
||||
0:36 'g_tTexcdi4a' ( uniform itextureCubeArray)
|
||||
0:36 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.400000
|
||||
0:? 0.500000
|
||||
0:? 0.600000
|
||||
0:? 0.700000
|
||||
0:36 Constant:
|
||||
0:36 0.400000
|
||||
0:36 0.500000
|
||||
0:36 0.600000
|
||||
0:36 0.700000
|
||||
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)
|
||||
@@ -70,11 +70,11 @@ using depth_any
|
||||
0:37 Construct combined texture-sampler ( temp usamplerCubeArray)
|
||||
0:37 'g_tTexcdu4a' ( uniform utextureCubeArray)
|
||||
0:37 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.700000
|
||||
0:? 0.800000
|
||||
0:? 0.900000
|
||||
0:? 1.000000
|
||||
0:37 Constant:
|
||||
0:37 0.700000
|
||||
0:37 0.800000
|
||||
0:37 0.900000
|
||||
0:37 1.000000
|
||||
0:39 move second child to first child ( temp 4-component vector of float)
|
||||
0:39 Color: direct index for structure ( temp 4-component vector of float)
|
||||
0:39 'psout' ( temp structure{ temp 4-component vector of float Color, temp float Depth})
|
||||
@@ -146,10 +146,10 @@ using depth_any
|
||||
0:29 Construct combined texture-sampler ( temp sampler2DArray)
|
||||
0:29 'g_tTex2df4a' ( uniform texture2DArray)
|
||||
0:29 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.100000
|
||||
0:? 0.200000
|
||||
0:? 0.300000
|
||||
0:29 Constant:
|
||||
0:29 0.100000
|
||||
0:29 0.200000
|
||||
0:29 0.300000
|
||||
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)
|
||||
@@ -157,10 +157,10 @@ using depth_any
|
||||
0:30 Construct combined texture-sampler ( temp isampler2DArray)
|
||||
0:30 'g_tTex2di4a' ( uniform itexture2DArray)
|
||||
0:30 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.300000
|
||||
0:? 0.400000
|
||||
0:? 0.500000
|
||||
0:30 Constant:
|
||||
0:30 0.300000
|
||||
0:30 0.400000
|
||||
0:30 0.500000
|
||||
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)
|
||||
@@ -168,10 +168,10 @@ using depth_any
|
||||
0:31 Construct combined texture-sampler ( temp usampler2DArray)
|
||||
0:31 'g_tTex2du4a' ( uniform utexture2DArray)
|
||||
0:31 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.500000
|
||||
0:? 0.600000
|
||||
0:? 0.700000
|
||||
0:31 Constant:
|
||||
0:31 0.500000
|
||||
0:31 0.600000
|
||||
0:31 0.700000
|
||||
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)
|
||||
@@ -179,11 +179,11 @@ using depth_any
|
||||
0:35 Construct combined texture-sampler ( temp samplerCubeArray)
|
||||
0:35 'g_tTexcdf4a' ( uniform textureCubeArray)
|
||||
0:35 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.100000
|
||||
0:? 0.200000
|
||||
0:? 0.300000
|
||||
0:? 0.400000
|
||||
0:35 Constant:
|
||||
0:35 0.100000
|
||||
0:35 0.200000
|
||||
0:35 0.300000
|
||||
0:35 0.400000
|
||||
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)
|
||||
@@ -191,11 +191,11 @@ using depth_any
|
||||
0:36 Construct combined texture-sampler ( temp isamplerCubeArray)
|
||||
0:36 'g_tTexcdi4a' ( uniform itextureCubeArray)
|
||||
0:36 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.400000
|
||||
0:? 0.500000
|
||||
0:? 0.600000
|
||||
0:? 0.700000
|
||||
0:36 Constant:
|
||||
0:36 0.400000
|
||||
0:36 0.500000
|
||||
0:36 0.600000
|
||||
0:36 0.700000
|
||||
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)
|
||||
@@ -203,11 +203,11 @@ using depth_any
|
||||
0:37 Construct combined texture-sampler ( temp usamplerCubeArray)
|
||||
0:37 'g_tTexcdu4a' ( uniform utextureCubeArray)
|
||||
0:37 'g_sSamp' (layout( binding=0) uniform sampler)
|
||||
0:? Constant:
|
||||
0:? 0.700000
|
||||
0:? 0.800000
|
||||
0:? 0.900000
|
||||
0:? 1.000000
|
||||
0:37 Constant:
|
||||
0:37 0.700000
|
||||
0:37 0.800000
|
||||
0:37 0.900000
|
||||
0:37 1.000000
|
||||
0:39 move second child to first child ( temp 4-component vector of float)
|
||||
0:39 Color: direct index for structure ( temp 4-component vector of float)
|
||||
0:39 'psout' ( temp structure{ temp 4-component vector of float Color, temp float Depth})
|
||||
|
||||
Reference in New Issue
Block a user