Skip to content

Commit b24de23

Browse files
WIP: diag(naga): use entire call span for ExpressionErrors from Calls
TODO: Any undesirable effects here?
1 parent 894d036 commit b24de23

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

naga/src/front/wgsl/lower/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,6 @@ impl<'source, 'temp> Lowerer<'source, 'temp> {
24142414
Ok(result)
24152415
}
24162416
None => {
2417-
let span = function_span;
24182417
let expr = if let Some(fun) = conv::map_relational_fun(function.name) {
24192418
let mut args = ctx.prepare_args(arguments, 1, span);
24202419
let argument = self.expression(args.next()?, ctx)?;

naga/tests/validation.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ error: Entry point main at Compute is invalid
273273
┌─ wgsl:3:13
274274
275275
3 │ let a = cross(vec2(0., 1.), vec2(0., 1.));
276-
│ ^^^^^ naga::ir::Expression [6]
276+
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ naga::ir::Expression [6]
277277
278278
= Expression [6] is invalid
279279
= Argument [0] to Cross as expression [2] has an invalid type.
@@ -287,7 +287,7 @@ error: Entry point main at Compute is invalid
287287
┌─ wgsl:3:13
288288
289289
3 │ let a = cross(vec4(0., 1., 2., 3.), vec4(0., 1., 2., 3.));
290-
│ ^^^^^ naga::ir::Expression [10]
290+
│ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ naga::ir::Expression [10]
291291
292292
= Expression [10] is invalid
293293
= Argument [0] to Cross as expression [4] has an invalid type.
@@ -647,7 +647,7 @@ error: Entry point main at Compute is invalid
647647
┌─ wgsl:4:9
648648
649649
4 │ _ = select(1, 2, 9001);
650-
│ ^^^^^^ naga::ir::Expression [3]
650+
│ ^^^^^^^^^^^^^^^^^^ naga::ir::Expression [3]
651651
652652
= Expression [3] is invalid
653653
= Expected selection condition to be a boolean value, got Scalar(Scalar { kind: Sint, width: 4 })
@@ -667,7 +667,7 @@ error: Entry point main at Compute is invalid
667667
┌─ wgsl:4:9
668668
669669
4 │ _ = select(true, 1, false);
670-
│ ^^^^^^ naga::ir::Expression [3]
670+
│ ^^^^^^^^^^^^^^^^^^^^^^ naga::ir::Expression [3]
671671
672672
= Expression [3] is invalid
673673
= Expected selection argument types to match, but reject value of type Scalar(Scalar { kind: Bool, width: 1 }) does not match accept value of value Scalar(Scalar { kind: Sint, width: 4 })

0 commit comments

Comments
 (0)