Skip to content

support glam v0.34 #661

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 1 commit into from
Oct 6, 2026
Merged

support glam v0.34 #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- [PR#660](https://github.com/Rust-GPU/rust-gpu/pull/660) disallows `Vec3A` for SPIR-V intrinsics and asm. Migration: use Vec3 instead and convert back and forward with `Vec3::to_vec3a()` and `Vec3A::to_vec3()`.

### Added ⭐

- [PR#661](https://github.com/Rust-GPU/rust-gpu/pull/661) support glam v0.34

## [0.10.0](https://github.com/Rust-GPU/rust-gpu/compare/v0.10.0-alpha.1...v0.10.0) - 2026-10-01

Toolchain: `nightly-2026-07-03` (rustc 1.98.0)
Expand Down
11 changes: 11 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions crates/spirv-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spirv-std-types.workspace = true
spirv-std-macros.workspace = true
bitflags = "2.13.1"
bytemuck = { workspace = true, optional = true }
glam_0_34 = { package = "glam", version = "0.34.1", optional = true, default-features = false, features = ["u32", "i32", "f64"] }
glam_0_33 = { package = "glam", version = "0.33.0", optional = true, default-features = false, features = ["u32", "i32", "f64"] }
glam_0_32 = { package = "glam", version = "0.32.0", optional = true, default-features = false }
glam_0_31 = { package = "glam", version = "0.31.0", optional = true, default-features = false }
Expand All @@ -23,21 +24,24 @@ glam_0_30 = { package = "glam", version = "0.30.8", optional = true, default-fea
[target.'cfg(target_arch = "spirv")'.dependencies]
num-traits = { workspace = true, features = ["libm"] }
libm = { workspace = true }
glam_0_34 = { package = "glam", version = "0.34.1", optional = true, default-features = false, features = ["libm"] }
glam_0_33 = { package = "glam", version = "0.33.0", optional = true, default-features = false, features = ["libm"] }
glam_0_32 = { package = "glam", version = "0.32.0", optional = true, default-features = false, features = ["libm"] }
glam_0_31 = { package = "glam", version = "0.31.0", optional = true, default-features = false, features = ["libm"] }
glam_0_30 = { package = "glam", version = "0.30.8", optional = true, default-features = false, features = ["libm"] }

[target.'cfg(not(target_arch = "spirv"))'.dependencies]
num-traits = { workspace = true, default-features = true }
glam_0_34 = { package = "glam", version = "0.34.1", optional = true, default-features = false, features = ["std"] }
glam_0_33 = { package = "glam", version = "0.33.0", optional = true, default-features = false, features = ["std"] }
glam_0_32 = { package = "glam", version = "0.32.0", optional = true, default-features = false, features = ["std"] }
glam_0_31 = { package = "glam", version = "0.31.0", optional = true, default-features = false, features = ["std"] }
glam_0_30 = { package = "glam", version = "0.30.8", optional = true, default-features = false, features = ["std"] }

[features]
default = ["glam_0_33"]
bytemuck = ["dep:bytemuck", "bitflags/bytemuck", "glam_0_30?/bytemuck", "glam_0_31?/bytemuck", "glam_0_32?/bytemuck", "glam_0_33?/bytemuck"]
default = ["glam_0_34"]
bytemuck = ["dep:bytemuck", "bitflags/bytemuck", "glam_0_30?/bytemuck", "glam_0_31?/bytemuck", "glam_0_32?/bytemuck", "glam_0_33?/bytemuck", "glam_0_34?/bytemuck"]
glam_0_34 = ["dep:glam_0_34"]
glam_0_33 = ["dep:glam_0_33"]
glam_0_32 = ["dep:glam_0_32"]
glam_0_31 = ["dep:glam_0_31"]
Expand Down
3 changes: 3 additions & 0 deletions crates/spirv-std/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ pub use vector::*;
// Even though it doesn't immediately fail, enabling multiple glam features at the same time will lead to weirdness in
// downstream crates, as any traits in spirv_std will only be implemented on the most recent glam version.
cfg_select! {
feature = "glam_0_34" => {
pub use ::glam_0_34 as glam;
}
feature = "glam_0_33" => {
pub use ::glam_0_33 as glam;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/difftests/tests/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/difftests/tests/lang/abi/vector_layout/cpu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ scalar-math = ["glam/scalar-math"]
# GPU deps
[dependencies]
spirv-std.workspace = true
glam = { version = "0.33.0", default-features = false, features = ["all-types"] }
glam = { version = "0.34.1", default-features = false, features = ["all-types"] }
bytemuck.workspace = true

# CPU deps (for the test harness)
Expand Down
Loading