Refactor Cargo.toml Signifigantly

gfx-rs · Jan 23, 2025 · 72d50fd · 72d50fd
1 parent 3cd2e7c
commit 72d50fd
Show file tree

Hide file tree

Showing 47 changed files with 430 additions and 477 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,26 +56,14 @@ repository = "https://github.com/gfx-rs/wgpu"
 version = "24.0.0"
 authors = ["gfx-rs developers"]
 
-[workspace.dependencies.wgc]
-package = "wgpu-core"
-path = "./wgpu-core"
-version = "24.0.0"
-
-[workspace.dependencies.wgt]
-package = "wgpu-types"
-path = "./wgpu-types"
-version = "24.0.0"
-
-[workspace.dependencies.hal]
-package = "wgpu-hal"
-path = "./wgpu-hal"
-version = "24.0.0"
-
-[workspace.dependencies.naga]
-path = "./naga"
-version = "24.0.0"
-
 [workspace.dependencies]
+naga = { version = "24.0.0", path = "./naga" }
+wgpu-core = { version = "24.0.0", path = "./wgpu-core" }
+wgpu-hal = { version = "24.0.0", path = "./wgpu-hal" }
+wgpu-macros = { version = "24.0.0", path = "./wgpu-macros" }
+wgpu-test = { version = "24.0.0", path = "./tests" }
+wgpu-types = { version = "24.0.0", path = "./wgpu-types" }
+
 anyhow = "1.0.95"
 argh = "0.1.13"
 arrayvec = "0.7"
@@ -102,7 +90,7 @@ hashbrown = { version = "0.15.2", default-features = false, features = [
     "inline-more",
 ] }
 heck = "0.5.0"
-image = { version = "0.24", default-features = false, features = ["png"] }
+image = { version = "0.25", default-features = false, features = ["png"] }
 indexmap = "2"
 itertools = { version = "0.13.0" }
 ktx2 = "0.3"
@@ -111,8 +99,7 @@ libloading = "0.8"
 libtest-mimic = "0.8.1"
 log = "0.4"
 nanorand = { version = "0.7", default-features = false, features = ["wyrand"] }
-# https://github.com/Razaekel/noise-rs/issues/335 (Updated dependencies)
-noise = { version = "0.8", git = "https://github.com/Razaekel/noise-rs.git", rev = "c6942d4fb70af26db4441edcf41f90fa115333f2" }
+noise = "0.9"
 nv-flip = "0.1"
 obj = "0.10"
 once_cell = "1.20.2"
@@ -139,7 +126,7 @@ smallvec = "1"
 static_assertions = "1.1.0"
 strum = { version = "0.26.0", features = ["derive"] }
 trybuild = "1"
-tracy-client = "0.17"
+tracy-client = "0.18"
 thiserror = "2"
 wgpu = { version = "24.0.0", path = "./wgpu", default-features = false, features = [
     "serde",
@@ -148,10 +135,6 @@ wgpu = { version = "24.0.0", path = "./wgpu", default-features = false, features
     "metal",
     "static-dxc",
 ] }
-wgpu-core = { version = "24.0.0", path = "./wgpu-core" }
-wgpu-macros = { version = "24.0.0", path = "./wgpu-macros" }
-wgpu-test = { version = "24.0.0", path = "./tests" }
-wgpu-types = { version = "24.0.0", path = "./wgpu-types" }
 winit = { version = "0.29", features = ["android-native-activity"] }
 
 # Metal dependencies
@@ -166,7 +149,7 @@ ash = "0.38.0"
 gpu-alloc = "0.6"
 gpu-descriptor = "0.3"
 
-# DX dependencies
+# DX12 dependencies
 bit-set = "0.8"
 gpu-allocator = { version = "0.27", default-features = false }
 range-alloc = "0.1"
@@ -180,7 +163,7 @@ glutin = { version = "0.31", default-features = false }
 glutin-winit = { version = "0.4", default-features = false }
 glutin_wgl_sys = "0.6"
 
-# DX and GLES dependencies
+# DX12 and GLES dependencies
 windows = { version = "0.58", default-features = false }
 
 # wasm32 dependencies
@@ -191,7 +174,7 @@ wasm-bindgen = "0.2.97"
 wasm-bindgen-futures = "0.4.45"
 wasm-bindgen-test = "0.3"
 web-sys = { version = "0.3.74", default-features = false }
-web-time = "0.2.4"
+web-time = "1"
 
 # deno dependencies
 deno_console = "0.179.0"
@@ -206,21 +189,8 @@ termcolor = "1.4.1"
 # android dependencies
 ndk-sys = "0.5.0"
 
-[patch."https://github.com/gfx-rs/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.crates-io]
-#glow = { path = "../glow" }
-#web-sys = { path = "../wasm-bindgen/crates/web-sys" }
-#js-sys = { path = "../wasm-bindgen/crates/js-sys" }
-#wasm-bindgen = { path = "../wasm-bindgen" }
-
 # These overrides allow our examples to explicitly depend on release crates 
+[patch.crates-io]
 wgpu = { path = "./wgpu" }
 
 [profile.release]

diff --git a/deno_webgpu/Cargo.toml b/deno_webgpu/Cargo.toml
@@ -16,36 +16,37 @@ path = "lib.rs"
 # We make all dependencies conditional on not being wasm,
 # so the whole workspace can built as wasm.
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-deno_core.workspace = true
-serde = { workspace = true, features = ["derive"] }
-tokio = { workspace = true, features = ["full"] }
-wgt = { workspace = true, package = "wgpu-types", features = ["serde"] }
-raw-window-handle = { workspace = true }
-thiserror.workspace = true
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgpu-core]
-workspace = true
-features = [
+wgpu-core = { workspace = true, features = [
     "raw-window-handle",
     "trace",
     "replay",
     "serde",
     "strict_asserts",
     "wgsl",
     "gles",
-]
+] }
+wgpu-types = { workspace = true, features = ["serde"] }
+
+deno_core.workspace = true
+raw-window-handle = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }
 
