From deca6c0a31afbdba7c46f9589ca7aa51982f99ae Mon Sep 17 00:00:00 2001 From: Firestar99 Date: Sat, 26 Apr 2025 13:22:31 +0200 Subject: [PATCH] force `libm <=0.2.11`, as `0.2.12` has breaking changes --- Cargo.lock | 1 + Cargo.toml | 2 ++ crates/spirv-std/Cargo.toml | 1 + 3 files changed, 4 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 1826b00affe..bb709cad86f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2664,6 +2664,7 @@ dependencies = [ "bitflags 1.3.2", "bytemuck", "glam", + "libm", "num-traits", "spirv-std-macros", "spirv-std-types", diff --git a/Cargo.toml b/Cargo.toml index eab8a7d9b4b..13b1c0337f2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,6 +52,8 @@ tracing-subscriber = { version = "0.3.3", features = ["env-filter", "json"] } # External dependencies that need to be mentioned more than once. num-traits = { version = "0.2.15", default-features = false } glam = { version = ">=0.22, <=0.30", default-features = false } +# libm 0.2.12 is a breaking change with new intrinsics +libm = { version = ">=0.2.5, <=0.2.11", default-features = false } # Enable incremental by default in release mode. [profile.release] diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index 822223a52e5..d419f66c14a 100644 --- a/crates/spirv-std/Cargo.toml +++ b/crates/spirv-std/Cargo.toml @@ -19,6 +19,7 @@ bytemuck = { version = "1.18.0", features = ["derive"], optional = true } [target.'cfg(target_arch = "spirv")'.dependencies] num-traits = { workspace = true, features = ["libm"] } glam = { workspace = true, features = ["libm"] } +libm = { workspace = true } [target.'cfg(not(target_arch = "spirv"))'.dependencies] num-traits = { workspace = true, default-features = true }