diff --git a/Cargo.lock b/Cargo.lock index e9bd79cbf5f..8600e92f741 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1471,7 +1471,6 @@ dependencies = [ [[package]] name = "naga" version = "0.11.0" -source = "git+https://github.com/REASY/naga?rev=426d4b6883722b8d20927648fede8a8c4f42ebb5#426d4b6883722b8d20927648fede8a8c4f42ebb5" dependencies = [ "bit-set", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 7a1a1000417..0b6851df4d5 100644 --- 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 index 575a5b259f3..54b9d2ca23a 100644 --- 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 index 21ed3a9365e..31f2ef17c15 100644 --- 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]