Skip to content

Commit 7b7dc75

Browse files
Firestar99LegNeato
authored andcommitted
move spirv-builder and spirv-std version declaration to a central place to minimize mismatches
1 parent 6e1e077 commit 7b7dc75

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ ouroboros = "0.18.5"
2525
spirv-builder = { version = "*", default-features = false }
2626

2727
[workspace]
28-
members = ["shaders"]
28+
members = ["shaders", "shared"]
2929

3030
[patch.crates-io]
3131
#spirv-builder = { path = "../rust-gpu/crates/spirv-builder" }

shaders/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
crate-type = ["dylib"]
99

1010
[dependencies]
11-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6e2c84d4fe64e32df4c060c5a7f3e35a32e45421" }
11+
spirv-std = { version = "*" }
1212
shared = { path = "../shared" }
1313

1414
[lints]

shared/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = []
55
edition = "2021"
66

77
[dependencies]
8-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6e2c84d4fe64e32df4c060c5a7f3e35a32e45421" }
8+
spirv-std = { version = "*" }
99
bytemuck = { version = "1.20.0", features = ["derive"] }
1010

1111
[lints]

shared/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ use core::f32::consts::PI;
88
use core::ops::{Add, Mul, Sub};
99
use spirv_std::glam::{vec2, vec3, vec4, Vec2, Vec3, Vec3A, Vec4};
1010

11-
#[cfg(target_arch = "spirv")]
12-
use spirv_std::spirv;
1311
// Note: This cfg is incorrect on its surface, it really should be "are we compiling with std", but
1412
// we tie #[no_std] above to the same condition, so it's fine.
1513
#[cfg(target_arch = "spirv")]

0 commit comments

Comments
 (0)