nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 00:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to glam 0.14 (#587)

Browse Source
This commit is contained in:
XAMPPRocky 2021-04-12 08:00:58 +02:00 committed by GitHub
parent 439dc5c6a1
commit aa444f007e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Cargo.lock generated
View File

@ -138,9 +138,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bimap"
version = "0.6.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f92b72b8f03128773278bf74418b9205f3d2a12c39a61f92395f47af390c32bf"
checksum = "50ae17cabbc8a38a1e3e4c1a6a664e9a09672dc14d0896fa8d865d3a5a446b07"
[[package]]
name = "bindgen"
@ -264,9 +264,9 @@ dependencies = [
[[package]]
name = "clang-sys"
version = "1.1.1"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1"
checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c"
dependencies = [
"glob",
"libc",
@ -1105,8 +1105,9 @@ dependencies = [
[[package]]
name = "glam"
version = "0.13.1"
source = "git+https://github.com/bitshifter/glam-rs.git?rev=52c2e4a#52c2e4a41bbe8b5aef2c41283ee860f9cd549750"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "333928d5eb103c5d4050533cec0384302db6be8ef7d3cebd30ec6a35350353da"
dependencies = [
"num-traits",
"spirv-std",
@ -1311,9 +1312,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
version = "0.2.91"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
[[package]]
name = "libloading"
@ -1352,9 +1353,9 @@ dependencies = [
[[package]]
name = "lock_api"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
dependencies = [
"scopeguard",
]
@ -1899,9 +1900,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.24"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
dependencies = [
"unicode-xid",
]
@ -2194,9 +2195,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "sdl2"
version = "0.34.3"
version = "0.34.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcbb85f4211627a7291c83434d6bbfa723e28dcaa53c7606087e3c61929e4b9c"
checksum = "505d7a6ef5f96289a6ec50fc8b65ec75f5571f0aa94fa6ea230f6b228fa05d57"
dependencies = [
"bitflags",
"lazy_static",
@ -2207,9 +2208,9 @@ dependencies = [
[[package]]
name = "sdl2-sys"
version = "0.34.3"
version = "0.34.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d81feded049b9c14eceb4a4f6d596a98cebbd59abdba949c5552a015466d33"
checksum = "4cb164f53dbcad111de976bbf1f3083d3fcdeda88da9cfa281c70822720ee3da"
dependencies = [
"cfg-if 0.1.10",
"cmake",
@ -2484,9 +2485,9 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.67"
version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
checksum = "f3a1d708c221c5a612956ef9f75b37e454e88d1f7b899fbd3a18d4252012d663"
dependencies = [
"proc-macro2",
"quote",
@ -2926,9 +2927,9 @@ dependencies = [
[[package]]
name = "wgpu"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c60007fc3748278a36b458d96f86105f43aa5f0e412b15a5f934950d61ec26a9"
checksum = "79a0a0a63fac9492cfaf6e7e4bdf9729c128f1e94124b9e4cbc4004b8cb6d1d8"
dependencies = [
"arrayvec",
"js-sys",
@ -2936,6 +2937,7 @@ dependencies = [
"parking_lot",
"raw-window-handle",
"smallvec",
"syn",
"tracing",
"wasm-bindgen",
"wasm-bindgen-futures",

1
Cargo.toml
View File

@ -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)

2
examples/shaders/shared/Cargo.toml
View File

@ -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"] }

5
tests/deps-helper/Cargo.toml
View File

@ -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"]