Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to wgpu 0.16.1 #2205

Merged
merged 3 commits into from
May 25, 2023
Merged

Update to wgpu 0.16.1 #2205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5327e48
Update to wgpu 0.16.1
emilk May 25, 2023
a362763
cargo deny: allow duplicate of crate libloading
emilk May 25, 2023
2c4fe9a
Merge branch 'main' into emilk/update-wgpu
emilk May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 31 additions & 15 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ time = { version = "0.3", default-features = false, features = [
tinyvec = { version = "1.6", features = ["alloc", "rustc_1_55"] }
tokio = { version = "1.24", default-features = false }
web-time = "0.2.0"
wgpu = { version = "0.16" }
wgpu-core = { version = "0.16" }
wgpu = { version = "0.16.1" }
wgpu-core = { version = "0.16.1" }


[profile.dev]
Expand All @@ -124,8 +124,3 @@ debug = true
# If that is not possible, patch to a branch that has a PR open on the upstream repo.
# As a last resport, patch with a commit to our own repository.
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

# TODO(andreas): Either work around this issue in wgpu-egui (never discard command buffers) or wait for wgpu patch release.
# Fix for command buffer dropping crash https://github.com/gfx-rs/wgpu/pull/3726
wgpu = { git = "https://github.com/rerun-io/wgpu", rev = "de497aeda152a3515bac5eb4bf1b17f1757b9dac" }
wgpu-core = { git = "https://github.com/rerun-io/wgpu", rev = "de497aeda152a3515bac5eb4bf1b17f1757b9dac" }
13 changes: 7 additions & 6 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ deny = [
]

skip = [
{ name = "ahash" }, # Popular crate + fast release schedule = lots of crates still using old versions
{ name = "base64" }, # Too popular
{ name = "memoffset" }, # Small crate
{ name = "nix" }, # difficult to avoid :(
{ name = "time" }, # Too popular
{ name = "windows" }, # wgpu and rfd are sometimes on different versions
{ name = "ahash" }, # Popular crate + fast release schedule = lots of crates still using old versions
{ name = "base64" }, # Too popular
{ name = "libloading" }, # wgpu pulls in two different versions. It is a small crate though.
{ name = "memoffset" }, # Small crate
{ name = "nix" }, # difficult to avoid :(
{ name = "time" }, # Too popular
{ name = "windows" }, # wgpu and rfd are sometimes on different versions
]
skip-tree = [
{ name = "cargo-run-wasm" }, # Dev-tool
Expand Down