Update to wgpu 22

linebender · Jul 19, 2024 · 261612b · 261612b
1 parent 6a9e093
commit 261612b
Show file tree

Hide file tree

Showing 9 changed files with 272 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ static_assertions = "1.1.0"
 thiserror = "1.0.61"
 
 # NOTE: Make sure to keep this in sync with the version badge in README.md and vello/README.md
-wgpu = { version = "0.20.1" }
+wgpu = { version = "22.0.0" }
 log = "0.4.21"
 image = { version = "0.25.1", default-features = false }
 

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ For now, prefer updating the package-level readmes, e.g. vello/README.md.
 [![Linebender Zulip](https://img.shields.io/badge/Linebender-%23gpu-blue?logo=Zulip)](https://xi.zulipchat.com/#narrow/stream/197075-gpu)
 [![dependency status](https://deps.rs/repo/github/linebender/vello/status.svg)](https://deps.rs/repo/github/linebender/vello)
 [![MIT/Apache 2.0](https://img.shields.io/badge/license-MIT%2FApache-blue.svg)](#license)
-[![wgpu version](https://img.shields.io/badge/wgpu-v0.20.1-orange.svg)](https://crates.io/crates/wgpu)
+[![wgpu version](https://img.shields.io/badge/wgpu-v22.0.0-orange.svg)](https://crates.io/crates/wgpu)
 
 [![Crates.io](https://img.shields.io/crates/v/vello.svg)](https://crates.io/crates/vello)
 [![Docs](https://docs.rs/vello/badge.svg)](https://docs.rs/vello)

diff --git a/examples/with_winit/Cargo.toml b/examples/with_winit/Cargo.toml
@@ -12,7 +12,7 @@ name = "with_winit"
 crate-type = ["cdylib", "lib"]
 
 [features]
-default = ["wgpu-profiler"]
+default = [] # "wgpu-profiler"]
 # Enable the use of wgpu-profiler. This is an optional feature for times when we use a git dependency on
 # wgpu (which means the dependency used in wgpu-profiler would be incompatible)
 wgpu-profiler = ["dep:wgpu-profiler", "vello/wgpu-profiler"]

diff --git a/vello/README.md b/vello/README.md
@@ -7,7 +7,7 @@
 [![Latest published version.](https://img.shields.io/crates/v/vello.svg)](https://crates.io/crates/vello)
 [![Documentation build status.](https://img.shields.io/docsrs/vello.svg)](https://docs.rs/vello)
 [![Apache 2.0 or MIT license.](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue.svg)](#license)
-[![Required wgpu version.](https://img.shields.io/badge/wgpu-v0.20.1-orange.svg)](https://crates.io/crates/wgpu)
+[![Required wgpu version.](https://img.shields.io/badge/wgpu-v22.0.0-orange.svg)](https://crates.io/crates/wgpu)
 \
 [![Linebender Zulip chat.](https://img.shields.io/badge/Linebender-%23gpu-blue?logo=Zulip)](https://xi.zulipchat.com/#narrow/stream/197075-gpu)
 [![GitHub Actions CI status.](https://img.shields.io/github/actions/workflow/status/linebender/vello/ci.yml?logo=github&label=CI)](https://github.com/linebender/vello/actions)

diff --git a/vello/src/lib.rs b/vello/src/lib.rs
@@ -741,6 +741,7 @@ impl BlitPipeline {
                 alpha_to_coverage_enabled: false,
             },
             multiview: None,
+            cache: None,
         });
         Self {
             bind_layout,

diff --git a/vello/src/util.rs b/vello/src/util.rs
@@ -133,6 +133,7 @@ impl RenderContext {
                     label: None,
                     required_features: features & maybe_features,
                     required_limits: limits,
+                    memory_hints: Default::default(),
                 },
                 None,
             )

diff --git a/vello/src/wgpu_engine.rs b/vello/src/wgpu_engine.rs
@@ -646,6 +646,7 @@ impl WgpuEngine {
                 zero_initialize_workgroup_memory: false,
                 ..Default::default()
             },
+            cache: None,
         });
         WgpuShader {
             pipeline,

diff --git a/vello_shaders/Cargo.toml b/vello_shaders/Cargo.toml
@@ -28,10 +28,10 @@ workspace = true
 
 [dependencies]
 bytemuck = { workspace = true, optional = true }
-naga = { version = "0.20.0", features = ["wgsl-in"], optional = true }
+naga = { version = "22.0.0", features = ["wgsl-in"], optional = true }
 thiserror = { workspace = true, optional = true }
 vello_encoding = { workspace = true, optional = true }
 
 [build-dependencies]
-naga = { version = "0.20.0", features = ["wgsl-in"] }
+naga = { version = "22.0.0", features = ["wgsl-in"] }
 thiserror = { workspace = true }