Include shader source into debug info

kvark · Sep 5, 2024 · b0ece3c · b0ece3c
1 parent bf40d4f
commit b0ece3c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/blade-graphics/src/lib.rs b/blade-graphics/src/lib.rs
@@ -556,6 +556,7 @@ pub struct AccelerationStructureSizes {
 pub struct Shader {
     module: naga::Module,
     info: naga::valid::ModuleInfo,
+    source: String,
 }
 
 #[derive(Clone, Copy)]

diff --git a/blade-graphics/src/shader.rs b/blade-graphics/src/shader.rs
@@ -35,7 +35,11 @@ impl super::Context {
                 "validation failed"
             })?;
 
-        Ok(super::Shader { module, info })
+        Ok(super::Shader {
+            module,
+            info,
+            source: desc.source.to_owned(),
+        })
     }
 
     pub fn create_shader(&self, desc: super::ShaderDesc) -> super::Shader {

diff --git a/blade-graphics/src/vulkan/init.rs b/blade-graphics/src/vulkan/init.rs
@@ -695,7 +695,7 @@ impl super::Context {
         });
 
         let mut naga_flags = spv::WriterFlags::FORCE_POINT_SIZE;
-        if desc.validation {
+        if desc.validation || desc.capture {
             naga_flags |= spv::WriterFlags::DEBUG;
         }
 

diff --git a/blade-graphics/src/vulkan/pipeline.rs b/blade-graphics/src/vulkan/pipeline.rs
@@ -1,6 +1,6 @@
 use ash::vk;
 use naga::back::spv;
-use std::{ffi, mem, str};
+use std::{ffi, mem, path::Path, str};
 
 const DUMP_PREFIX: Option<&str> = None;
 
@@ -55,7 +55,7 @@ impl super::Context {
     fn load_shader(
         &self,
         sf: crate::ShaderFunction,
-        naga_options: &spv::Options,
+        naga_options_base: &spv::Options,
         group_layouts: &[&crate::ShaderDataLayout],
         group_infos: &mut [crate::ShaderDataInfo],
         vertex_fetch_states: &[crate::VertexFetchState],
@@ -79,6 +79,17 @@ impl super::Context {
             shader_stage: ep.stage,
             entry_point: sf.entry_point.to_string(),
         };
+        let mut naga_options_debug;
+        let naga_options = if self.naga_flags.contains(spv::WriterFlags::DEBUG) {
+            naga_options_debug = naga_options_base.clone();
+            naga_options_debug.debug_info = Some(naga::back::spv::DebugInfo {
+                source_code: &sf.shader.source,
+                file_name: Path::new(""),
+            });
+            &naga_options_debug
+        } else {
+            naga_options_base
+        };
 
         let spv = spv::write_vec(
             &module,