bump wgpu to main for SPIR-V atomic support

schell · schell · commit 3f0c714fcc56 · 2024-07-06T08:21:41.000+12:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,4 +36,4 @@ wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 web-sys = "0.3"
 winit = { version = "0.30" }
-wgpu = { version = "0.20" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu.git" }
diff --git a/DEVLOG.md b/DEVLOG.md
@@ -3,6 +3,17 @@ title: devlog
 ---
 ## Sat Jul 6, 2024
 
+a. Open first PR into wgpu including SPIR-V frontend pass identifying and storing (but not using) two atomics operations
+b. Iterate on PR feedback, address wgpu team concerns
+c. First PR merged, update in Renderling, maintenance and release minor version
+https://github.com/gfx-rs/wgpu/pull/5702
+
+
+d. Open PR into wgpu including SPIR-V frontend pass upgrading identified atomic uses to atomic types
+e. Iterate on PR feedback, address wgpu team concerns
+f. PR merged, update in Renderling, maintenance and release minor version
+
+
 ### nlnet updates 
 
 Milestone 1 is complete! `wgpu` users should now be able to write shaders that use the 
diff --git a/crates/renderling/Cargo.toml b/crates/renderling/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "renderling"
-version = "0.4.7"
+version = "0.4.8"
 edition = "2021"
 description = "User-friendly real-time rendering. 🍖"
 repository = "https://github.com/schell/renderling"
diff --git a/crates/renderling/src/bloom/cpu.rs b/crates/renderling/src/bloom/cpu.rs
@@ -84,6 +84,7 @@ fn create_bloom_downsample_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeli
             compilation_options: Default::default(),
         }),
         multiview: None,
+        cache: None,
     })
 }
 
@@ -128,6 +129,7 @@ fn create_bloom_upsample_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeline
             compilation_options: Default::default(),
         }),
         multiview: None,
+        cache: None,
     })
 }
 
@@ -336,6 +338,7 @@ fn create_mix_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeline {
             compilation_options: Default::default(),
         }),
         multiview: None,
+        cache: None,
     })
 }
 
diff --git a/crates/renderling/src/cubemap.rs b/crates/renderling/src/cubemap.rs
@@ -114,6 +114,7 @@ impl CubemapMakingRenderPipeline {
                     compilation_options: Default::default(),
                 }),
                 multiview: None,
+                cache: None,
             },
         ))
     }
diff --git a/crates/renderling/src/ibl/diffuse_irradiance.rs b/crates/renderling/src/ibl/diffuse_irradiance.rs
@@ -118,6 +118,7 @@ impl DiffuseIrradianceConvolutionRenderPipeline {
                     compilation_options: Default::default(),
                 }),
                 multiview: None,
+                cache: None,
             },
         ));
         log::trace!("  completed pipeline creation");
diff --git a/crates/renderling/src/ibl/prefiltered_environment.rs b/crates/renderling/src/ibl/prefiltered_environment.rs
@@ -102,6 +102,7 @@ pub fn create_pipeline_and_bindgroup(
             compilation_options: Default::default(),
         }),
         multiview: None,
+        cache: None,
     });
     (pipeline, bindgroup)
 }
