From 854f80c80404d8201d51e12a677b9845ac4a21dc Mon Sep 17 00:00:00 2001 From: Joel Nises Date: Mon, 29 May 2023 09:43:45 +0200 Subject: [PATCH 1/5] Update glam to 0.24 --- Cargo.lock | 6 +++--- crates/spirv-std/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f4c71dc5ab..b3ee18a022 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -934,11 +934,11 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glam" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" +checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3" dependencies = [ - "num-traits", + "libm", ] [[package]] diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index e38b9872f4..d9b8ed45d7 100644 --- a/crates/spirv-std/Cargo.toml +++ b/crates/spirv-std/Cargo.toml @@ -12,7 +12,7 @@ spirv-std-types.workspace = true spirv-std-macros.workspace = true bitflags = "1.2.1" num-traits = { version = "0.2.14", default-features = false, features = ["libm"] } -glam = { version = "0.22", default-features = false, features = ["libm"] } +glam = { version = "0.24", default-features = false, features = ["libm"] } [features] default = [] From b6bb7a06865cb7a6568273c1c408bebef6e7ec92 Mon Sep 17 00:00:00 2001 From: Joel Nises Date: Tue, 30 May 2023 09:03:15 +0200 Subject: [PATCH 2/5] Update crates/spirv-std/Cargo.toml Co-authored-by: Eduard-Mihai Burtescu --- crates/spirv-std/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index d9b8ed45d7..1c27cbeefe 100644 --- a/crates/spirv-std/Cargo.toml +++ b/crates/spirv-std/Cargo.toml @@ -11,7 +11,7 @@ repository.workspace = true spirv-std-types.workspace = true spirv-std-macros.workspace = true bitflags = "1.2.1" -num-traits = { version = "0.2.14", default-features = false, features = ["libm"] } +num-traits = { version = "0.2.15", default-features = false, features = ["libm"] } glam = { version = "0.24", default-features = false, features = ["libm"] } [features] From c18c39da0e7829d2e57018dc02893dd35d6dda2e Mon Sep 17 00:00:00 2001 From: Joel Nises Date: Tue, 30 May 2023 09:08:17 +0200 Subject: [PATCH 3/5] Use range for glam dependency --- Cargo.lock | 4 ++-- crates/spirv-std/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3ee18a022..76095898d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1544,9 +1544,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", "libm", diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index 1c27cbeefe..ba0a8809c1 100644 --- a/crates/spirv-std/Cargo.toml +++ b/crates/spirv-std/Cargo.toml @@ -12,7 +12,7 @@ spirv-std-types.workspace = true spirv-std-macros.workspace = true bitflags = "1.2.1" num-traits = { version = "0.2.15", default-features = false, features = ["libm"] } -glam = { version = "0.24", default-features = false, features = ["libm"] } +glam = { version = ">=0.22, <0.25", default-features = false, features = ["libm"] } [features] default = [] From be1755da0fdfec99e1e89008d780b68814b1d722 Mon Sep 17 00:00:00 2001 From: Joel Nises Date: Tue, 30 May 2023 09:20:16 +0200 Subject: [PATCH 4/5] Update changelog with glam requirements --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fc71b5725..b3afcd73b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed 🛠 +- [PR#1038](https://github.com/EmbarkStudios/rust-gpu/pull/1038) relaxed glam version requirements (>= 0.23, < 0.25). + ### Removed 🔥 - [PR#1052](https://github.com/EmbarkStudios/rust-gpu/pull/1052) removed `--no-spirt`, committing to SPIR-T as a mandatory part of the Rust-GPU compiler backend, From 0dc8ba2670acb8670af778b8577663ea43a5ac70 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Tue, 30 May 2023 10:27:48 +0300 Subject: [PATCH 5/5] Apply suggestions from code review --- CHANGELOG.md | 2 +- crates/spirv-std/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3afcd73b7..863ec8cefd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Changed 🛠 -- [PR#1038](https://github.com/EmbarkStudios/rust-gpu/pull/1038) relaxed glam version requirements (>= 0.23, < 0.25). +- [PR#1038](https://github.com/EmbarkStudios/rust-gpu/pull/1038) relaxed `glam` version requirements (from only `0.22`, to `>=0.22, <=0.24`) ### Removed 🔥 - [PR#1052](https://github.com/EmbarkStudios/rust-gpu/pull/1052) removed `--no-spirt`, diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index ba0a8809c1..2efdff6223 100644 --- a/crates/spirv-std/Cargo.toml +++ b/crates/spirv-std/Cargo.toml @@ -12,7 +12,7 @@ spirv-std-types.workspace = true spirv-std-macros.workspace = true bitflags = "1.2.1" num-traits = { version = "0.2.15", default-features = false, features = ["libm"] } -glam = { version = ">=0.22, <0.25", default-features = false, features = ["libm"] } +glam = { version = ">=0.22, <=0.24", default-features = false, features = ["libm"] } [features] default = []