support ray tracing pipeline stages

Author: ScanMountGoat

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 ### Added
+* Added support for ray tracing pipelines.
 * Added derive for Clone for generated bind group structs.
 * Added `inner` method for generated bind group structs for accessing the inner `wgpu::BindGroup`.
 

wgsl_to_wgpu/src/data/entries_all_stages.wgsl

@@ -1,4 +1,5 @@
 enable wgpu_mesh_shader;
+enable wgpu_ray_tracing_pipeline;
 
 @group(0) @binding(0) var<uniform> a: f32;
 @group(0) @binding(1) var<uniform> b: f32;
@@ -12,6 +13,10 @@ enable wgpu_mesh_shader;
 @group(0) @binding(9) var<uniform> j: u32;
 @group(0) @binding(10) var<uniform> k: u32;
 @group(0) @binding(11) var<uniform> l: f64;
+@group(0) @binding(12) var<uniform> m: u32;
+@group(0) @binding(13) var<uniform> n: u32;
+@group(0) @binding(14) var<uniform> o: u32;
+@group(0) @binding(15) var<uniform> p: u32;
 
 fn inner() -> f32 {
     return d;
@@ -83,3 +88,33 @@ var<workgroup> mesh_output: MeshOutput;
 fn ms_main(@builtin(local_invocation_index) index: u32, @builtin(global_invocation_id) id: vec3<u32>) {
     mesh_output.vertex_count = index + i + k;
 }
+
+struct HitCounters {
+    hit_num: u32,
+    selected_hit: u32,
+}
+
+var<incoming_ray_payload> incoming_hit_num: HitCounters;
+
+@ray_generation
+fn rg_main() {
+    let x = i * m;
+}
+
+@any_hit
+@incoming_payload(incoming_hit_num)
+fn ah_main() {
+    let x = i * n;
+}
+
+@closest_hit
+@incoming_payload(incoming_hit_num)
+fn ch_main() {
+    let x = i * o;
+}
+
+@miss
+@incoming_payload(incoming_hit_num)
+fn miss_main() {
+    let x = i * p;
+}

wgsl_to_wgpu/src/snapshots/create_shader_multiple_entries.snap.rs

@@ -15,6 +15,10 @@ pub mod bind_groups {
         pub j: wgpu::BufferBinding<'a>,
         pub k: wgpu::BufferBinding<'a>,
         pub l: wgpu::BufferBinding<'a>,
+        pub m: wgpu::BufferBinding<'a>,
+        pub n: wgpu::BufferBinding<'a>,
+        pub o: wgpu::BufferBinding<'a>,
+        pub p: wgpu::BufferBinding<'a>,
     }
     const LAYOUT_DESCRIPTOR0: wgpu::BindGroupLayoutDescriptor = wgpu::BindGroupLayoutDescriptor {
         label: Some("LayoutDescriptor0"),
@@ -106,11 +110,7 @@ pub mod bind_groups {
             },
             wgpu::BindGroupLayoutEntry {
                 binding: 8,
-                visibility: wgpu::ShaderStages::VERTEX
-                    .union(wgpu::ShaderStages::FRAGMENT)
-                    .union(wgpu::ShaderStages::COMPUTE)
-                    .union(wgpu::ShaderStages::TASK)
-                    .union(wgpu::ShaderStages::MESH),
+                visibility: wgpu::ShaderStages::all(),
                 ty: wgpu::BindingType::Buffer {
                     ty: wgpu::BufferBindingType::Uniform,
                     has_dynamic_offset: false,
@@ -148,6 +148,46 @@ pub mod bind_groups {
                 },
                 count: None,
             },
+            wgpu::BindGroupLayoutEntry {
+                binding: 12,
+                visibility: wgpu::ShaderStages::NONE,
+                ty: wgpu::BindingType::Buffer {
+                    ty: wgpu::BufferBindingType::Uniform,
+                    has_dynamic_offset: false,
+                    min_binding_size: None,
+                },
+                count: None,
+            },
+            wgpu::BindGroupLayoutEntry {
+                binding: 13,
+                visibility: wgpu::ShaderStages::NONE,
+                ty: wgpu::BindingType::Buffer {
+                    ty: wgpu::BufferBindingType::Uniform,
+                    has_dynamic_offset: false,
+                    min_binding_size: None,
+                },
+                count: None,
+            },
+            wgpu::BindGroupLayoutEntry {
+                binding: 14,
+                visibility: wgpu::ShaderStages::NONE,
+                ty: wgpu::BindingType::Buffer {
+                    ty: wgpu::BufferBindingType::Uniform,
+                    has_dynamic_offset: false,
+                    min_binding_size: None,
+                },
+                count: None,
+            },
+            wgpu::BindGroupLayoutEntry {
+                binding: 15,
+                visibility: wgpu::ShaderStages::NONE,
+                ty: wgpu::BindingType::Buffer {
+                    ty: wgpu::BufferBindingType::Uniform,
+                    has_dynamic_offset: false,
+                    min_binding_size: None,
+                },
+                count: None,
+            },
         ],
     };
     impl BindGroup0 {
@@ -209,6 +249,22 @@ pub mod bind_groups {
                                 binding: 11,
                                 resource: wgpu::BindingResource::Buffer(bindings.l),
                             },
+                            wgpu::BindGroupEntry {
+                                binding: 12,
+                                resource: wgpu::BindingResource::Buffer(bindings.m),
+                            },
+                            wgpu::BindGroupEntry {
+                                binding: 13,
+                                resource: wgpu::BindingResource::Buffer(bindings.n),
+                            },
+                            wgpu::BindGroupEntry {
+                                binding: 14,
+                                resource: wgpu::BindingResource::Buffer(bindings.o),
+                            },
+                            wgpu::BindGroupEntry {
+                                binding: 15,
+                                resource: wgpu::BindingResource::Buffer(bindings.p),
+                            },
                         ],
                         label: Some("BindGroup0"),
                     },
