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

396
Test/baseResults/hlsl.constructimat.frag.out
View File

@@ -28,23 +28,23 @@ gl_FragCoord origin is upper left
0:7 Sequence
0:7 move second child to first child ( temp 4X4 matrix of int)
0:7 'var444' ( temp 4X4 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:7 Constant:
0:7 0 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 1 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:11 Sequence
0:11 move second child to first child ( temp 4X2 matrix of int)
0:11 'var423' ( temp 4X2 matrix of int)
@@ -60,15 +60,15 @@ gl_FragCoord origin is upper left
0:12 Sequence
0:12 move second child to first child ( temp 4X2 matrix of int)
0:12 'var424' ( temp 4X2 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:12 Constant:
0:12 0 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 0 (const int)
0:12 0 (const int)
0:12 0 (const int)
0:16 Sequence
0:16 move second child to first child ( temp 3X2 matrix of int)
0:16 'var323' ( temp 3X2 matrix of int)
@@ -82,13 +82,13 @@ gl_FragCoord origin is upper left
0:17 Sequence
0:17 move second child to first child ( temp 3X2 matrix of int)
0:17 'var234' ( temp 3X2 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:17 Constant:
0:17 0 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 0 (const int)
0:22 Sequence
0:22 move second child to first child ( temp 4X4 matrix of uint)
0:22 'uvar443' ( temp 4X4 matrix of uint)
@@ -112,23 +112,23 @@ gl_FragCoord origin is upper left
0:23 Sequence
0:23 move second child to first child ( temp 4X4 matrix of uint)
0:23 'uvar444' ( temp 4X4 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:23 Constant:
0:23 0 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 1 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:27 Sequence
0:27 move second child to first child ( temp 4X2 matrix of uint)
0:27 'uvar423' ( temp 4X2 matrix of uint)
@@ -144,15 +144,15 @@ gl_FragCoord origin is upper left
0:28 Sequence
0:28 move second child to first child ( temp 4X2 matrix of uint)
0:28 'uvar424' ( temp 4X2 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:28 Constant:
0:28 0 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 0 (const uint)
0:28 0 (const uint)
0:28 0 (const uint)
0:32 Sequence
0:32 move second child to first child ( temp 3X2 matrix of uint)
0:32 'uvar323' ( temp 3X2 matrix of uint)
@@ -166,13 +166,13 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child ( temp 3X2 matrix of uint)
0:33 'uvar234' ( temp 3X2 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:33 Constant:
0:33 0 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 0 (const uint)
0:38 Sequence
0:38 move second child to first child ( temp 4X4 matrix of bool)
0:38 'bvar443' ( temp 4X4 matrix of bool)
@@ -196,23 +196,23 @@ gl_FragCoord origin is upper left
0:39 Sequence
0:39 move second child to first child ( temp 4X4 matrix of bool)
0:39 'bvar444' ( temp 4X4 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:39 Constant:
0:39 false (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 true (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:43 Sequence
0:43 move second child to first child ( temp 4X2 matrix of bool)
0:43 'bvar423' ( temp 4X2 matrix of bool)
@@ -228,15 +228,15 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child ( temp 4X2 matrix of bool)
0:44 'bvar424' ( temp 4X2 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:44 Constant:
0:44 false (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 false (const bool)
0:44 false (const bool)
0:44 false (const bool)
0:48 Sequence
0:48 move second child to first child ( temp 3X2 matrix of bool)
0:48 'bvar323' ( temp 3X2 matrix of bool)
@@ -250,13 +250,13 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child ( temp 3X2 matrix of bool)
0:49 'bvar234' ( temp 3X2 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:49 Constant:
0:49 false (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 false (const bool)
0:51 Branch: Return with expression
0:51 Constant:
0:51 0 (const int)
@@ -302,23 +302,23 @@ gl_FragCoord origin is upper left
0:7 Sequence
0:7 move second child to first child ( temp 4X4 matrix of int)
0:7 'var444' ( temp 4X4 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:7 Constant:
0:7 0 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 1 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 1 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:7 0 (const int)
0:11 Sequence
0:11 move second child to first child ( temp 4X2 matrix of int)
0:11 'var423' ( temp 4X2 matrix of int)
@@ -334,15 +334,15 @@ gl_FragCoord origin is upper left
0:12 Sequence
0:12 move second child to first child ( temp 4X2 matrix of int)
0:12 'var424' ( temp 4X2 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:? 0 (const int)
0:12 Constant:
0:12 0 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 1 (const int)
0:12 0 (const int)
0:12 0 (const int)
0:12 0 (const int)
0:16 Sequence
0:16 move second child to first child ( temp 3X2 matrix of int)
0:16 'var323' ( temp 3X2 matrix of int)
@@ -356,13 +356,13 @@ gl_FragCoord origin is upper left
0:17 Sequence
0:17 move second child to first child ( temp 3X2 matrix of int)
0:17 'var234' ( temp 3X2 matrix of int)
0:? Constant:
0:? 0 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 1 (const int)
0:? 0 (const int)
0:17 Constant:
0:17 0 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 1 (const int)
0:17 0 (const int)
0:22 Sequence
0:22 move second child to first child ( temp 4X4 matrix of uint)
0:22 'uvar443' ( temp 4X4 matrix of uint)
@@ -386,23 +386,23 @@ gl_FragCoord origin is upper left
0:23 Sequence
0:23 move second child to first child ( temp 4X4 matrix of uint)
0:23 'uvar444' ( temp 4X4 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:23 Constant:
0:23 0 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 1 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 1 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:23 0 (const uint)
0:27 Sequence
0:27 move second child to first child ( temp 4X2 matrix of uint)
0:27 'uvar423' ( temp 4X2 matrix of uint)
@@ -418,15 +418,15 @@ gl_FragCoord origin is upper left
0:28 Sequence
0:28 move second child to first child ( temp 4X2 matrix of uint)
0:28 'uvar424' ( temp 4X2 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:? 0 (const uint)
0:28 Constant:
0:28 0 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 1 (const uint)
0:28 0 (const uint)
0:28 0 (const uint)
0:28 0 (const uint)
0:32 Sequence
0:32 move second child to first child ( temp 3X2 matrix of uint)
0:32 'uvar323' ( temp 3X2 matrix of uint)
@@ -440,13 +440,13 @@ gl_FragCoord origin is upper left
0:33 Sequence
0:33 move second child to first child ( temp 3X2 matrix of uint)
0:33 'uvar234' ( temp 3X2 matrix of uint)
0:? Constant:
0:? 0 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 0 (const uint)
0:33 Constant:
0:33 0 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 1 (const uint)
0:33 0 (const uint)
0:38 Sequence
0:38 move second child to first child ( temp 4X4 matrix of bool)
0:38 'bvar443' ( temp 4X4 matrix of bool)
@@ -470,23 +470,23 @@ gl_FragCoord origin is upper left
0:39 Sequence
0:39 move second child to first child ( temp 4X4 matrix of bool)
0:39 'bvar444' ( temp 4X4 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:39 Constant:
0:39 false (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 true (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 true (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:39 false (const bool)
0:43 Sequence
0:43 move second child to first child ( temp 4X2 matrix of bool)
0:43 'bvar423' ( temp 4X2 matrix of bool)
@@ -502,15 +502,15 @@ gl_FragCoord origin is upper left
0:44 Sequence
0:44 move second child to first child ( temp 4X2 matrix of bool)
0:44 'bvar424' ( temp 4X2 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:? false (const bool)
0:? false (const bool)
0:44 Constant:
0:44 false (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 true (const bool)
0:44 false (const bool)
0:44 false (const bool)
0:44 false (const bool)
0:48 Sequence
0:48 move second child to first child ( temp 3X2 matrix of bool)
0:48 'bvar323' ( temp 3X2 matrix of bool)
@@ -524,13 +524,13 @@ gl_FragCoord origin is upper left
0:49 Sequence
0:49 move second child to first child ( temp 3X2 matrix of bool)
0:49 'bvar234' ( temp 3X2 matrix of bool)
0:? Constant:
0:? false (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? true (const bool)
0:? false (const bool)
0:49 Constant:
0:49 false (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 true (const bool)
0:49 false (const bool)
0:51 Branch: Return with expression
0:51 Constant:
0:51 0 (const int)