fix: Point to the latest naga after gfx-rs/naga#2223 got merged

REASY · Feb 3, 2023 · 63b13fe · 63b13fe
1 parent 26faf4e
commit 63b13fe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,8 +41,9 @@ path = "./wgpu-hal"
 version = "0.15"
 
 [workspace.dependencies.naga]
-git = "https://github.com/REASY/naga"
-rev = "426d4b6883722b8d20927648fede8a8c4f42ebb5"
+git = "https://github.com/gfx-rs/naga"
+rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
+version = "0.11"
 
 [workspace.dependencies]
 arrayvec = "0.7"
@@ -131,8 +132,8 @@ termcolor = "1.1.2"
 wgpu-core = { path = "./wgpu-core" }
 wgpu-types = { path = "./wgpu-types" }
 
-#[patch."https://github.com/gfx-rs/naga"]
-#naga = { path = "../naga" }
+[patch."https://github.com/gfx-rs/naga"]
+naga = { path = "../naga" }
 
 [patch."https://github.com/zakarumych/gpu-descriptor"]
 #gpu-descriptor = { path = "../gpu-descriptor/gpu-descriptor" }

diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -66,8 +66,9 @@ smallvec = "1"
 thiserror = "1"
 
 [dependencies.naga]
-git = "https://github.com/REASY/naga"
-rev = "426d4b6883722b8d20927648fede8a8c4f42ebb5"
+git = "https://github.com/gfx-rs/naga"
+rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
+version = "0.11"
 features = ["clone", "span", "validate"]
 
 [dependencies.wgt]

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -113,14 +113,16 @@ libc = "0.2"
 android_system_properties = "0.1.1"
 
 [dependencies.naga]
-git = "https://github.com/REASY/naga"
-rev = "426d4b6883722b8d20927648fede8a8c4f42ebb5"
+git = "https://github.com/gfx-rs/naga"
+rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
+version = "0.11"
 features = ["clone"]
 
 # DEV dependencies
 [dev-dependencies.naga]
-git = "https://github.com/REASY/naga"
-rev = "426d4b6883722b8d20927648fede8a8c4f42ebb5"
+git = "https://github.com/gfx-rs/naga"
+rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
+version = "0.11"
 features = ["wgsl-in"]
 
 [dev-dependencies]