@@ -300,14 +356,24 @@ pub fn create_pipeline_layout(device: &wgpu::Device) -> wgpu::PipelineLayout {
             },
         )
 }
+pub const ENTRY_AH_MAIN: &str = "ah_main";
+pub const ENTRY_CH_MAIN: &str = "ch_main";
 pub const ENTRY_FS_MAIN: &str = "fs_main";
 pub const ENTRY_MAIN: &str = "main";
 pub const ENTRY_MAIN2: &str = "main2";
+pub const ENTRY_MISS_MAIN: &str = "miss_main";
 pub const ENTRY_MS_MAIN: &str = "ms_main";
+pub const ENTRY_RG_MAIN: &str = "rg_main";
 pub const ENTRY_TS_MAIN: &str = "ts_main";
 pub const ENTRY_VS_MAIN: &str = "vs_main";
 #[repr(C)]
 #[derive(Debug, Copy, Clone, PartialEq)]
+pub struct HitCounters {
+    pub hit_num: u32,
+    pub selected_hit: u32,
+}
+#[repr(C)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 pub struct MeshOutput {}
 #[derive(Debug)]
 pub struct VertexEntry<const N: usize> {

wgsl_to_wgpu/src/wgsl.rs

@@ -25,10 +25,10 @@ const fn naga_stages(stage: naga::ShaderStage) -> wgpu::ShaderStages {
         naga::ShaderStage::Compute => wgpu::ShaderStages::COMPUTE,
         naga::ShaderStage::Task => wgpu::ShaderStages::TASK,
         naga::ShaderStage::Mesh => wgpu::ShaderStages::MESH,
-        naga::ShaderStage::RayGeneration => todo!(),
-        naga::ShaderStage::Miss => todo!(),
-        naga::ShaderStage::AnyHit => todo!(),
-        naga::ShaderStage::ClosestHit => todo!(),
+        naga::ShaderStage::RayGeneration => wgpu::ShaderStages::RAY_GENERATION,
+        naga::ShaderStage::Miss => wgpu::ShaderStages::MISS,
+        naga::ShaderStage::AnyHit => wgpu::ShaderStages::ANY_HIT,
+        naga::ShaderStage::ClosestHit => wgpu::ShaderStages::CLOSEST_HIT,
     }
 }