Skip to content

Commit c16ec2f

Browse files
Firestar99Firestar99
committed
wgpu: add wgpu dependency
1 parent 767e58e commit c16ec2f

File tree

12 files changed

+450
-18
lines changed

12 files changed

+450
-18
lines changed

‎Cargo.lock‎

Lines changed: 371 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generated/graphics/ash/cargo-gpu/Cargo.toml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ repository = ""
1616
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
1717

1818
[workspace.dependencies]
19+
# API
20+
ash = "0.38"
21+
ash-window = "0.13"
22+
23+
# rust-gpu
1924
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0c7b0013eceddd23b5d7cee68f4cc" }
2025
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2126

27+
# other
2228
glam = { version = "0.30.9", default-features = false }
2329
bytemuck = { version = "1.24.0", features = ["derive"] }
24-
ash = "0.38"
25-
ash-window = "0.13"
2630
raw-window-handle = "0.6.2"
2731
winit = "0.30.0"
2832
cfg-if = "1.0.0"

‎generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ repository.workspace = true
1111
workspace = true
1212

1313
[dependencies]
14+
# shader crate
1415
mygraphics-shaders = { path = "../mygraphics-shaders" }
1516

17+
# API
1618
ash.workspace = true
1719
ash-window.workspace = true
20+
21+
# other
1822
raw-window-handle.workspace = true
1923
winit.workspace = true
2024
anyhow.workspace = true
2125
bytemuck.workspace = true
2226

2327
[build-dependencies]
28+
# rust-gpu
2429
cargo-gpu.workspace = true
30+
31+
# other
2532
anyhow.workspace = true

‎generated/graphics/ash/spirv-builder/Cargo.toml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ repository = ""
1616
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
1717

1818
[workspace.dependencies]
19+
# API
20+
ash = "0.38"
21+
ash-window = "0.13"
22+
23+
# rust-gpu
1924
# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
2025
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2126
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2227

28+
# other
2329
glam = { version = "0.30.9", default-features = false }
2430
bytemuck = { version = "1.24.0", features = ["derive"] }
25-
ash = "0.38"
26-
ash-window = "0.13"
2731
raw-window-handle = "0.6.2"
2832
winit = "0.30.0"
2933
cfg-if = "1.0.0"

‎generated/graphics/ash/spirv-builder/mygraphics/Cargo.toml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,22 @@ default = ["use-compiled-tools"]
1515
use-installed-tools = ["spirv-builder/use-installed-tools"]
1616
use-compiled-tools = ["spirv-builder/use-compiled-tools"]
1717
[dependencies]
18+
# shader crate
1819
mygraphics-shaders = { path = "../mygraphics-shaders" }
1920

21+
# API
2022
ash.workspace = true
2123
ash-window.workspace = true
24+
25+
# other
2226
raw-window-handle.workspace = true
2327
winit.workspace = true
2428
anyhow.workspace = true
2529
bytemuck.workspace = true
2630

2731
[build-dependencies]
32+
# rust-gpu
2833
spirv-builder.workspace = true
34+
35+
# other
2936
anyhow.workspace = true

‎generated/graphics/wgpu/cargo-gpu/Cargo.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ repository = ""
1616
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
1717

1818
[workspace.dependencies]
19+
# API
20+
wgpu = { version = "27.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "vulkan-portability", "spirv", "wgsl"] }
21+
22+
# rust-gpu
1923
cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0c7b0013eceddd23b5d7cee68f4cc" }
2024
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2125

26+
# other
2227
glam = { version = "0.30.9", default-features = false }
2328
bytemuck = { version = "1.24.0", features = ["derive"] }
24-
ash = "0.38"
25-
ash-window = "0.13"
2629
raw-window-handle = "0.6.2"
2730
winit = "0.30.0"
2831
cfg-if = "1.0.0"

‎generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,21 @@ repository.workspace = true
1111
workspace = true
1212

1313
[dependencies]
14+
# shader crate
1415
mygraphics-shaders = { path = "../mygraphics-shaders" }
1516

16-
ash.workspace = true
17-
ash-window.workspace = true
17+
# API
18+
wgpu.workspace = true
19+
20+
# other
1821
raw-window-handle.workspace = true
1922
winit.workspace = true
2023
anyhow.workspace = true
2124
bytemuck.workspace = true
2225

2326
[build-dependencies]
27+
# rust-gpu
2428
cargo-gpu.workspace = true
29+
30+
# other
2531
anyhow.workspace = true

‎generated/graphics/wgpu/spirv-builder/Cargo.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ repository = ""
1616
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
1717

1818
[workspace.dependencies]
19+
# API
20+
wgpu = { version = "27.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "vulkan-portability", "spirv", "wgsl"] }
21+
22+
# rust-gpu
1923
# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
2024
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2125
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2226

27+
# other
2328
glam = { version = "0.30.9", default-features = false }
2429
bytemuck = { version = "1.24.0", features = ["derive"] }
25-
ash = "0.38"
26-
ash-window = "0.13"
2730
raw-window-handle = "0.6.2"
2831
winit = "0.30.0"
2932
cfg-if = "1.0.0"

‎generated/graphics/wgpu/spirv-builder/mygraphics/Cargo.toml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@ default = ["use-compiled-tools"]
1515
use-installed-tools = ["spirv-builder/use-installed-tools"]
1616
use-compiled-tools = ["spirv-builder/use-compiled-tools"]
1717
[dependencies]
18+
# shader crate
1819
mygraphics-shaders = { path = "../mygraphics-shaders" }
1920

20-
ash.workspace = true
21-
ash-window.workspace = true
21+
# API
22+
wgpu.workspace = true
23+
24+
# other
2225
raw-window-handle.workspace = true
2326
winit.workspace = true
2427
anyhow.workspace = true
2528
bytemuck.workspace = true
2629

2730
[build-dependencies]
31+
# rust-gpu
2832
spirv-builder.workspace = true
33+
34+
# other
2935
anyhow.workspace = true

‎graphics/Cargo.toml.liquid‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ repository = ""
1616
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
1717

1818
[workspace.dependencies]
19+
# API
20+
{% if api == "ash" -%}
21+
ash = "0.38"
22+
ash-window = "0.13"
23+
{%- endif -%}
24+
{%- if api == "wgpu" -%}
25+
wgpu = { version = "27.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "vulkan-portability", "spirv", "wgsl"] }
26+
{%- endif %}
27+
28+
# rust-gpu
1929
{% if integration == "spirv-builder" -%}
2030
# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
2131
spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
@@ -25,10 +35,9 @@ cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0
2535
{% endif -%}
2636
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
2737

38+
# other
2839
glam = { version = "0.30.9", default-features = false }
2940
bytemuck = { version = "1.24.0", features = ["derive"] }
30-
ash = "0.38"
31-
ash-window = "0.13"
3241
raw-window-handle = "0.6.2"
3342
winit = "0.30.0"
3443
cfg-if = "1.0.0"

0 commit comments

Comments
 (0)