Skip to content

Commit

Permalink
Update wgpu to v0.19.3. (#487)
Browse files Browse the repository at this point in the history
* Update `wgpu` to v0.19.3.

* Fully specify version requirements.
  • Loading branch information
xStrom committed Mar 2, 2024
1 parent 5d30f52 commit ee072f1
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 28 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,6 @@ jobs:

- name: cargo clippy (wasm)
run: cargo clippy --all-targets --target wasm32-unknown-unknown --workspace -- -D warnings
env:
RUSTFLAGS: '--cfg=web_sys_unstable_apis'

android-stable-check:
runs-on: ubuntu-latest
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/web-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:

- name: build (wasm)
run: cargo build -p with_winit --bin with_winit_bin --release --target wasm32-unknown-unknown
env:
RUSTFLAGS: '--cfg=web_sys_unstable_apis'

- name: package wasm
run: |
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ bytemuck = { version = "1.14.3", features = ["derive"] }
skrifa = "0.15.5"
peniko = "0.1.0"
futures-intrusive = "0.5.0"
raw-window-handle = "0.6"
raw-window-handle = "0.6.0"

# NOTE: Make sure to keep this in sync with the version badge in README.md
wgpu = { version = "0.19" }
wgpu = { version = "0.19.3" }


# Used for examples
clap = "4.5.1"
anyhow = "1.0"
instant = { version = "0.1.12", features = ["wasm-bindgen"] }
pollster = "0.3.0"
wgpu-profiler = "0.16"
wgpu-profiler = "0.16.1"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[![Xi Zulip](https://img.shields.io/badge/Xi%20Zulip-%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.19-orange.svg)](https://crates.io/crates/wgpu)
[![wgpu version](https://img.shields.io/badge/wgpu-v0.19.3-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) -->
<!-- [![Build status](https://github.com/linebender/vello/workflows/CI/badge.svg)](https://github.com/linebender/vello/actions) -->
Expand Down
7 changes: 0 additions & 7 deletions examples/run_wasm/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,5 @@
/// ```

fn main() {
// HACK: We rely heavily on compute shaders; which means we need WebGPU to be supported
// However, that requires unstable APIs to be enabled, which are not exposed through a feature
let current_value = std::env::var("RUSTFLAGS").unwrap_or("".to_owned());
std::env::set_var(
"RUSTFLAGS",
format!("{current_value} --cfg=web_sys_unstable_apis",),
);
cargo_run_wasm::run_wasm_with_css("body { margin: 0px; }");
}
6 changes: 3 additions & 3 deletions examples/scenes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ instant = { workspace = true }

# Used for the `download` command
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
byte-unit = "4.0"
dialoguer = "0.10"
ureq = "2.9"
byte-unit = "4.0.19"
dialoguer = "0.10.4"
ureq = "2.9.6"
4 changes: 2 additions & 2 deletions examples/simple/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ publish = false
vello = { version = "0.1.0", path = "../../" }
anyhow = "1.0.80"
pollster = "0.3.0"
wgpu = "0.19.1"
winit = "0.29.11"
wgpu = "0.19.3"
winit = "0.29.12"
11 changes: 4 additions & 7 deletions examples/with_winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pollster = { workspace = true }
wgpu-profiler = { workspace = true }

wgpu = { workspace = true }
winit = "0.29.11"
winit = "0.29.12"
env_logger = "0.11.2"
log = "0.4.21"

Expand All @@ -36,15 +36,12 @@ notify-debouncer-mini = "0.3"


[target.'cfg(target_os = "android")'.dependencies]
winit = { version = "0.29.11", features = ["android-native-activity"] }
winit = { version = "0.29.12", features = ["android-native-activity"] }
android_logger = "0.13.3"

[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = "0.1.7"
console_log = "1"
console_log = "1.0.0"
wasm-bindgen-futures = "0.4.41"
# Note: pin web-sys to 0.3.67 because wgpu 0.19 depends on that exact version.
# Update this when revving wgpu. Remove pin when wgpu no longer demands it.
# See https://github.com/gfx-rs/wgpu/pull/5224 for more info.
web-sys = { version = "=0.3.67", features = [ "HtmlCollection", "Text" ] }
web-sys = { version = "0.3.67", features = [ "HtmlCollection", "Text" ] }
getrandom = { version = "0.2.12", features = ["js"] }
2 changes: 1 addition & 1 deletion integrations/vello_svg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false

[dependencies]
vello = { path = "../../" }
usvg = "0.37"
usvg = "0.37.0"

0 comments on commit ee072f1

Please sign in to comment.