-# We want the wgpu-core Metal backend on macOS and iOS.
-[target.'cfg(target_vendor = "apple")'.dependencies.wgpu-core]
-workspace = true
-features = ["metal"]
+# Apple Platforms
+#
+# We want the Metal backend.
+[target.'cfg(target_vendor = "apple")'.dependencies]
+wgpu-core = { workspace = true, features = ["metal"] }
 
-# We want the wgpu-core Direct3D backend on Windows.
-[target.'cfg(windows)'.dependencies.wgpu-core]
-workspace = true
-features = ["dx12"]
+# Windows
+#
+# We want the DX12 backend.
+[target.'cfg(windows)'.dependencies]
+wgpu-core = { workspace = true, features = ["dx12"] }
 
-# We want the wgpu-core Vulkan backend on Unix (but not Emscripten) and Windows.
-[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies.wgpu-core]
-workspace = true
-features = ["vulkan"]
+# Windows and Unit (not Emscripten)
+#
+# We want the Vulkan backend.
+[target.'cfg(any(windows, all(unix, not(target_os = "emscripten"))))'.dependencies]
+wgpu-core = { workspace = true, features = ["vulkan"] }
diff --git a/deno_webgpu/binding.rs b/deno_webgpu/binding.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use super::error::WebGpuResult;
-use super::wgpu_types;
 use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/buffer.rs b/deno_webgpu/buffer.rs
@@ -1,7 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
 use super::error::WebGpuResult;
-use super::wgpu_types;
 use deno_core::futures::channel::oneshot;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/bundle.rs b/deno_webgpu/bundle.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/command_encoder.rs b/deno_webgpu/command_encoder.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use crate::WebGpuQuerySet;
 use deno_core::error::AnyError;
 use deno_core::op2;

diff --git a/deno_webgpu/lib.rs b/deno_webgpu/lib.rs
@@ -12,8 +12,6 @@ use std::borrow::Cow;
 use std::cell::RefCell;
 use std::collections::HashSet;
 use std::rc::Rc;
-pub use wgpu_core;
-pub use wgt as wgpu_types;
 
 use error::WebGpuResult;
 

diff --git a/deno_webgpu/pipeline.rs b/deno_webgpu/pipeline.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::error::AnyError;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/queue.rs b/deno_webgpu/queue.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use crate::command_encoder::WebGpuCommandBuffer;
 use crate::Instance;
 use deno_core::error::AnyError;

diff --git a/deno_webgpu/render_pass.rs b/deno_webgpu/render_pass.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/sampler.rs b/deno_webgpu/sampler.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/shader.rs b/deno_webgpu/shader.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;

diff --git a/deno_webgpu/surface.rs b/deno_webgpu/surface.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use super::WebGpuResult;
 use deno_core::op2;
 use deno_core::OpState;

diff --git a/deno_webgpu/texture.rs b/deno_webgpu/texture.rs
@@ -1,6 +1,5 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
-use super::wgpu_types;
 use deno_core::op2;
 use deno_core::OpState;
 use deno_core::Resource;