colin/fdtd-coremem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runtime fix: update rust-toolchain and EmbarkStudios deps, switch from dylib => lib

Browse Source 
this resolves the issue where Nix builds would segfault when trying to
initialize wgpu -- *possibly* because of multiple dynamically linked
versions of LLVM sitting in the mix (hence, dylib => lib).
This commit is contained in:
colin
2022-07-04 04:25:35 -07:00
parent fa4075818d
commit 1acb4233ae
5 changed files with 50 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Cargo.lock generated
View File

@@ -325,8 +325,8 @@ dependencies = [
"rayon",
"serde",
"spirv-builder",
"spirv-std 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-std",
"spirv-std-macros",
"spirv_backend_lib",
"structopt",
"threadpool",
@@ -1748,7 +1748,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_codegen_spirv"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"ar",
"bimap",
@@ -1758,6 +1758,7 @@ dependencies = [
"num-traits",
"rspirv",
"rustc-demangle",
"rustc_codegen_spirv-types",
"sanitize-filename",
"serde",
"serde_json",
@@ -1766,6 +1767,15 @@ dependencies = [
"syn",
]
[[package]]
name = "rustc_codegen_spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"rspirv",
"serde",
]
[[package]]
name = "rustc_version"
version = "0.4.0"
@@ -1964,26 +1974,16 @@ dependencies = [
[[package]]
name = "spirv-builder"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"memchr",
"raw-string",
"rustc_codegen_spirv",
"rustc_codegen_spirv-types",
"serde",
"serde_json",
]
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"bitflags",
"num-traits",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
]
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
@@ -1992,19 +1992,8 @@ dependencies = [
"bitflags",
"glam",
"num-traits",
"spirv-std-macros 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
]
[[package]]
name = "spirv-std-macros"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"proc-macro2",
"quote",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b)",
"syn",
"spirv-std-macros",
"spirv-types",
]
[[package]]
@@ -2014,33 +2003,28 @@ source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb346
dependencies = [
"proc-macro2",
"quote",
"spirv-types 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-types",
"syn",
]
[[package]]
name = "spirv-tools"
version = "0.7.1"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47ffcd721c949125c13b1213a292477a2d82621512b094564bd918c3a1c7f7ff"
checksum = "ca7f0f689581589b0a31000317fa31257cb24d040227708718ebd9fedf5cdd2b"
dependencies = [
"spirv-tools-sys",
]
[[package]]
name = "spirv-tools-sys"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b967db819666ccf7a0373876321bfe852922edcc7f3e30e3a7668b02e1961119"
checksum = "2980b0b4b2a9b5edfeb1dc8a35e84aac07b9c6dcd2339cce004d9355fb62a59d"
dependencies = [
"cc",
]
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=31e3fdb09b60c33c611e8db53ed1970afc94aa2b#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
@@ -2050,7 +2034,7 @@ source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb346
name = "spirv_backend_lib"
version = "0.1.0"
dependencies = [
"spirv-std 0.4.0-alpha.12 (git+https://github.com/EmbarkStudios/rust-gpu)",
"spirv-std",
]
[[package]]

8
Cargo.toml
View File

@@ -5,7 +5,7 @@ authors = ["Colin <colin@uninsane.org>"]
edition = "2021"
[lib]
crate-type = ["dylib"]
crate-type = ["lib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -48,9 +48,9 @@ wgpu = "0.12"
# TODO: update to 0.13
# wgpu = { version = "0.13", features = ["spirv", "vulkan-portability"] } # MIT or Apache 2.0
# spirv-* is MIT or Apache 2.0
spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "31e3fdb09b60c33c611e8db53ed1970afc94aa2b", features = ["use-compiled-tools"] }
spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "31e3fdb09b60c33c611e8db53ed1970afc94aa2b" }
spirv-std-macros = { git = "https://github.com/EmbarkStudios/rust-gpu", rev = "31e3fdb09b60c33c611e8db53ed1970afc94aa2b" }
spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", features = ["use-compiled-tools"] }
spirv-std = { git = "https://github.com/EmbarkStudios/rust-gpu" }
spirv-std-macros = { git = "https://github.com/EmbarkStudios/rust-gpu" }
spirv_backend_lib = { path = "src/sim/spirv/spirv_backend_lib" }

2
rust-toolchain.toml
View File

@@ -1,5 +1,5 @@
[toolchain]
channel = "nightly-2022-01-13"
channel = "nightly-2022-04-11"
components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ]
targets = [ "x86_64-unknown-linux-gnu" ]
profile = "default"

44
src/sim/spirv/spirv_backend/Cargo.lock generated
View File

@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "autocfg"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "bitflags"
@@ -16,24 +16,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "glam"
version = "0.20.2"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4fa84eead97d5412b2a20aed4d66612a97a9e41e08eababdb9ae2bf88667490"
checksum = "f43e957e744be03f5801a55472f593d43fabdebf25a4585db250f04d86b1675f"
dependencies = [
"num-traits",
]
[[package]]
name = "libm"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db"
[[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",
@@ -41,18 +41,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.36"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
dependencies = [
"unicode-xid",
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.15"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
dependencies = [
"proc-macro2",
]
@@ -60,7 +60,7 @@ dependencies = [
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"bitflags",
"glam",
@@ -72,7 +72,7 @@ dependencies = [
[[package]]
name = "spirv-std-macros"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
dependencies = [
"proc-macro2",
"quote",
@@ -83,7 +83,7 @@ dependencies = [
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
source = "git+https://github.com/EmbarkStudios/rust-gpu#0866cf591a7fdbbd15bdb3468e192bb9b6189fd0"
[[package]]
name = "spirv_backend"
@@ -94,17 +94,17 @@ dependencies = [
[[package]]
name = "syn"
version = "1.0.86"
version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
"unicode-ident",
]
[[package]]
name = "unicode-xid"
version = "0.2.2"
name = "unicode-ident"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"

110
src/sim/spirv/spirv_backend_lib/Cargo.lock generated
View File

@@ -1,110 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "glam"
version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4fa84eead97d5412b2a20aed4d66612a97a9e41e08eababdb9ae2bf88667490"
dependencies = [
"num-traits",
]
[[package]]
name = "libm"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a"
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
"libm",
]
[[package]]
name = "proc-macro2"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
dependencies = [
"proc-macro2",
]
[[package]]
name = "spirv-std"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"bitflags",
"glam",
"num-traits",
"spirv-std-macros",
"spirv-types",
]
[[package]]
name = "spirv-std-macros"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
dependencies = [
"proc-macro2",
"quote",
"spirv-types",
"syn",
]
[[package]]
name = "spirv-types"
version = "0.4.0-alpha.12"
source = "git+https://github.com/EmbarkStudios/rust-gpu#31e3fdb09b60c33c611e8db53ed1970afc94aa2b"
[[package]]
name = "spirv_backend_lib"
version = "0.1.0"
dependencies = [
"spirv-std",
]
[[package]]
name = "syn"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "unicode-xid"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"