From e68eddd5f19a264456473e3cdace45df2944141c Mon Sep 17 00:00:00 2001 From: ilyas taouaou <146193882+ilyas-taouaou@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:07:28 +0100 Subject: [PATCH] Add vulkano macros feature to examples that needs it (#2408) * Add vulkano macros feature to example that needs it * Add Buffer::pair_from_iter to make it one step easier for staging data to the device * Revert "Add Buffer::pair_from_iter to make it one step easier for staging data to the device" This reverts commit a30b5c09257d8d9f4339080d133989a709fe0f47. --- examples/async-update/Cargo.toml | 2 +- examples/basic-compute-shader/Cargo.toml | 2 +- examples/buffer-allocator/Cargo.toml | 2 +- examples/deferred/Cargo.toml | 2 +- examples/dynamic-buffers/Cargo.toml | 2 +- examples/dynamic-local-size/Cargo.toml | 2 +- examples/gl-interop/Cargo.toml | 2 +- examples/image-self-copy-blit/Cargo.toml | 2 +- examples/image/Cargo.toml | 2 +- examples/immutable-sampler/Cargo.toml | 2 +- examples/indirect/Cargo.toml | 2 +- examples/instancing/Cargo.toml | 2 +- examples/interactive-fractal/Cargo.toml | 2 +- examples/msaa-renderpass/Cargo.toml | 2 +- examples/multi-window-game-of-life/Cargo.toml | 2 +- examples/multi-window/Cargo.toml | 2 +- examples/multiview/Cargo.toml | 2 +- examples/occlusion-query/Cargo.toml | 2 +- examples/pipeline-caching/Cargo.toml | 2 +- examples/push-constants/Cargo.toml | 2 +- examples/push-descriptors/Cargo.toml | 2 +- examples/runtime-array/Cargo.toml | 2 +- examples/self-copy-buffer/Cargo.toml | 2 +- examples/shader-include/Cargo.toml | 2 +- examples/shader-types-derive/Cargo.toml | 2 +- examples/shader-types-sharing/Cargo.toml | 2 +- examples/simple-particles/Cargo.toml | 2 +- examples/specialization-constants/Cargo.toml | 2 +- examples/teapot/Cargo.toml | 2 +- examples/tessellation/Cargo.toml | 2 +- examples/texture-array/Cargo.toml | 2 +- examples/triangle-v1_3/Cargo.toml | 2 +- examples/triangle/Cargo.toml | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/async-update/Cargo.toml b/examples/async-update/Cargo.toml index f46ffef1..2ba6c5cd 100644 --- a/examples/async-update/Cargo.toml +++ b/examples/async-update/Cargo.toml @@ -14,6 +14,6 @@ doc = false [dependencies] cgmath = { workspace = true } rand = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/basic-compute-shader/Cargo.toml b/examples/basic-compute-shader/Cargo.toml index 1d0a35a5..4684aebf 100644 --- a/examples/basic-compute-shader/Cargo.toml +++ b/examples/basic-compute-shader/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/buffer-allocator/Cargo.toml b/examples/buffer-allocator/Cargo.toml index 27729c4e..923f5199 100644 --- a/examples/buffer-allocator/Cargo.toml +++ b/examples/buffer-allocator/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/deferred/Cargo.toml b/examples/deferred/Cargo.toml index 71fe6e24..eed901d5 100644 --- a/examples/deferred/Cargo.toml +++ b/examples/deferred/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] cgmath = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/dynamic-buffers/Cargo.toml b/examples/dynamic-buffers/Cargo.toml index 256bccfd..367b14c7 100644 --- a/examples/dynamic-buffers/Cargo.toml +++ b/examples/dynamic-buffers/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/dynamic-local-size/Cargo.toml b/examples/dynamic-local-size/Cargo.toml index 65cef5ea..511f8311 100644 --- a/examples/dynamic-local-size/Cargo.toml +++ b/examples/dynamic-local-size/Cargo.toml @@ -13,5 +13,5 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/gl-interop/Cargo.toml b/examples/gl-interop/Cargo.toml index cde8da21..297244b2 100644 --- a/examples/gl-interop/Cargo.toml +++ b/examples/gl-interop/Cargo.toml @@ -13,7 +13,7 @@ doc = false [dependencies] glium = "0.32.1" -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } # Glium has still not been updated to the latest winit version diff --git a/examples/image-self-copy-blit/Cargo.toml b/examples/image-self-copy-blit/Cargo.toml index 0df636d6..41a35134 100644 --- a/examples/image-self-copy-blit/Cargo.toml +++ b/examples/image-self-copy-blit/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/image/Cargo.toml b/examples/image/Cargo.toml index 2273551b..fd0718c2 100644 --- a/examples/image/Cargo.toml +++ b/examples/image/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/immutable-sampler/Cargo.toml b/examples/immutable-sampler/Cargo.toml index 36d2c4c3..ac7e7139 100644 --- a/examples/immutable-sampler/Cargo.toml +++ b/examples/immutable-sampler/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/indirect/Cargo.toml b/examples/indirect/Cargo.toml index 8830bed5..c6a14fcb 100644 --- a/examples/indirect/Cargo.toml +++ b/examples/indirect/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/instancing/Cargo.toml b/examples/instancing/Cargo.toml index e0328a5c..46ec54ba 100644 --- a/examples/instancing/Cargo.toml +++ b/examples/instancing/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/interactive-fractal/Cargo.toml b/examples/interactive-fractal/Cargo.toml index 1bcddf04..7383f34f 100644 --- a/examples/interactive-fractal/Cargo.toml +++ b/examples/interactive-fractal/Cargo.toml @@ -14,7 +14,7 @@ doc = false [dependencies] cgmath = { workspace = true } rand = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } 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 e09e1fbb..9a7683da 100644 --- a/examples/msaa-renderpass/Cargo.toml +++ b/examples/msaa-renderpass/Cargo.toml @@ -13,5 +13,5 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } 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 9de6ddbb..36559513 100644 --- a/examples/multi-window-game-of-life/Cargo.toml +++ b/examples/multi-window-game-of-life/Cargo.toml @@ -14,7 +14,7 @@ doc = false [dependencies] cgmath = { workspace = true } rand = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } 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 942594a8..704d1895 100644 --- a/examples/multi-window/Cargo.toml +++ b/examples/multi-window/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/multiview/Cargo.toml b/examples/multiview/Cargo.toml index 260ecc60..67cbbb1d 100644 --- a/examples/multiview/Cargo.toml +++ b/examples/multiview/Cargo.toml @@ -13,5 +13,5 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/occlusion-query/Cargo.toml b/examples/occlusion-query/Cargo.toml index a23d4501..191105c6 100644 --- a/examples/occlusion-query/Cargo.toml +++ b/examples/occlusion-query/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/pipeline-caching/Cargo.toml b/examples/pipeline-caching/Cargo.toml index fc8f1ea8..b919c142 100644 --- a/examples/pipeline-caching/Cargo.toml +++ b/examples/pipeline-caching/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/push-constants/Cargo.toml b/examples/push-constants/Cargo.toml index 9e96a4ff..3c2aad51 100644 --- a/examples/push-constants/Cargo.toml +++ b/examples/push-constants/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/push-descriptors/Cargo.toml b/examples/push-descriptors/Cargo.toml index 88244873..2075a7d6 100644 --- a/examples/push-descriptors/Cargo.toml +++ b/examples/push-descriptors/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/runtime-array/Cargo.toml b/examples/runtime-array/Cargo.toml index 2dca244c..c89e0165 100644 --- a/examples/runtime-array/Cargo.toml +++ b/examples/runtime-array/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/self-copy-buffer/Cargo.toml b/examples/self-copy-buffer/Cargo.toml index c34603a4..2324a826 100644 --- a/examples/self-copy-buffer/Cargo.toml +++ b/examples/self-copy-buffer/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/shader-include/Cargo.toml b/examples/shader-include/Cargo.toml index 46a094d4..e46238f2 100644 --- a/examples/shader-include/Cargo.toml +++ b/examples/shader-include/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/shader-types-derive/Cargo.toml b/examples/shader-types-derive/Cargo.toml index d30170c6..cda3063d 100644 --- a/examples/shader-types-derive/Cargo.toml +++ b/examples/shader-types-derive/Cargo.toml @@ -14,6 +14,6 @@ doc = false [dependencies] ron = { workspace = true } serde = { workspace = true, features = ["derive"] } -vulkano = { workspace = true, features = ["serde"] } +vulkano = { workspace = true, features = ["serde", "macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/shader-types-sharing/Cargo.toml b/examples/shader-types-sharing/Cargo.toml index 66c737a8..53999492 100644 --- a/examples/shader-types-sharing/Cargo.toml +++ b/examples/shader-types-sharing/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/simple-particles/Cargo.toml b/examples/simple-particles/Cargo.toml index 0133c7ae..abe0fdd3 100644 --- a/examples/simple-particles/Cargo.toml +++ b/examples/simple-particles/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/specialization-constants/Cargo.toml b/examples/specialization-constants/Cargo.toml index b90174c4..06a968bd 100644 --- a/examples/specialization-constants/Cargo.toml +++ b/examples/specialization-constants/Cargo.toml @@ -12,5 +12,5 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } diff --git a/examples/teapot/Cargo.toml b/examples/teapot/Cargo.toml index 04e673bf..20a384ee 100644 --- a/examples/teapot/Cargo.toml +++ b/examples/teapot/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] cgmath = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/tessellation/Cargo.toml b/examples/tessellation/Cargo.toml index 0b1018f0..8693c308 100644 --- a/examples/tessellation/Cargo.toml +++ b/examples/tessellation/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/texture-array/Cargo.toml b/examples/texture-array/Cargo.toml index 5e59bdb1..40c9db46 100644 --- a/examples/texture-array/Cargo.toml +++ b/examples/texture-array/Cargo.toml @@ -13,6 +13,6 @@ doc = false [dependencies] png = { workspace = true } -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/triangle-v1_3/Cargo.toml b/examples/triangle-v1_3/Cargo.toml index 147d1b35..5da0f642 100644 --- a/examples/triangle-v1_3/Cargo.toml +++ b/examples/triangle-v1_3/Cargo.toml @@ -12,6 +12,6 @@ bench = false doc = false [dependencies] -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } vulkano-shaders = { workspace = true } winit = { workspace = true } diff --git a/examples/triangle/Cargo.toml b/examples/triangle/Cargo.toml index faac7819..c6fe0a10 100644 --- a/examples/triangle/Cargo.toml +++ b/examples/triangle/Cargo.toml @@ -13,7 +13,7 @@ doc = false [dependencies] # The `vulkano` crate is the main crate that you must use to use Vulkan. -vulkano = { workspace = true } +vulkano = { workspace = true, features = ["macros"] } # Provides the `shader!` macro that is used to generate code for using shaders. vulkano-shaders = { workspace = true } # The Vulkan library doesn't provide any functionality to create and handle windows, as