Upgrade to wgpu 0.16.0

fix braking changes
AmbientRun · Apr 27, 2023 · 2089caa · 2089caa
1 parent e9d1f3b
commit 2089caa
Show file tree

Hide file tree

Showing 9 changed files with 404 additions and 224 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ tracing = "0.1.35"
 tracing-tree = { git = "https://github.com/TmLev/tracing-tree" }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 tracing-log = { version = "0.1" }
-wgpu = "0.15.0"
+wgpu = "0.16.0"
 winit = { version = "0.28.1", features = ["serde"] }
 futures = { version = "0.3", default-features = false, features = ["std"] }
 tokio = { version = "1.20", features = ["parking_lot"] }

diff --git a/crates/app/src/renderers.rs b/crates/app/src/renderers.rs
@@ -82,7 +82,7 @@ impl ExamplesRender {
 
         tracing::debug!("Creating self");
 
-        let is_srgb = gpu.swapchain_format().describe().srgb;
+        let is_srgb = gpu.swapchain_format().is_srgb();
         let gamma_correction = if !is_srgb {
             tracing::info!("Output format is not in srgb colorspace. Applying manual gamma correction");
             Some(2.2)

diff --git a/crates/debugger/src/lib.rs b/crates/debugger/src/lib.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU32, sync::Arc};
+use std::{sync::Arc};
 
 use ambient_core::{
     asset_cache,
@@ -188,7 +188,7 @@ fn ShadowMapViz(hooks: &mut Hooks, get_state: GetDebuggerState, cascade: u32) ->
             tex = Some(renderer.shadows.as_ref().map(|x| {
                 Arc::new(x.shadow_texture.create_view(&wgpu::TextureViewDescriptor {
                     base_array_layer: cascade,
-                    array_layer_count: NonZeroU32::new(1),
+                    array_layer_count: Some(1),
                     dimension: Some(wgpu::TextureViewDimension::D2),
                     ..Default::default()
                 }))

diff --git a/crates/gpu/src/mipmap.rs b/crates/gpu/src/mipmap.rs
@@ -1,5 +1,3 @@
-use std::num::NonZeroU32;
-
 use ambient_std::asset_cache::{AssetCache, SyncAssetKeyExt};
 
 use super::blit::BlitterKey;
@@ -24,9 +22,9 @@ pub fn generate_mipmaps(
                 dimension: Some(wgpu::TextureViewDimension::D2),
                 aspect: wgpu::TextureAspect::All,
                 base_mip_level: mip,
-                mip_level_count: NonZeroU32::new(1),
+                mip_level_count: Some(1),
                 base_array_layer: layer,
-                array_layer_count: NonZeroU32::new(1),
+                array_layer_count: Some(1)
             })
         })
         .collect::<Vec<_>>();

diff --git a/crates/gpu/src/std_assets.rs b/crates/gpu/src/std_assets.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU8, sync::Arc};
+use std::{sync::Arc};
 
 use ambient_std::asset_cache::{AssetCache, SyncAssetKey, SyncAssetKeyExt};
 use glam::{uvec4, UVec4};
@@ -20,7 +20,10 @@ impl SyncAssetKey<Arc<wgpu::Sampler>> for DefaultSamplerKey {
             mag_filter: wgpu::FilterMode::Linear,
             min_filter: wgpu::FilterMode::Linear,
             mipmap_filter: wgpu::FilterMode::Linear,
-            anisotropy_clamp: NonZeroU8::new(16),
+            anisotropy_clamp: 1,
+            border_color: None,
+            compare: None,
+            label: None,
             ..Default::default()
         }))
     }
@@ -76,7 +79,7 @@ impl SyncAssetKey<Arc<wgpu::Sampler>> for DepthBufferSampler {
             lod_min_clamp: -100.0,
             lod_max_clamp: 100.0,
             label: Some("depth buffer sampler"),
-            anisotropy_clamp: None,
+            anisotropy_clamp: 1,
             border_color: None,
         }))
     }

