snapshots: Consolidate path handling.

cli/src/bin/naga.rs

@@ -374,13 +374,7 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
                 .set(naga::back::spv::WriterFlags::DEBUG, true);
             params.spv_out.debug_info = Some(naga::back::spv::DebugInfo {
                 source_code: input_text,
-                file_name: input_path
-                    .file_name()
-                    .and_then(std::ffi::OsStr::to_str)
-                    .ok_or(CliError(
-                        "input path for couldn't be converted to string \
-                         for `--generate-debug-symbols",
-                    ))?,
+                file_name: input_path,
             })
         } else {
             eprintln!(

src/back/spv/mod.rs

@@ -85,7 +85,7 @@ impl IdGenerator {
 #[derive(Debug, Clone)]
 pub struct DebugInfo<'a> {
     pub source_code: &'a str,
-    pub file_name: &'a str,
+    pub file_name: &'a std::path::Path,
 }
 
 /// A SPIR-V block to which we are still adding instructions.

src/back/spv/writer.rs

@@ -1840,8 +1840,10 @@ impl Writer {
         if self.flags.contains(WriterFlags::DEBUG) {
             if let Some(debug_info) = debug_info.as_ref() {
                 let source_file_id = self.id_gen.next();
-                self.debugs
-                    .push(Instruction::string(debug_info.file_name, source_file_id));
+                self.debugs.push(Instruction::string(
+                    &debug_info.file_name.display().to_string(),
+                    source_file_id,
+                ));
 
                 debug_info_inner = Some(DebugInfoInner {
                     source_code: debug_info.source_code,

tests/out/spv/debug-symbol-simple.spvasm

@@ -8,7 +8,7 @@ OpMemoryModel Logical GLSL450
 OpEntryPoint Vertex %24 "vs_main" %15 %18 %20 %22
 OpEntryPoint Fragment %57 "fs_main" %51 %54 %56
 OpExecutionMode %57 OriginUpperLeft
-%3 = OpString "debug-symbol-simple"
+%3 = OpString "debug-symbol-simple.wgsl"
 OpSource Unknown 0 %3 "struct VertexInput {
     @location(0) position: vec3<f32>,
     @location(1) color: vec3<f32>,

tests/out/spv/debug-symbol-terrain.spvasm

@@ -14,7 +14,7 @@ OpEntryPoint Fragment %587 "fs_main" %580 %582 %584 %586
 OpExecutionMode %348 LocalSize 64 1 1
 OpExecutionMode %470 OriginUpperLeft
 OpExecutionMode %587 OriginUpperLeft
-%3 = OpString "debug-symbol-terrain"
+%3 = OpString "debug-symbol-terrain.wgsl"
 OpSource Unknown 0 %3 "// Taken from https://github.com/sotrh/learn-wgpu/blob/11820796f5e1dbce42fb1119f04ddeb4b167d2a0/code/intermediate/tutorial13-terrain/src/terrain.wgsl
 // ============================
 // Terrain Generation