From 9e4c98ccbe4e980f75a20cd00450a60ef361c16e Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 29 Apr 2021 12:51:03 -0400 Subject: [PATCH] Switch to crates dependencies --- Cargo.toml | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 826b35a77..0fb59a22b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,21 +25,18 @@ cross = ["wgc/cross"] [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc] package = "wgpu-core" -git = "https://github.com/gfx-rs/wgpu" -rev = "e5ddb94be0221b0f53a8f43adfb15458daebfd7c" +version = "0.8" features = ["raw-window-handle"] [target.'cfg(target_arch = "wasm32")'.dependencies.wgc] package = "wgpu-core" -git = "https://github.com/gfx-rs/wgpu" -rev = "e5ddb94be0221b0f53a8f43adfb15458daebfd7c" +version = "0.8" features = ["raw-window-handle"] optional = true [dependencies.wgt] package = "wgpu-types" -git = "https://github.com/gfx-rs/wgpu" -rev = "e5ddb94be0221b0f53a8f43adfb15458daebfd7c" +version = "0.8" [dependencies] arrayvec = "0.5" @@ -67,14 +64,12 @@ env_logger = "0.8" # used to test all the example shaders [dev-dependencies.naga] -git = "https://github.com/gfx-rs/naga" -tag = "gfx-23" +version = "0.4" 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-23" +version = "0.4" features = ["wgsl-in", "spv-out"] [[example]] @@ -82,23 +77,11 @@ name="hello-compute" path="examples/hello-compute/main.rs" test = true -[patch."https://github.com/gfx-rs/wgpu"] +[patch.crates-io] #wgpu-types = { path = "../wgpu/wgpu-types" } #wgpu-core = { path = "../wgpu/wgpu-core" } - -[patch."https://github.com/gfx-rs/subscriber"] -#wgpu-subscriber = { version = "0.1", path = "../subscriber" } - -[patch."https://github.com/gfx-rs/naga"] -#naga = { path = "../naga" } - -[patch."https://github.com/zakarumych/gpu-descriptor"] #gpu-descriptor = { path = "../gpu-descriptor/gpu-descriptor" } - -[patch."https://github.com/zakarumych/gpu-alloc"] #gpu-alloc = { path = "../gpu-alloc/gpu-alloc" } - -[patch."https://github.com/gfx-rs/gfx"] #gfx-hal = { path = "../gfx/src/hal" } #gfx-backend-empty = { path = "../gfx/src/backend/empty" } #gfx-backend-vulkan = { path = "../gfx/src/backend/vulkan" } @@ -106,8 +89,8 @@ test = true #gfx-backend-dx12 = { path = "../gfx/src/backend/dx12" } #gfx-backend-dx11 = { path = "../gfx/src/backend/dx11" } #gfx-backend-metal = { path = "../gfx/src/backend/metal" } +#naga = { path = "../naga" } -[patch.crates-io] #web-sys = { path = "../wasm-bindgen/crates/web-sys" } #js-sys = { path = "../wasm-bindgen/crates/js-sys" } #wasm-bindgen = { path = "../wasm-bindgen" }