Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into tracking-optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald committed May 24, 2022
2 parents f5d8e5d + 435188c commit d807bd0
Show file tree
Hide file tree
Showing 16 changed files with 372 additions and 108 deletions.
6 changes: 3 additions & 3 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ thiserror = "1"

[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "1aa91549"
rev = "571302e"
#version = "0.8"
features = ["span", "validate", "wgsl-in"]

Expand Down
Loading

0 comments on commit d807bd0

Please sign in to comment.