Merge remote-tracking branch 'origin/master' into webxr

gfx-rs · May 19, 2022 · fde8fe3 · fde8fe3
2 parents 70da790 + 8b2e6fe
commit fde8fe3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -41,7 +41,7 @@ thiserror = "1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 features = ["span", "validate", "wgsl-in"]
 

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -51,7 +51,7 @@ foreign-types = { version = "0.3", optional = true }
 ash = { version = "0.37", optional = true }
 gpu-alloc = { version = "0.5", optional = true }
 gpu-descriptor = { version = "0.2", optional = true }
-inplace_it = { version ="0.3.3", optional = true }
+inplace_it = { version = "0.3.3", optional = true }
 
 # backend: Gles
 glow = { version = "0.11.1", optional = true }
@@ -92,20 +92,20 @@ js-sys = { version = "0.3" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 
 # DEV dependencies
 
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 features = ["wgsl-in"]
 
 [dev-dependencies]
 env_logger = "0.9"
-winit = "0.26" # for "halmark" example
+winit = "0.26"     # for "halmark" example
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 glutin = "0.28" # for "gles" example
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -139,20 +139,20 @@ env_logger = "0.9"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 optional = true
 
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 features = ["wgsl-in"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "1aa91549"
+rev = "571302e"
 #version = "0.8"
 features = ["wgsl-out"]