From 39b7a8a202c21da43035ec8dd5570a58cf4e8ef1 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Fri, 24 Dec 2021 23:48:06 -0500 Subject: [PATCH] Update naga to 8df5421 --- Cargo.lock | 3 +-- wgpu-core/Cargo.toml | 6 +++--- wgpu-hal/Cargo.toml | 12 ++++++------ wgpu/Cargo.toml | 18 +++++++++--------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84b7910d75..20219ccbdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,8 +872,7 @@ dependencies = [ [[package]] name = "naga" version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7216bec6be822a562dda435236539c7fb5aa5e5ceecc8c565e81139ed1d4b0" +source = "git+https://github.com/gfx-rs/naga?rev=8df5421#8df5421e2e9d33e092c19779adfdc42e7f8a74e6" dependencies = [ "bit-set", "bitflags", diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 8d68c4c8c6..e1c48d7b68 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -37,9 +37,9 @@ smallvec = "1" thiserror = "1" [dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" features = ["span", "validate", "wgsl-in"] [dependencies.wgt] diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index e0f922d537..9e4b33eba2 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -74,14 +74,14 @@ web-sys = { version = "0.3", features = ["Window", "HtmlCanvasElement", "WebGl2R js-sys = { version = "0.3" } [dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" [dev-dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" features = ["wgsl-in"] [dev-dependencies] diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index f02f62a5aa..805427774b 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -135,22 +135,22 @@ pollster = "0.2" env_logger = "0.8" [dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" optional = true # used to test all the example shaders [dev-dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" features = ["wgsl-in"] [target.'cfg(target_arch = "wasm32")'.dependencies.naga] -#git = "https://github.com/gfx-rs/naga" -#rev = "8ffd6ba" -version = "0.8" +git = "https://github.com/gfx-rs/naga" +rev = "8df5421" +#version = "0.8" features = ["wgsl-out"] [target.'cfg(target_arch = "wasm32")'.dependencies]