Update wgpu to 22.0

iced-rs · Jul 19, 2024 · 540ca81 · 540ca81
1 parent ee7068c
commit 540ca81
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -142,7 +142,7 @@ cosmic-text = "0.12"
 dark-light = "1.0"
 futures = "0.3"
 glam = "0.25"
-glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "ce412b3954118d2a4ae20de2d6959247d6f7ed76" }
+glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0d7ba1bba4dd71eb88d2cface5ce649db2413cb7" }
 guillotiere = "0.6"
 half = "2.2"
 image = "0.24"
@@ -173,7 +173,7 @@ wasm-bindgen-futures = "0.4"
 wasm-timer = "0.2"
 web-sys = "0.3.67"
 web-time = "1.1"
-wgpu = "0.20.1"
+wgpu = "22.0"
 winapi = "0.3"
 window_clipboard = "0.4.1"
 winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" }

diff --git a/benches/wgpu.rs b/benches/wgpu.rs
@@ -66,6 +66,7 @@ fn benchmark<'a>(
             label: None,
             required_features: wgpu::Features::empty(),
             required_limits: wgpu::Limits::default(),
+            memory_hints: wgpu::MemoryHints::MemoryUsage,
         },
         None,
     ))

diff --git a/examples/custom_shader/src/scene/pipeline.rs b/examples/custom_shader/src/scene/pipeline.rs
@@ -282,6 +282,7 @@ impl Pipeline {
                         wgpu::PipelineCompilationOptions::default(),
                 }),
                 multiview: None,
+                cache: None,
             });
 
         let depth_pipeline = DepthPipeline::new(
@@ -518,6 +519,7 @@ impl DepthPipeline {
                         wgpu::PipelineCompilationOptions::default(),
                 }),
                 multiview: None,
+                cache: None,
             });
 
         Self {

diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
@@ -102,6 +102,8 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
                                     required_features: adapter_features
                                         & wgpu::Features::default(),
                                     required_limits: wgpu::Limits::default(),
+                                    memory_hints:
+                                        wgpu::MemoryHints::MemoryUsage,
                                 },
                                 None,
                             )

diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
@@ -101,5 +101,6 @@ fn build_pipeline(
             alpha_to_coverage_enabled: false,
         },
         multiview: None,
+        cache: None,
     })
 }
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
@@ -143,6 +143,7 @@ pub fn convert(
             depth_stencil: None,
             multisample: wgpu::MultisampleState::default(),
             multiview: None,
+            cache: None,
         });
 
     let texture = device.create_texture(&wgpu::TextureDescriptor {

diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs
@@ -188,6 +188,7 @@ impl Pipeline {
                     alpha_to_coverage_enabled: false,
                 },
                 multiview: None,
+                cache: None,
             });
 
         Pipeline {

diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
@@ -174,6 +174,7 @@ impl Pipeline {
                         alpha_to_coverage_enabled: false,
                     },
                     multiview: None,
+                    cache: None,
                 },
             );
 

diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
@@ -136,6 +136,7 @@ impl Pipeline {
                     alpha_to_coverage_enabled: false,
                 },
                 multiview: None,
+                cache: None,
             });
 
         Self { pipeline }

diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
@@ -774,6 +774,7 @@ mod solid {
                         depth_stencil: None,
                         multisample: triangle::multisample_state(antialiasing),
                         multiview: None,
+                        cache: None,
                     },
                 );
 
@@ -955,6 +956,7 @@ mod gradient {
                     depth_stencil: None,
                     multisample: triangle::multisample_state(antialiasing),
                     multiview: None,
+                    cache: None,
                 },
             );
 

diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
@@ -140,6 +140,7 @@ impl Blit {
                     alpha_to_coverage_enabled: false,
                 },
                 multiview: None,
+                cache: None,
             });
 
         Blit {

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
@@ -162,6 +162,7 @@ impl Compositor {
                         ),
                         required_features: wgpu::Features::empty(),
                         required_limits: required_limits.clone(),
+                        memory_hints: wgpu::MemoryHints::MemoryUsage,
                     },
                     None,
                 )