diff --git a/crates/renderling/src/linkage/stage-test_atomic_compare_exchange.spv b/crates/renderling/src/linkage/stage-test_atomic_compare_exchange.spv
diff --git a/crates/renderling/src/linkage/stage-test_atomic_exchange.spv b/crates/renderling/src/linkage/stage-test_atomic_exchange.spv
diff --git a/crates/renderling/src/linkage/stage-test_atomic_i_add_sub.spv b/crates/renderling/src/linkage/stage-test_atomic_i_add_sub.spv
diff --git a/crates/renderling/src/linkage/stage-test_atomic_i_decrement.spv b/crates/renderling/src/linkage/stage-test_atomic_i_decrement.spv
diff --git a/crates/renderling/src/linkage/stage-test_atomic_i_increment.spv b/crates/renderling/src/linkage/stage-test_atomic_i_increment.spv
diff --git a/crates/renderling/src/linkage/stage-test_atomic_load_and_store.spv b/crates/renderling/src/linkage/stage-test_atomic_load_and_store.spv
diff --git a/crates/renderling/src/linkage/test_atomic_compare_exchange.rs b/crates/renderling/src/linkage/test_atomic_compare_exchange.rs
@@ -0,0 +1,22 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_compare_exchange](crate::stage::test_atomic_compare_exchange).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_compare_exchange.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_compare_exchange";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_compare_exchange";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(device.create_shader_module(wgpu::include_spirv!(
+            "stage-test_atomic_compare_exchange.spv"
+        ))),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/linkage/test_atomic_exchange.rs b/crates/renderling/src/linkage/test_atomic_exchange.rs
@@ -0,0 +1,22 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_exchange](crate::stage::test_atomic_exchange).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_exchange.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_exchange";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_exchange";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(
+            device.create_shader_module(wgpu::include_spirv!("stage-test_atomic_exchange.spv")),
+        ),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/linkage/test_atomic_i_add_sub.rs b/crates/renderling/src/linkage/test_atomic_i_add_sub.rs
@@ -0,0 +1,22 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_i_add_sub](crate::stage::test_atomic_i_add_sub).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_i_add_sub.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_i_add_sub";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_i_add_sub";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(
+            device.create_shader_module(wgpu::include_spirv!("stage-test_atomic_i_add_sub.spv")),
+        ),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/linkage/test_atomic_i_decrement.rs b/crates/renderling/src/linkage/test_atomic_i_decrement.rs
@@ -0,0 +1,22 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_i_decrement](crate::stage::test_atomic_i_decrement).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_i_decrement.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_i_decrement";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_i_decrement";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(
+            device.create_shader_module(wgpu::include_spirv!("stage-test_atomic_i_decrement.spv")),
+        ),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/linkage/test_atomic_i_increment.rs b/crates/renderling/src/linkage/test_atomic_i_increment.rs
@@ -0,0 +1,22 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_i_increment](crate::stage::test_atomic_i_increment).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_i_increment.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_i_increment";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_i_increment";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(
+            device.create_shader_module(wgpu::include_spirv!("stage-test_atomic_i_increment.spv")),
+        ),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/linkage/test_atomic_load_and_store.rs b/crates/renderling/src/linkage/test_atomic_load_and_store.rs
@@ -0,0 +1,23 @@
+#![allow(dead_code)]
+//! Automatically generated with `cd shaders && cargo run --release`.
+//!
+//! Provides the shader linkage for
+//! [stage::test_atomic_load_and_store](crate::stage::test_atomic_load_and_store).
+//!
+//! **source path**:
+//! `crates/renderling/src/linkage/stage-test_atomic_load_and_store.spv`
+use super::ShaderLinkage;
+use std::sync::Arc;
+#[cfg(not(target_arch = "wasm32"))]
+pub const ENTRY_POINT: &str = "stage::test_atomic_load_and_store";
+#[cfg(target_arch = "wasm32")]
+pub const ENTRY_POINT: &str = "stagetest_atomic_load_and_store";
+pub fn linkage(device: &wgpu::Device) -> ShaderLinkage {
+    ShaderLinkage {
+        module: Arc::new(
+            device
+                .create_shader_module(wgpu::include_spirv!("stage-test_atomic_load_and_store.spv")),
+        ),
+        entry_point: ENTRY_POINT,
+    }
+}
diff --git a/crates/renderling/src/skybox/cpu.rs b/crates/renderling/src/skybox/cpu.rs
@@ -128,6 +128,7 @@ pub(crate) fn create_skybox_render_pipeline(
                 compilation_options: Default::default(),
             }),
             multiview: None,
+            cache: None,
         }),
     )
 }
@@ -595,6 +596,7 @@ impl Skybox {
                 compilation_options: Default::default(),
             }),
             multiview: None,
