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

176
Test/baseResults/hlsl.intrinsics.negative.frag.out
View File

@@ -224,9 +224,9 @@ ERROR: node is still EOpNull!
0:57 Constant:
0:57 0.000000
0:59 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:59 Constant:
0:59 1.000000
0:59 2.000000
0:63 Function Definition: PixelShaderFunction3(vf3;vf3;vf3;vi3; ( temp 3-component vector of float)
0:63 Function Parameters:
0:63 'inF0' ( in 3-component vector of float)
@@ -283,10 +283,10 @@ ERROR: node is still EOpNull!
0:73 Constant:
0:73 0.000000
0:76 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:76 Constant:
0:76 1.000000
0:76 2.000000
0:76 3.000000
0:80 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vi4; ( temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' ( in 4-component vector of float)
@@ -355,11 +355,11 @@ ERROR: node is still EOpNull!
0:90 Constant:
0:90 0.000000
0:92 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:92 Constant:
0:92 1.000000
0:92 2.000000
0:92 3.000000
0:92 4.000000
0:80 Function Definition: PixelShaderFunction( ( temp void)
0:80 Function Parameters:
0:? Sequence
@@ -415,11 +415,11 @@ ERROR: node is still EOpNull!
0:117 Constant:
0:117 0.000000
0:119 Branch: Return with expression
0:? Constant:
0:? 2.000000
0:? 2.000000
0:? 2.000000
0:? 2.000000
0:119 Constant:
0:119 2.000000
0:119 2.000000
0:119 2.000000
0:119 2.000000
0:123 Function Definition: PixelShaderFunction3x3(mf33;mf33;mf33; ( temp 3X3 matrix of float)
0:123 Function Parameters:
0:123 'inF0' ( in 3X3 matrix of float)
@@ -453,16 +453,16 @@ ERROR: node is still EOpNull!
0:125 Constant:
0:125 0.000000
0:127 Branch: Return with expression
0:? Constant:
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:127 Constant:
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:131 Function Definition: PixelShaderFunction4x4(mf44;mf44;mf44; ( temp 4X4 matrix of float)
0:131 Function Parameters:
0:131 'inF0' ( in 4X4 matrix of float)
@@ -496,23 +496,23 @@ ERROR: node is still EOpNull!
0:133 Constant:
0:133 0.000000
0:135 Branch: Return with expression
0:? Constant:
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:135 Constant:
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:? Linker Objects
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:? 'inF0' (layout( location=0) in 4-component vector of float)
@@ -687,9 +687,9 @@ ERROR: node is still EOpNull!
0:57 Constant:
0:57 0.000000
0:59 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:59 Constant:
0:59 1.000000
0:59 2.000000
0:63 Function Definition: PixelShaderFunction3(vf3;vf3;vf3;vi3; ( temp 3-component vector of float)
0:63 Function Parameters:
0:63 'inF0' ( in 3-component vector of float)
@@ -746,10 +746,10 @@ ERROR: node is still EOpNull!
0:73 Constant:
0:73 0.000000
0:76 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:76 Constant:
0:76 1.000000
0:76 2.000000
0:76 3.000000
0:80 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vi4; ( temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' ( in 4-component vector of float)
@@ -818,11 +818,11 @@ ERROR: node is still EOpNull!
0:90 Constant:
0:90 0.000000
0:92 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:92 Constant:
0:92 1.000000
0:92 2.000000
0:92 3.000000
0:92 4.000000
0:80 Function Definition: PixelShaderFunction( ( temp void)
0:80 Function Parameters:
0:? Sequence
@@ -878,11 +878,11 @@ ERROR: node is still EOpNull!
0:117 Constant:
0:117 0.000000
0:119 Branch: Return with expression
0:? Constant:
0:? 2.000000
0:? 2.000000
0:? 2.000000
0:? 2.000000
0:119 Constant:
0:119 2.000000
0:119 2.000000
0:119 2.000000
0:119 2.000000
0:123 Function Definition: PixelShaderFunction3x3(mf33;mf33;mf33; ( temp 3X3 matrix of float)
0:123 Function Parameters:
0:123 'inF0' ( in 3X3 matrix of float)
@@ -916,16 +916,16 @@ ERROR: node is still EOpNull!
0:125 Constant:
0:125 0.000000
0:127 Branch: Return with expression
0:? Constant:
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:? 3.000000
0:127 Constant:
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:127 3.000000
0:131 Function Definition: PixelShaderFunction4x4(mf44;mf44;mf44; ( temp 4X4 matrix of float)
0:131 Function Parameters:
0:131 'inF0' ( in 4X4 matrix of float)
@@ -959,23 +959,23 @@ ERROR: node is still EOpNull!
0:133 Constant:
0:133 0.000000
0:135 Branch: Return with expression
0:? Constant:
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:? 4.000000
0:135 Constant:
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:135 4.000000
0:? Linker Objects
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:? 'inF0' (layout( location=0) in 4-component vector of float)