Skip to content

port to cargo-gpu with build script support #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Firestar99 merged 4 commits into from
Jun 22, 2025
Merged

port to cargo-gpu with build script support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97175cf
cargo-gpu: update rust-gpu version, prevent validation errors in late…
Firestar99 Jun 22, 2025
123f9a9
cargo-gpu: replace spirv-builder with cargo-gpu
Firestar99 May 15, 2025
19a3021
cargo-gpu: switch to stable toolchain
Firestar99 May 19, 2025
f6fe12d
cargo-gpu: fix warning
Firestar99 May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
620 changes: 339 additions & 281 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ rust-gpu-bindless-egui-shaders = { git = "https://github.com/Firestar99/rust-gpu
rust-gpu-bindless-macro-utils = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a" }
rust-gpu-bindless-macros = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a" }
rust-gpu-bindless-shaders = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a" }
rust-gpu-bindless-shader-builder = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a", default-features = false, features = ["use-compiled-tools"] }
rust-gpu-bindless-shader-builder = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a" }
rust-gpu-bindless-winit = { git = "https://github.com/Firestar99/rust-gpu-bindless.git", rev = "11b3cf34dea82cb063d84851988f2a1617e5144a" }

# vulkan
Expand All @@ -61,8 +61,8 @@ presser = "0.3.1"
winit = { version = "0.30" }

# rust-gpu
spirv-builder = { git = "https://github.com/rust-gpu/rust-gpu", rev = "ea25c7e71770ae4bd6446b83c5cdeee3fc5e295b", default-features = false }
spirv-std = { git = "https://github.com/rust-gpu/rust-gpu", rev = "ea25c7e71770ae4bd6446b83c5cdeee3fc5e295b", features = ["bytemuck"] }
cargo-gpu = { git = "https://github.com/rust-gpu/cargo-gpu", rev = "d097aa1cdcabb2f78b634f39614287b269000df4" }
spirv-std = { git = "https://github.com/rust-gpu/rust-gpu", rev = "e6d017d5504c4441a84edcc27f4eca61de6fc8cf", features = ["bytemuck"] }

# async
futures = "0.3"
Expand Down Expand Up @@ -138,12 +138,12 @@ rust-gpu-bindless-shaders = { path = "rust-gpu-bindless/crates/shaders" }
rust-gpu-bindless-shader-builder = { path = "rust-gpu-bindless/crates/shader-builder" }
rust-gpu-bindless-winit = { path = "rust-gpu-bindless/crates/winit" }

[patch.crates-io]
spirv-tools = { git = "https://github.com/Rust-GPU/spirv-tools-rs.git", rev = "611df9ddf98b94069293cf959e65987907fb7140" }


# Configuration to preprocess models from `models/build.rs` in release mode.
# The following is copied from rust-gpu workspace Cargo.toml, although with
# cargo-gpu we don't rely on it anymore for rustc_backend_spirv compilation.

# Following is copied from rust-gpu workspace cargo.toml
# Enable incremental by default in release mode.
[profile.release]
incremental = true
Expand Down
Loading