From 29a45259cdbd73241c5d4178f8359ac4c98f65fb Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Mon, 4 Nov 2024 08:27:28 +0100 Subject: [PATCH] shark-shaders: Add message when shader compilation fails --- title/shark-shaders/build.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/title/shark-shaders/build.rs b/title/shark-shaders/build.rs index 623cd4d..85d5639 100644 --- a/title/shark-shaders/build.rs +++ b/title/shark-shaders/build.rs @@ -43,16 +43,16 @@ fn main() { _ => "0", }; - let commands = SHADERS + let mut commands = SHADERS .iter() .map(|Shader { stage, name }| { Command::new("glslangValidator") .args(["--target-env", "vulkan1.3"]) .arg("--quiet") - .arg(&format!("-g{debug}")) + .arg(format!("-g{debug}")) .args(["--depfile", &format!("{out_dir}/{name}.{stage}.d")]) .args(["-o", &format!("{out_dir}/{name}.{stage}.spv")]) - .arg(&format!("{SHADER_ROOT}/{name}.{stage}.glsl")) + .arg(format!("{SHADER_ROOT}/{name}.{stage}")) .spawn() .unwrap() }) @@ -77,9 +77,13 @@ fn main() { .unwrap(); } - for mut command in commands { + for (mut command, shader) in commands.drain(..).zip(SHADERS.iter()) { let status = command.wait().unwrap(); - assert!(status.success()); + assert!( + status.success(), + "shader '{}' failed to compile", + shader.name + ); } for &Shader { stage, name } in SHADERS { -- 2.49.0