clippys, slab buffers are created with size 1 to avoid wgpu validation bug

Author: schell

Cargo.lock

@@ -17,7 +17,7 @@ resolver = "2"
 assert_approx_eq = "1.1.0"
 async-channel = "1.8"
 bytemuck = { version = "1.13.0", features = ["derive"] }
-crabslab = { version = "0.6.0", path = "../crabslab/crates/crabslab", default-features = false }
+crabslab = { version = "0.6.1", default-features = false }
 ctor = "0.2.2"
 dagga = "0.2.1"
 env_logger = "0.10.0"
@@ -50,7 +50,7 @@ opt-level = 3
 opt-level = 3
 
 [patch.crates-io]
-naga = { git = "https://github.com/schell/wgpu.git", branch = "fix/spv-in-sampling-result-for-depth-texture-is-scalar" }
-wgpu = { git = "https://github.com/schell/wgpu.git", branch = "fix/spv-in-sampling-result-for-depth-texture-is-scalar" }
-spirv-std = {path = "../rust-gpu/crates/spirv-std" } #{ git = "https://github.com/Rust-GPU/rust-gpu" }
+naga = { git = "https://github.com/gfx-rs/wgpu.git" }
+wgpu = { git = "https://github.com/gfx-rs/wgpu.git" }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu" }
 

Cargo.toml

@@ -278,7 +278,7 @@ impl Atlas {
         let mut texture_array = self.texture_array.write().unwrap();
         let extent = texture_array.texture.size();
 
-        let newly_packed_layers = pack_images(&layers, &images, extent)
+        let newly_packed_layers = pack_images(&layers, images, extent)
             .context(CannotPackTexturesSnafu { size: extent })?;
 
         let mut staged = StagedResources::try_staging(
@@ -422,14 +422,14 @@ fn pack_images<'a>(
                 images
                     .iter()
                     .enumerate()
-                    .map(|(i, img)| AnotherPacking::Img {
+                    .map(|(i, image)| AnotherPacking::Img {
                         original_index: i,
-                        image: &img,
+                        image,
                     }),
             )
             .collect()
     };
-    new_packing.sort_by(|a, b| (a.size().length_squared()).cmp(&(b.size().length_squared())));
+    new_packing.sort_by_key(|a| (a.size().length_squared()));
     let total_images = new_packing.len();
     let new_packing_layers: Vec<Vec<AnotherPacking>> =
         fan_split_n(extent.depth_or_array_layers as usize, new_packing);

crates/renderling/src/atlas/cpu.rs

@@ -14,6 +14,8 @@ use spirv_std::num_traits::Float;
 
 use crate::{camera::Camera, math::IsVector};
 
+// Allow manual bit rotation because this code is `no_std`.
+#[allow(clippy::manual_rotate)]
 fn radical_inverse_vdc(mut bits: u32) -> f32 {
     bits = (bits << 16u32) | (bits >> 16u32);
     bits = ((bits & 0x55555555u32) << 1u32) | ((bits & 0xAAAAAAAAu32) >> 1u32);

crates/renderling/src/convolution.rs

@@ -36,7 +36,6 @@ impl From<SlabAllocatorError> for CullingError {
     }
 }
 
-
 /// Computes frustum and occlusion culling on the GPU.
 pub struct ComputeCulling {
     pipeline: wgpu::ComputePipeline,
@@ -308,12 +307,11 @@ impl DepthPyramid {
             let depth_data: Vec<f32> = slab_data
                 .read_vec(mip.array())
                 .into_iter()
-                .map(|depth| {
+                .inspect(|&depth| {
                     if i == 0 {
                         min = min.min(depth);
                         max = max.max(depth);
                     }
-                    depth
                 })
                 .collect();
             log::info!("min: {min}");
@@ -329,7 +327,6 @@ impl DepthPyramid {
     }
 }
 
-
 /// Copies the depth texture to the top of the depth pyramid.
 struct ComputeCopyDepth {
     pipeline: wgpu::ComputePipeline,
@@ -516,7 +513,6 @@ impl ComputeCopyDepth {
     }
 }
 
-
 /// Downsamples the depth texture from one mip to the next.
 struct ComputeDownsampleDepth {
     pipeline: wgpu::ComputePipeline,

crates/renderling/src/cull/cpu.rs

@@ -11,7 +11,6 @@ pub mod compute_copy_depth_to_pyramid;
 pub mod compute_copy_depth_to_pyramid_multisampled;
 pub mod compute_culling;
 pub mod compute_downsample_depth_pyramid;
-pub mod compute_occlusion_culling;
 pub mod generate_mipmap_fragment;
 pub mod generate_mipmap_vertex;
 pub mod prefilter_environment_cubemap_fragment;

crates/renderling/src/linkage.rs

@@ -247,7 +247,9 @@ impl<Buffer> Default for SlabAllocator<Buffer> {
             update_queue: Default::default(),
             recycles: Default::default(),
             len: Default::default(),
-            capacity: Default::default(),
+            // Start with size 1, because some of `wgpu`'s validation depends on it.
+            // See <https://github.com/gfx-rs/wgpu/issues/6414> for more info.
+            capacity: Arc::new(AtomicUsize::new(1)),
             needs_expansion: Arc::new(true.into()),
             buffer: Default::default(),
         }

crates/renderling/src/slab/cpu.rs

@@ -619,9 +619,7 @@ impl Texture {
     ) -> Vec<Self> {
         let generator = MipMapGenerator::new(device, self.texture.format());
         // UNWRAP: safe because we know the formats match.
-        generator
-            .generate(device, queue, &self, mip_levels)
-            .unwrap()
+        generator.generate(device, queue, self, mip_levels).unwrap()
     }
 
     pub const HDR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba16Float;

crates/renderling/src/texture.rs

@@ -25,7 +25,7 @@ fn create_pipeline(
     let fragment_linkage = crate::linkage::generate_mipmap_fragment::linkage(device);
     device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
         label: LABEL,
-        layout: Some(&pp_layout),
+        layout: Some(pp_layout),
         vertex: wgpu::VertexState {
             module: &vertex_linkage.module,
             entry_point: Some(vertex_linkage.entry_point),

crates/renderling/src/texture/mips.rs

@@ -12,7 +12,7 @@ env_logger = "^0.10"
 log = "^0.4"
 naga = { version = "0.19", features = ["spv-in", "wgsl-out", "wgsl-in", "msl-out"] }
 quote = "1.0"
-spirv-builder = { path = "../../rust-gpu/crates/spirv-builder" } #git = "https://github.com/Rust-GPU/rust-gpu" }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu" }
 
 # Enable incremental by default in release mode.
 [profile.release]