Skip to content

Commit 28ce612

Browse files
committed
Remove redundant 'spirv-val failed' note from validation errors
The error context already makes it clear this is a validation error.
1 parent ae829a2 commit 28ce612

3 files changed

Lines changed: 0 additions & 6 deletions

File tree

crates/rustc_codegen_spirv/src/validation_err.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ impl<'a> ValidationErrorContext<'a> {
7272
/// Emits a generic validation error without rich formatting.
7373
fn emit_generic_error(&self, error: &spirv_tools::val::ValidatorError) {
7474
let mut err = self.sess.dcx().struct_err(error.to_string());
75-
err.note("spirv-val failed");
7675
err.note(format!("module `{}`", self.filename.display()));
7776
err.emit();
7877
}
@@ -128,7 +127,6 @@ impl<'a> ValidationErrorContext<'a> {
128127
}
129128
}
130129

131-
err.note("spirv-val failed");
132130
err.note(format!("module `{}`", self.filename.display()));
133131
err.emit();
134132
} else {
@@ -137,7 +135,6 @@ impl<'a> ValidationErrorContext<'a> {
137135
"{:?} variable `{}` at location {} conflicts with `{}`",
138136
storage_class, second_name_display, location, first_name_display
139137
));
140-
err.note("spirv-val failed");
141138
err.note(format!("module `{}`", self.filename.display()));
142139
err.note(format!(
143140
"variables `{}` and `{}` both use location {} component {}",
@@ -189,7 +186,6 @@ impl<'a> ValidationErrorContext<'a> {
189186
err.note(format!("generated SPIR-V:\n{}", context));
190187
}
191188

192-
err.note("spirv-val failed");
193189
err.note(format!("module `{}`", self.filename.display()));
194190
err.emit();
195191
}

tests/compiletests/ui/lang/core/ref/member_ref_arg-broken.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ error: OpLoad cannot use pointer `%38` because it was produced by OpCompositeExt
4141
= note: generated SPIR-V:
4242
%38 = OpCompositeExtract ...
4343
-> %39 = OpLoad %38 ...
44-
= note: spirv-val failed
4544
= note: module `$TEST_BUILD_DIR/lang/core/ref/member_ref_arg-broken`
4645

4746
error: aborting due to 1 previous error; 4 warnings emitted

tests/compiletests/ui/spirv-attr/location_assignment/explicit_overlap.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ note: variable `out1` already uses location 1 component 0
5353
LL | pub fn main(#[spirv(location = 0)] out1: &mut Mat4, #[spirv(location = 1)] out2: &mut Vec2) {
5454
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5555
= help: `out1` is at location 0 but type `spirv_std::glam::Mat4` consumes 4 locations (0–3)
56-
= note: spirv-val failed
5756
= note: module `<normalized>`
5857

5958
error: aborting due to 1 previous error

0 commit comments

Comments
 (0)