+            cache: None,
         });
 
         let framebuffer = Texture::new_with(
diff --git a/crates/renderling/src/stage.rs b/crates/renderling/src/stage.rs
@@ -345,6 +345,126 @@ pub fn test_i8_i16_extraction(
     }
 }
 
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_i_increment(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] times: &u32,
+) {
+    let mut i = 0u32;
+    loop {
+        if i >= *times {
+            break;
+        }
+        let _ = unsafe {
+            spirv_std::arch::atomic_i_increment::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::NONE.bits() },
+            >(global_index)
+        };
+        i += 1;
+    }
+}
+
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_load_and_store(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] times: &u32,
+) {
+    for _ in 0..*times {
+        let loaded = unsafe {
+            spirv_std::arch::atomic_load::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::NONE.bits() },
+            >(global_index)
+        };
+        unsafe {
+            spirv_std::arch::atomic_store::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::NONE.bits() },
+            >(global_index, loaded + 2)
+        };
+    }
+}
+
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_exchange(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] times: &u32,
+) {
+    let mut n = 0u32;
+    for _ in 0..*times {
+        n += unsafe {
+            spirv_std::arch::atomic_exchange::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::NONE.bits() },
+            >(global_index, n)
+        };
+    }
+}
+
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_compare_exchange(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] times: &u32,
+) {
+    for n in 0..*times {
+        unsafe {
+            spirv_std::arch::atomic_compare_exchange::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::WORKGROUP_MEMORY.bits() },
+                { spirv_std::memory::Semantics::WORKGROUP_MEMORY.bits() },
+            >(global_index, n, 3)
+        };
+    }
+}
+
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_i_decrement(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] output: &mut [u32],
+) {
+    loop {
+        let i = unsafe {
+            spirv_std::arch::atomic_i_decrement::<
+                u32,
+                { spirv_std::memory::Scope::Workgroup as u32 },
+                { spirv_std::memory::Semantics::NONE.bits() },
+            >(global_index)
+        };
+        output[i as usize] = i;
+        if i == 0 {
+            break;
+        }
+    }
+}
+
+#[spirv(compute(threads(32)))]
+pub fn test_atomic_i_add_sub(
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] global_index: &mut u32,
+    #[spirv(storage_buffer, descriptor_set = 0, binding = 1)] output: &mut [u32],
+) {
+    let i = unsafe {
+        spirv_std::arch::atomic_i_add::<
+            u32,
+            { spirv_std::memory::Scope::Workgroup as u32 },
+            { spirv_std::memory::Semantics::NONE.bits() },
+        >(global_index, 2)
+    };
+
+    output[i as usize] = unsafe {
+        spirv_std::arch::atomic_i_sub::<
+            u32,
+            { spirv_std::memory::Scope::Workgroup as u32 },
+            { spirv_std::memory::Semantics::NONE.bits() },
+        >(global_index, i)
+    };
+}
+
 #[cfg(test)]
 mod test {
     use glam::{Mat4, Vec3};
diff --git a/crates/renderling/src/stage/cpu.rs b/crates/renderling/src/stage/cpu.rs
@@ -139,6 +139,7 @@ fn create_stage_render_pipeline(
             compilation_options: Default::default(),
         }),
         multiview: None,
+        cache: None,
     })
 }
 
diff --git a/crates/renderling/src/texture.rs b/crates/renderling/src/texture.rs
@@ -688,6 +688,7 @@ impl Texture {
             depth_stencil: None,
             multisample: wgpu::MultisampleState::default(),
             multiview: None,
+            cache: None,
         });
         let size = self.texture.size();
         let mut mips: Vec<Texture> = vec![];
diff --git a/crates/renderling/src/tonemapping/cpu.rs b/crates/renderling/src/tonemapping/cpu.rs
@@ -152,6 +152,7 @@ impl Tonemapping {
                 }),
                 multisample: wgpu::MultisampleState::default(),
                 multiview: None,
+                cache: None,
             }),
         );
         Self {
diff --git a/crates/renderling/src/tutorial.rs b/crates/renderling/src/tutorial.rs

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ fn create_bloom_downsample_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeli`
`84`	`84`	`compilation_options: Default::default(),`
`85`	`85`	`}),`
`86`	`86`	`multiview: None,`
	`87`	`+ cache: None,`
`87`	`88`	`})`
`88`	`89`	`}`
`89`	`90`
`@@ -128,6 +129,7 @@ fn create_bloom_upsample_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeline`
`128`	`129`	`compilation_options: Default::default(),`
`129`	`130`	`}),`
`130`	`131`	`multiview: None,`
	`132`	`+ cache: None,`
`131`	`133`	`})`
`132`	`134`	`}`
`133`	`135`
`@@ -336,6 +338,7 @@ fn create_mix_pipeline(device: &wgpu::Device) -> wgpu::RenderPipeline {`
`336`	`338`	`compilation_options: Default::default(),`
`337`	`339`	`}),`
`338`	`340`	`multiview: None,`
	`341`	`+ cache: None,`
`339`	`342`	`})`
`340`	`343`	`}`
`341`	`344`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ impl CubemapMakingRenderPipeline {`
`114`	`114`	`compilation_options: Default::default(),`
`115`	`115`	`}),`
`116`	`116`	`multiview: None,`
	`117`	`+ cache: None,`
`117`	`118`	`},`
`118`	`119`	`))`
`119`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ pub fn create_pipeline_and_bindgroup(`
`102`	`102`	`compilation_options: Default::default(),`
`103`	`103`	`}),`
`104`	`104`	`multiview: None,`
	`105`	`+ cache: None,`
`105`	`106`	`});`
`106`	`107`	`(pipeline, bindgroup)`
`107`	`108`	`}`