From 1e9128795fddc12c78533f1e8dfc11ebd37cb8e5 Mon Sep 17 00:00:00 2001 From: marc0246 <40955683+marc0246@users.noreply.github.com> Date: Mon, 30 Oct 2023 04:42:00 +0100 Subject: [PATCH] Workspace dependencies (#2381) * Use workspace dependencies * Update CI workflow to account for the two workspaces * Make the tables in the root workspace a bit nicer to look at * Use workspace package version * Remove workspace package version * Make winit a workspace dependency as well --- .github/workflows/rust.yml | 18 +++++- .gitignore | 2 +- Cargo.toml | 50 ++++++++++++++++- examples/Cargo.toml | 15 +++++ examples/async-update/Cargo.toml | 10 ++-- examples/basic-compute-shader/Cargo.toml | 4 +- examples/buffer-allocator/Cargo.toml | 6 +- examples/clear-attachments/Cargo.toml | 4 +- examples/debug/Cargo.toml | 2 +- examples/deferred/Cargo.toml | 8 +-- examples/dynamic-buffers/Cargo.toml | 4 +- examples/dynamic-local-size/Cargo.toml | 6 +- examples/gl-interop/Cargo.toml | 6 +- examples/image-self-copy-blit/Cargo.toml | 8 +-- examples/image/Cargo.toml | 8 +-- examples/immutable-sampler/Cargo.toml | 8 +-- examples/indirect/Cargo.toml | 6 +- examples/instancing/Cargo.toml | 6 +- examples/interactive-fractal/Cargo.toml | 12 ++-- examples/msaa-renderpass/Cargo.toml | 6 +- examples/multi-window-game-of-life/Cargo.toml | 12 ++-- examples/multi-window/Cargo.toml | 6 +- examples/multiview/Cargo.toml | 6 +- examples/occlusion-query/Cargo.toml | 6 +- examples/pipeline-caching/Cargo.toml | 4 +- examples/push-constants/Cargo.toml | 4 +- examples/push-descriptors/Cargo.toml | 8 +-- examples/runtime-array/Cargo.toml | 8 +-- examples/runtime-shader/Cargo.toml | 4 +- examples/self-copy-buffer/Cargo.toml | 4 +- examples/shader-include/Cargo.toml | 4 +- examples/shader-types-derive/Cargo.toml | 10 ++-- examples/shader-types-sharing/Cargo.toml | 4 +- examples/simple-particles/Cargo.toml | 6 +- examples/specialization-constants/Cargo.toml | 4 +- examples/teapot/Cargo.toml | 8 +-- examples/tessellation/Cargo.toml | 6 +- examples/texture-array/Cargo.toml | 8 +-- examples/triangle-v1_3/Cargo.toml | 6 +- examples/triangle/Cargo.toml | 6 +- vulkano-macros/Cargo.toml | 10 ++-- vulkano-shaders/Cargo.toml | 14 ++--- vulkano-util/Cargo.toml | 6 +- vulkano-win/Cargo.toml | 5 +- vulkano/Cargo.toml | 56 +++++++++---------- 45 files changed, 240 insertions(+), 164 deletions(-) create mode 100644 examples/Cargo.toml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 551aa4e1..6d7ed917 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -19,23 +19,35 @@ jobs: # - name: Ninja Install # run: pip install ninja - uses: actions/checkout@v3 - - name: Build + - name: Build tests run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Build examples + run: | + cd examples + cargo build --verbose linux_stable: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Build + - name: Build tests run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Build examples + run: | + cd examples + cargo build --verbose macos_stable: runs-on: macos-latest steps: - uses: actions/checkout@v3 - - name: Build + - name: Build tests run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Build examples + run: | + cd examples + cargo build --verbose diff --git a/.gitignore b/.gitignore index 6d3064be..2a06410d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ target -/Cargo.lock +Cargo.lock .cargo examples/dynamic-local-size/mandelbrot.png examples/msaa-renderpass/triangle.png diff --git a/Cargo.toml b/Cargo.toml index cc20a91b..42cffc6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "examples/*", "vulkano", "vulkano-macros", "vulkano-shaders", @@ -8,3 +7,52 @@ members = [ "vulkano-win", ] resolver = "2" + +[workspace.dependencies.vulkano] +version = "0.34" +path = "vulkano" +default-features = false + +[workspace.dependencies.vulkano-macros] +version = "0.34" +path = "vulkano-macros" + +[workspace.dependencies.vulkano-shaders] +version = "0.34" +path = "vulkano-shaders" + +[workspace.dependencies.vulkano-util] +version = "0.34" +path = "vulkano-util" + +[workspace.dependencies] +ahash = "0.8" +# When updating Ash, also update vk.xml to the same Vulkan patch version that Ash uses. +# All versions of vk.xml can be found at: +# https://github.com/KhronosGroup/Vulkan-Headers/commits/main/registry/vk.xml +ash = "0.37.3" +bytemuck = "1.9" +cgmath = "0.18" +core-graphics-types = "0.1" +crossbeam-queue = "0.3" +half = "2.0" +heck = "0.4" +indexmap = "2.0" +libloading = "0.8" +objc = "0.2.5" +once_cell = "1.17" +nalgebra = "0.32" +parking_lot = "0.12" +proc-macro2 = "1.0" +proc-macro-crate = "1.2" +quote = "1.0" +raw-window-handle = "0.5" +regex = "1.8" +serde = "1.0" +serde_json = "1.0" +shaderc = "0.8" +smallvec = "1.8" +syn = "1.0" +thread_local = "1.1" +vk-parse = "0.12" +winit = "0.28" diff --git a/examples/Cargo.toml b/examples/Cargo.toml new file mode 100644 index 00000000..77747fce --- /dev/null +++ b/examples/Cargo.toml @@ -0,0 +1,15 @@ +[workspace] +members = ["*"] +resolver = "2" + +[workspace.dependencies] +cgmath = "0.18" +png = "0.17" +rand = "0.8" +ron = "0.8" +serde = "1.0" +vulkano = { path = "../vulkano" } +vulkano-macros = { path = "../vulkano-macros" } +vulkano-shaders = { path = "../vulkano-shaders" } +vulkano-util = { path = "../vulkano-util" } +winit = "0.28" diff --git a/examples/async-update/Cargo.toml b/examples/async-update/Cargo.toml index bab9c378..b46b55cb 100644 --- a/examples/async-update/Cargo.toml +++ b/examples/async-update/Cargo.toml @@ -9,8 +9,8 @@ name = "async-update" path = "main.rs" [dependencies] -cgmath = "0.18" -rand = "0.8" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +cgmath = { workspace = true } +rand = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/basic-compute-shader/Cargo.toml b/examples/basic-compute-shader/Cargo.toml index 8efccf21..f1829266 100644 --- a/examples/basic-compute-shader/Cargo.toml +++ b/examples/basic-compute-shader/Cargo.toml @@ -9,5 +9,5 @@ name = "basic-compute-shader" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/buffer-allocator/Cargo.toml b/examples/buffer-allocator/Cargo.toml index 196f3b50..e9fa6e4d 100644 --- a/examples/buffer-allocator/Cargo.toml +++ b/examples/buffer-allocator/Cargo.toml @@ -9,6 +9,6 @@ name = "buffer-allocator" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/clear-attachments/Cargo.toml b/examples/clear-attachments/Cargo.toml index 37b7de3e..10d2fb52 100644 --- a/examples/clear-attachments/Cargo.toml +++ b/examples/clear-attachments/Cargo.toml @@ -9,5 +9,5 @@ name = "clear-attachments" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -winit = "0.28" +vulkano = { workspace = true } +winit = { workspace = true } diff --git a/examples/debug/Cargo.toml b/examples/debug/Cargo.toml index 09a350f8..9dd58cce 100644 --- a/examples/debug/Cargo.toml +++ b/examples/debug/Cargo.toml @@ -9,4 +9,4 @@ name = "debug" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } +vulkano = { workspace = true } diff --git a/examples/deferred/Cargo.toml b/examples/deferred/Cargo.toml index c475a978..742162ab 100644 --- a/examples/deferred/Cargo.toml +++ b/examples/deferred/Cargo.toml @@ -9,7 +9,7 @@ name = "deferred" path = "main.rs" [dependencies] -cgmath = "0.18" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +cgmath = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/dynamic-buffers/Cargo.toml b/examples/dynamic-buffers/Cargo.toml index 4d9f6b8a..bb7c2784 100644 --- a/examples/dynamic-buffers/Cargo.toml +++ b/examples/dynamic-buffers/Cargo.toml @@ -9,5 +9,5 @@ name = "dynamic-buffers" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/dynamic-local-size/Cargo.toml b/examples/dynamic-local-size/Cargo.toml index 64f374c0..079cdfee 100644 --- a/examples/dynamic-local-size/Cargo.toml +++ b/examples/dynamic-local-size/Cargo.toml @@ -9,6 +9,6 @@ name = "dynamic-local-size" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/gl-interop/Cargo.toml b/examples/gl-interop/Cargo.toml index 934130d9..3569947f 100644 --- a/examples/gl-interop/Cargo.toml +++ b/examples/gl-interop/Cargo.toml @@ -10,8 +10,8 @@ path = "main.rs" [dependencies] glium = "0.32.1" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } # Glium has still not been updated to the latest winit version winit_glium = { package = "winit", version = "0.27.1" } diff --git a/examples/image-self-copy-blit/Cargo.toml b/examples/image-self-copy-blit/Cargo.toml index 9d854f13..f99f1fa8 100644 --- a/examples/image-self-copy-blit/Cargo.toml +++ b/examples/image-self-copy-blit/Cargo.toml @@ -9,7 +9,7 @@ name = "image-self-copy-blit" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/image/Cargo.toml b/examples/image/Cargo.toml index 0025855f..e2a6cf35 100644 --- a/examples/image/Cargo.toml +++ b/examples/image/Cargo.toml @@ -9,7 +9,7 @@ name = "image" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/immutable-sampler/Cargo.toml b/examples/immutable-sampler/Cargo.toml index cfe70964..89d7ebbd 100644 --- a/examples/immutable-sampler/Cargo.toml +++ b/examples/immutable-sampler/Cargo.toml @@ -9,7 +9,7 @@ name = "immutable-sampler" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/indirect/Cargo.toml b/examples/indirect/Cargo.toml index b2dd3955..ee75d61e 100644 --- a/examples/indirect/Cargo.toml +++ b/examples/indirect/Cargo.toml @@ -9,6 +9,6 @@ name = "indirect" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/instancing/Cargo.toml b/examples/instancing/Cargo.toml index 0c313092..a2f7b71b 100644 --- a/examples/instancing/Cargo.toml +++ b/examples/instancing/Cargo.toml @@ -9,6 +9,6 @@ name = "instancing" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/interactive-fractal/Cargo.toml b/examples/interactive-fractal/Cargo.toml index 8db573ed..b86d1891 100644 --- a/examples/interactive-fractal/Cargo.toml +++ b/examples/interactive-fractal/Cargo.toml @@ -9,9 +9,9 @@ name = "interactive-fractal" path = "main.rs" [dependencies] -cgmath = "0.18" -rand = "0.8" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -vulkano-util = { path = "../../vulkano-util" } -winit = "0.28" +cgmath = { workspace = true } +rand = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +vulkano-util = { workspace = true } +winit = { workspace = true } diff --git a/examples/msaa-renderpass/Cargo.toml b/examples/msaa-renderpass/Cargo.toml index fc6b89c8..bb4ae6ff 100644 --- a/examples/msaa-renderpass/Cargo.toml +++ b/examples/msaa-renderpass/Cargo.toml @@ -9,6 +9,6 @@ name = "msaa-renderpass" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/multi-window-game-of-life/Cargo.toml b/examples/multi-window-game-of-life/Cargo.toml index c6ea5237..9a5f6b9d 100644 --- a/examples/multi-window-game-of-life/Cargo.toml +++ b/examples/multi-window-game-of-life/Cargo.toml @@ -9,9 +9,9 @@ name = "multi-window-game-of-life" path = "main.rs" [dependencies] -cgmath = "0.18" -rand = "0.8" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -vulkano-util = { path = "../../vulkano-util" } -winit = "0.28" +cgmath = { workspace = true } +rand = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +vulkano-util = { workspace = true } +winit = { workspace = true } diff --git a/examples/multi-window/Cargo.toml b/examples/multi-window/Cargo.toml index 0331b070..3e08151f 100644 --- a/examples/multi-window/Cargo.toml +++ b/examples/multi-window/Cargo.toml @@ -9,6 +9,6 @@ name = "multi-window" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/multiview/Cargo.toml b/examples/multiview/Cargo.toml index 8b6bd2a7..7fabbc17 100644 --- a/examples/multiview/Cargo.toml +++ b/examples/multiview/Cargo.toml @@ -9,6 +9,6 @@ name = "multiview" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/occlusion-query/Cargo.toml b/examples/occlusion-query/Cargo.toml index 716e413a..d0a57e7e 100644 --- a/examples/occlusion-query/Cargo.toml +++ b/examples/occlusion-query/Cargo.toml @@ -9,6 +9,6 @@ name = "occlusion-query" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/pipeline-caching/Cargo.toml b/examples/pipeline-caching/Cargo.toml index dc98ef43..97be6b5e 100644 --- a/examples/pipeline-caching/Cargo.toml +++ b/examples/pipeline-caching/Cargo.toml @@ -9,5 +9,5 @@ name = "pipeline-caching" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/push-constants/Cargo.toml b/examples/push-constants/Cargo.toml index 56b2bd45..46b557f6 100644 --- a/examples/push-constants/Cargo.toml +++ b/examples/push-constants/Cargo.toml @@ -9,5 +9,5 @@ name = "push-constants" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/push-descriptors/Cargo.toml b/examples/push-descriptors/Cargo.toml index c5e60152..94785156 100644 --- a/examples/push-descriptors/Cargo.toml +++ b/examples/push-descriptors/Cargo.toml @@ -9,7 +9,7 @@ name = "push-descriptors" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/runtime-array/Cargo.toml b/examples/runtime-array/Cargo.toml index f3022384..2cace6af 100644 --- a/examples/runtime-array/Cargo.toml +++ b/examples/runtime-array/Cargo.toml @@ -9,7 +9,7 @@ name = "runtime-array" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/runtime-shader/Cargo.toml b/examples/runtime-shader/Cargo.toml index 2d7ec233..56689543 100644 --- a/examples/runtime-shader/Cargo.toml +++ b/examples/runtime-shader/Cargo.toml @@ -9,5 +9,5 @@ name = "runtime-shader" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -winit = "0.28" +vulkano = { workspace = true } +winit = { workspace = true } diff --git a/examples/self-copy-buffer/Cargo.toml b/examples/self-copy-buffer/Cargo.toml index 7b7c07e7..4cc66f7e 100644 --- a/examples/self-copy-buffer/Cargo.toml +++ b/examples/self-copy-buffer/Cargo.toml @@ -9,5 +9,5 @@ name = "self-copy-buffer" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/shader-include/Cargo.toml b/examples/shader-include/Cargo.toml index dab13fd1..018c7d24 100644 --- a/examples/shader-include/Cargo.toml +++ b/examples/shader-include/Cargo.toml @@ -9,5 +9,5 @@ name = "shader-include" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/shader-types-derive/Cargo.toml b/examples/shader-types-derive/Cargo.toml index ff0ded9b..75a479ca 100644 --- a/examples/shader-types-derive/Cargo.toml +++ b/examples/shader-types-derive/Cargo.toml @@ -9,8 +9,8 @@ name = "shader-types-derive" path = "main.rs" [dependencies] -ron = "0.8" -serde = { version = "1.0", features = ["derive"] } -vulkano = { path = "../../vulkano", features = ["serde"] } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +ron = { workspace = true } +serde = { workspace = true, features = ["derive"] } +vulkano = { workspace = true, features = ["serde"] } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/shader-types-sharing/Cargo.toml b/examples/shader-types-sharing/Cargo.toml index 0023cb76..4fa9193d 100644 --- a/examples/shader-types-sharing/Cargo.toml +++ b/examples/shader-types-sharing/Cargo.toml @@ -9,5 +9,5 @@ name = "shader-types-sharing" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/simple-particles/Cargo.toml b/examples/simple-particles/Cargo.toml index f2d1665e..2b6c1e58 100644 --- a/examples/simple-particles/Cargo.toml +++ b/examples/simple-particles/Cargo.toml @@ -9,6 +9,6 @@ name = "simple-particles" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/specialization-constants/Cargo.toml b/examples/specialization-constants/Cargo.toml index d43f5044..247a7dd0 100644 --- a/examples/specialization-constants/Cargo.toml +++ b/examples/specialization-constants/Cargo.toml @@ -9,5 +9,5 @@ name = "specialization-constants" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } diff --git a/examples/teapot/Cargo.toml b/examples/teapot/Cargo.toml index 25ad382d..52476c50 100644 --- a/examples/teapot/Cargo.toml +++ b/examples/teapot/Cargo.toml @@ -9,7 +9,7 @@ name = "teapot" path = "main.rs" [dependencies] -cgmath = "0.18" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +cgmath = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/tessellation/Cargo.toml b/examples/tessellation/Cargo.toml index 18946449..9fb73369 100644 --- a/examples/tessellation/Cargo.toml +++ b/examples/tessellation/Cargo.toml @@ -9,6 +9,6 @@ name = "tessellation" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/texture-array/Cargo.toml b/examples/texture-array/Cargo.toml index 27f8360f..bf25ea8d 100644 --- a/examples/texture-array/Cargo.toml +++ b/examples/texture-array/Cargo.toml @@ -9,7 +9,7 @@ name = "texture-array" path = "main.rs" [dependencies] -png = "0.17" -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +png = { workspace = true } +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/triangle-v1_3/Cargo.toml b/examples/triangle-v1_3/Cargo.toml index 8182b07d..e6a5690c 100644 --- a/examples/triangle-v1_3/Cargo.toml +++ b/examples/triangle-v1_3/Cargo.toml @@ -9,6 +9,6 @@ name = "triangle-v1_3" path = "main.rs" [dependencies] -vulkano = { path = "../../vulkano" } -vulkano-shaders = { path = "../../vulkano-shaders" } -winit = "0.28" +vulkano = { workspace = true } +vulkano-shaders = { workspace = true } +winit = { workspace = true } diff --git a/examples/triangle/Cargo.toml b/examples/triangle/Cargo.toml index 89fef6e2..1b35e78a 100644 --- a/examples/triangle/Cargo.toml +++ b/examples/triangle/Cargo.toml @@ -10,9 +10,9 @@ path = "main.rs" [dependencies] # The `vulkano` crate is the main crate that you must use to use Vulkan. -vulkano = { path = "../../vulkano" } +vulkano = { workspace = true } # Provides the `shader!` macro that is used to generate code for using shaders. -vulkano-shaders = { path = "../../vulkano-shaders" } +vulkano-shaders = { workspace = true } # The Vulkan library doesn't provide any functionality to create and handle windows, as # this would be out of scope. In order to open a window, we are going to use the `winit` crate. -winit = "0.28" +winit = { workspace = true } diff --git a/vulkano-macros/Cargo.toml b/vulkano-macros/Cargo.toml index 1977f493..5f54724e 100644 --- a/vulkano-macros/Cargo.toml +++ b/vulkano-macros/Cargo.toml @@ -16,10 +16,10 @@ readme = "../README.md" proc-macro = true [dependencies] -syn = "1.0" -quote = "1.0" -proc-macro2 = "1.0" -proc-macro-crate = "1.2" +syn = { workspace = true } +quote = { workspace = true } +proc-macro2 = { workspace = true } +proc-macro-crate = { workspace = true } [dev-dependencies] -vulkano = { path = "../vulkano" } +vulkano = { workspace = true } diff --git a/vulkano-shaders/Cargo.toml b/vulkano-shaders/Cargo.toml index 670a9ac8..9b41c847 100644 --- a/vulkano-shaders/Cargo.toml +++ b/vulkano-shaders/Cargo.toml @@ -16,13 +16,13 @@ readme = "../README.md" proc-macro = true [dependencies] -ahash = "0.8" -heck = "0.4" -proc-macro2 = "1.0" -quote = "1.0" -shaderc = "0.8" -syn = { version = "2.0", features = ["full", "extra-traits"] } -vulkano = { version = "0.34.0", path = "../vulkano", default-features = false } +ahash = { workspace = true } +heck = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } +shaderc = { workspace = true } +syn = { workspace = true, features = ["full", "extra-traits"] } +vulkano = { workspace = true } [features] shaderc-build-from-source = ["shaderc/build-from-source"] diff --git a/vulkano-util/Cargo.toml b/vulkano-util/Cargo.toml index 7be81521..7c3fe37a 100644 --- a/vulkano-util/Cargo.toml +++ b/vulkano-util/Cargo.toml @@ -13,6 +13,6 @@ categories = ["rendering::graphics-api"] readme = "../README.md" [dependencies] -ahash = "0.8" -vulkano = { version = "0.34.0", path = "../vulkano", default-features = false } -winit = { version = "0.28" } +ahash = { workspace = true } +vulkano = { workspace = true } +winit = { workspace = true } diff --git a/vulkano-win/Cargo.toml b/vulkano-win/Cargo.toml index 3de1dbf5..c3bb8d35 100644 --- a/vulkano-win/Cargo.toml +++ b/vulkano-win/Cargo.toml @@ -19,9 +19,12 @@ raw-window-handle_ = ["dep:raw-window-handle"] winit = ["dep:winit", "dep:objc", "dep:core-graphics-types"] winit_ = ["dep:winit", "dep:objc", "dep:core-graphics-types"] +# NOTE(Marc): The dependencies here are not workspace dependencies because vulkano-win is +# deprecated and won't be receiving updates. + [dependencies] raw-window-handle = { version = "0.5", optional = true } -vulkano = { version = "0.34.0", path = "../vulkano", default-features = false } +vulkano = { workspace = true } winit = { version = "0.28", optional = true } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] diff --git a/vulkano/Cargo.toml b/vulkano/Cargo.toml index 4a58a5d8..aeacb224 100644 --- a/vulkano/Cargo.toml +++ b/vulkano/Cargo.toml @@ -14,41 +14,39 @@ readme = "../README.md" build = "build.rs" [dependencies] -ahash = "0.8" -# When updating Ash, also update vk.xml to the same Vulkan patch version that Ash uses. -# All versions of vk.xml can be found at https://github.com/KhronosGroup/Vulkan-Headers/commits/main/registry/vk.xml. -ash = "^0.37.3" -bytemuck = { version = "1.9", features = ["min_const_generics"] } -crossbeam-queue = "0.3" -half = { version = "2", features = ["bytemuck"] } -libloading = "0.8" -once_cell = "1.17" -parking_lot = { version = "0.12", features = ["send_guard"] } -raw-window-handle = "0.5" -serde = { version = "1.0", optional = true } -smallvec = "1.8" -thread_local = "1.1" -vulkano-macros = { path = "../vulkano-macros", version = "0.34.0", optional = true } +ahash = { workspace = true } +ash = { workspace = true } +bytemuck = { workspace = true, features = ["min_const_generics"] } +crossbeam-queue = { workspace = true } +half = { workspace = true, features = ["bytemuck"] } +libloading = { workspace = true } +once_cell = { workspace = true } +parking_lot = { workspace = true, features = ["send_guard"] } +raw-window-handle = { workspace = true } +serde = { workspace = true, optional = true } +smallvec = { workspace = true } +thread_local = { workspace = true } +vulkano-macros = { workspace = true, optional = true } [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies] -objc = "0.2.5" -core-graphics-types = "0.1" +objc = { workspace = true } +core-graphics-types = { workspace = true } [build-dependencies] -ahash = "0.8" -heck = "0.4" -indexmap = "2.0" -once_cell = "1.16" -proc-macro2 = "1.0" -quote = "1.0" -regex = "1.8" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -vk-parse = "0.12" +ahash = { workspace = true } +heck = { workspace = true } +indexmap = { workspace = true } +once_cell = { workspace = true } +proc-macro2 = { workspace = true } +quote = { workspace = true } +regex = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +vk-parse = { workspace = true } [dev-dependencies] -cgmath = "0.18" -nalgebra = "0.32" +cgmath = { workspace = true } +nalgebra = { workspace = true } [features] default = ["macros"]