Skip to content

Commit

Permalink
vulkano-util: do not pull the default winit features (#2533)
Browse files Browse the repository at this point in the history
This allows a downstream user to set which winit features to use, possibly
sparing a lot of dependencies from being pulled and compiled.

Co-authored-by: Rua <ruawhitepaw@gmail.com>
  • Loading branch information
grego and Rua authored Jun 30, 2024
1 parent 0773648 commit 252329c
Show file tree
Hide file tree
Showing 29 changed files with 370 additions and 372 deletions.
686 changes: 342 additions & 344 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ smallvec = "1.8"
syn = "2.0"
thread_local = "1.1"
vk-parse = "0.12"
winit = "0.29"
winit = { version = "0.29", default-features = false }

# Only used in examples
glam = "0.25"
Expand Down
2 changes: 1 addition & 1 deletion examples/async-update/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ glam = { workspace = true }
rand = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/buffer-allocator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/clear-attachments/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ doc = false

[dependencies]
vulkano = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/deferred/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
glam = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/gl-interop/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ doc = false
glium = "0.32.1"
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
# Glium has still not been updated to the latest winit version
winit_glium = { package = "winit", version = "0.27.1" }
2 changes: 1 addition & 1 deletion examples/image-self-copy-blit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/image/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/immutable-sampler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/indirect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/instancing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/interactive-fractal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ rand = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
vulkano-util = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/mesh-shader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/multi-window-game-of-life/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ rand = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
vulkano-util = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/multi-window/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/occlusion-query/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/offscreen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/push-descriptors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/runtime-array/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/runtime-shader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ doc = false

[dependencies]
vulkano = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/shader-types-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ ron = { workspace = true }
serde = { workspace = true, features = ["derive"] }
vulkano = { workspace = true, features = ["serde", "macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/simple-particles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/teapot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
glam = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/tessellation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/texture-array/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ doc = false
png = { workspace = true }
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/triangle-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ vulkano-shaders = { workspace = true }
vulkano-util = { 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 = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/triangle-v1_3/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ doc = false
[dependencies]
vulkano = { workspace = true, features = ["macros"] }
vulkano-shaders = { workspace = true }
winit = { workspace = true }
winit = { workspace = true, default-features = true }
2 changes: 1 addition & 1 deletion examples/triangle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ vulkano = { workspace = true, features = ["macros"] }
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 = { workspace = true }
winit = { workspace = true, default-features = true }

0 comments on commit 252329c

Please sign in to comment.