Update to glam 0.14 (#587)

EmbarkStudios · May 3, 2021 · dfc8b81 · dfc8b81
1 parent 05f2934
commit dfc8b81
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,6 @@ codegen-units = 256
 [patch.crates-io]
 spirv-std = { path = "./crates/spirv-std" }
 spirv-std-macros = { path = "./crates/spirv-std-macros" }
-glam = { git = "https://github.com/bitshifter/glam-rs.git", rev ="52c2e4a" }
 # TODO: Remove once next version is released - needed to include these two PRs:
 # * Manishearth/compiletest-rs#240 (for handling SPIR-V extension across platforms)
 # * Manishearth/compiletest-rs#241 (for the `$TEST_BUILD_DIR` path normalization)

diff --git a/examples/shaders/shared/Cargo.toml b/examples/shaders/shared/Cargo.toml
@@ -9,4 +9,4 @@ publish = false
 [dependencies]
 spirv-std-macros = { path = "../../../crates/spirv-std-macros" }
 spirv-std = { path = "../../../crates/spirv-std" }
-glam = { version = "0.13", default-features = false, features = ["libm", "scalar-math"] }
+glam = { version = "0.14", default-features = false, features = ["libm", "scalar-math", "spirv-std"] }
diff --git a/tests/deps-helper/Cargo.toml b/tests/deps-helper/Cargo.toml
@@ -11,7 +11,6 @@ publish = false
 spirv-std = { path = "../../crates/spirv-std", features = ["const-generics"] }
 
 [dependencies.glam]
-git = "https://github.com/bitshifter/glam-rs.git"
-rev = "52c2e4a"
+version = "0.14"
 default-features = false
-features = ["libm", "scalar-math"]
+features = ["libm", "scalar-math", "spirv-std"]