Skip to content
This repository has been archived by the owner on Jun 18, 2021. It is now read-only.

Commit

Permalink
Merge #851
Browse files Browse the repository at this point in the history
851: Update naga to gfx-21 r=kvark a=kvark

See gfx-rs/wgpu#1320

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
  • Loading branch information
bors[bot] and kvark authored Apr 11, 2021
2 parents ec2627a + 5163926 commit 53600ec
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ cross = ["wgc/cross"]
[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
rev = "27dbf076d5e257e14c816b052fcfdb25c165eda3"
features = ["raw-window-handle"]

[target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
rev = "27dbf076d5e257e14c816b052fcfdb25c165eda3"
features = ["raw-window-handle"]
optional = true

[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
rev = "27dbf076d5e257e14c816b052fcfdb25c165eda3"

[dependencies]
arrayvec = "0.5"
Expand Down Expand Up @@ -71,13 +71,13 @@ env_logger = "0.8"
# used to test all the example shaders
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
tag = "gfx-20"
tag = "gfx-21"
features = ["wgsl-in"]

# used to generate SPIR-V for the Web target
[target.'cfg(target_arch = "wasm32")'.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
tag = "gfx-20"
tag = "gfx-21"
features = ["wgsl-in", "spv-out"]

[[example]]
Expand Down

0 comments on commit 53600ec

Please sign in to comment.