diff --git a/crates/gpu/src/texture.rs b/crates/gpu/src/texture.rs
@@ -1,6 +1,5 @@
 use std::{
     io::Cursor,
-    num::NonZeroU32,
     ops::Deref,
     path::Path,
     sync::{
@@ -54,7 +53,7 @@ impl Texture {
 
     fn size_in_bytes_from_desc(descriptor: &wgpu::TextureDescriptor) -> u64 {
         let mut mip_size = (descriptor.size.width as u64 * descriptor.size.height as u64 * descriptor.size.depth_or_array_layers as u64)
-            * descriptor.format.describe().block_size as u64;
+            * descriptor.format.block_size(None).unwrap() as u64;
         let mut size_in_bytes = mip_size;
         for _ in 1..descriptor.mip_level_count {
             mip_size /= 2;
@@ -193,8 +192,8 @@ impl Texture {
                 &img.into_vec(),
                 wgpu::ImageDataLayout {
                     offset: 0,
-                    bytes_per_row: NonZeroU32::new(texture.size.width * texture.format.describe().block_size as u32),
-                    rows_per_image: NonZeroU32::new(texture.size.height),
+                    bytes_per_row: Some(texture.size.width * texture.format.block_size(None).unwrap()),
+                    rows_per_image: Some(texture.size.height),
                 },
                 wgpu::Extent3d { width: texture.size.width, height: texture.size.height, depth_or_array_layers: 1 },
             );
@@ -240,8 +239,8 @@ impl Texture {
             bytemuck::cast_slice(data.as_slice().unwrap()),
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: NonZeroU32::new(4 * size.width),
-                rows_per_image: NonZeroU32::new(size.height),
+                bytes_per_row: Some(4 * size.width),
+                rows_per_image: Some(size.height)
             },
             size,
         );
@@ -256,8 +255,8 @@ impl Texture {
             data,
             wgpu::ImageDataLayout {
                 offset: 0,
-                bytes_per_row: NonZeroU32::new(self.size.width * self.format.describe().block_size as u32),
-                rows_per_image: NonZeroU32::new(self.size.height),
+                bytes_per_row: Some(self.size.width * self.format.block_size(None).unwrap()),
+                rows_per_image: Some(self.size.height),
             },
             self.size,
         );
@@ -363,7 +362,7 @@ pub struct TextureReader {
 }
 impl TextureReader {
     pub fn new(gpu: Arc<Gpu>, base_size: wgpu::Extent3d, sample_count: u32, format: wgpu::TextureFormat) -> Self {
-        let block_size = format.describe().block_size as usize;
+        let block_size = format.block_size(None).unwrap() as usize;
         let size = wgpu::Extent3d {
             width: base_size.width * sample_count,
             height: base_size.height * sample_count,
@@ -397,8 +396,8 @@ impl TextureReader {
                 buffer: &self.staging_output_buffer,
                 layout: wgpu::ImageDataLayout {
                     offset: 0,
-                    bytes_per_row: Some(std::num::NonZeroU32::new(self.buffer_dimensions.padded_bytes_per_row as u32).unwrap()),
-                    rows_per_image: Some(std::num::NonZeroU32::new(self.buffer_dimensions.size.height).unwrap()),
+                    bytes_per_row: Some(self.buffer_dimensions.padded_bytes_per_row as u32),
+                    rows_per_image: Some(self.buffer_dimensions.size.height),
                 },
             },
             self.base_size,
@@ -424,7 +423,7 @@ impl TextureReader {
                 self.size.width as usize
                     * self.size.height as usize
                     * self.size.depth_or_array_layers as usize
-                    * self.format.describe().block_size as usize
+                    * self.format.block_size(None).unwrap() as usize
             ];
             for (i, chunk) in padded_buffer.chunks(self.buffer_dimensions.padded_bytes_per_row).enumerate() {
                 result[(i * self.buffer_dimensions.unpadded_bytes_per_row)..((i + 1) * self.buffer_dimensions.unpadded_bytes_per_row)]

diff --git a/crates/renderer/src/shadow_renderer.rs b/crates/renderer/src/shadow_renderer.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU32, sync::Arc};
+use std::{sync::Arc};
 
 use ambient_core::{camera::Camera, main_scene, player::local_user_id, transform::*};
 use ambient_ecs::{ArchetypeFilter, World};
@@ -87,7 +87,7 @@ impl ShadowsRenderer {
                         base_mip_level: 0,
                         mip_level_count: None,
                         base_array_layer: i,
-                        array_layer_count: NonZeroU32::new(1),
+                        array_layer_count: Some(1),
                     }),
                     globals: ShadowAndUIGlobals::new(assets.clone(), renderer_resources.globals_layout.clone()),
                     camera: Camera::default(),

diff --git a/crates/text/src/lib.rs b/crates/text/src/lib.rs
@@ -1,5 +1,5 @@
 use core::fmt;
-use std::{num::NonZeroU32, ops::Deref, str::FromStr, sync::Arc};
+use std::{ops::Deref, str::FromStr, sync::Arc};
 
 use ambient_core::{asset_cache, async_ecs::async_run, gpu, mesh, runtime, transform::*, window::window_scale_factor};
 use ambient_ecs::{components, ensure_has_component, query, Debuggable, Entity, SystemGroup};
@@ -306,8 +306,8 @@ pub fn systems(use_gpu: bool) -> SystemGroup {
                                         tex_data,
                                         wgpu::ImageDataLayout {
                                             offset: 0,
-                                            bytes_per_row: NonZeroU32::new(rect.width()),
-                                            rows_per_image: NonZeroU32::new(rect.height()),
+                                            bytes_per_row: Some(rect.width()),
+                                            rows_per_image: Some(rect.height()),
                                         },
                                         wgpu::Extent3d { width: rect.width(), height: rect.height(), depth_or_array_layers: 1 },
                                     );