nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-26 00:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rs] Merge #851

Browse Source 
851: Update naga to gfx-21 r=kvark a=kvark

See https://github.com/gfx-rs/wgpu/pull/1320

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot] 2021-04-11 05:26:26 +00:00 committed by GitHub
commit fc59ea4aba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wgpu/Cargo.toml
View File

@ -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"
@ -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]]