diff --git a/Cargo.lock b/Cargo.lock
index 27d310c..d8566d6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,12 +90,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "bimap"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b"
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -169,9 +163,9 @@ checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
 
 [[package]]
 name = "bytemuck"
-version = "1.12.1"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
@@ -304,7 +298,7 @@ dependencies = [
  "futures",
  "image",
  "imageproc",
- "indexmap",
+ "indexmap 1.9.1",
  "log",
  "more-asserts",
  "ndarray",
@@ -547,6 +541,16 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
 
+[[package]]
+name = "elsa"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
+dependencies = [
+ "indexmap 2.7.0",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.9.1"
@@ -560,6 +564,12 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "exr"
 version = "1.5.1"
@@ -841,6 +851,12 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -918,6 +934,16 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+]
+
 [[package]]
 name = "inplace_it"
 version = "0.3.5"
@@ -1147,7 +1173,7 @@ dependencies = [
  "bitflags",
  "codespan-reporting",
  "hexf-parse",
- "indexmap",
+ "indexmap 1.9.1",
  "log",
  "num-traits",
  "rustc-hash",
@@ -1701,13 +1727,13 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_codegen_spirv"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 dependencies = [
  "ar",
- "bimap",
+ "either",
  "hashbrown 0.11.2",
- "indexmap",
+ "indexmap 1.9.1",
  "libc",
  "num-traits",
  "once_cell",
@@ -1719,14 +1745,15 @@ dependencies = [
  "serde",
  "serde_json",
  "smallvec",
+ "spirt",
  "spirv-tools",
  "syn",
 ]
 
 [[package]]
 name = "rustc_codegen_spirv-types"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 dependencies = [
  "rspirv",
  "serde",
@@ -1895,6 +1922,9 @@ name = "smallvec"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "spin"
@@ -1905,6 +1935,24 @@ dependencies = [
  "lock_api",
 ]
 
+[[package]]
+name = "spirt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06834ebbbbc6f86448fd5dc7ccbac80e36f52f8d66838683752e19d3cae9a459"
+dependencies = [
+ "arrayvec",
+ "bytemuck",
+ "elsa",
+ "indexmap 1.9.1",
+ "itertools",
+ "lazy_static",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "smallvec",
+]
+
 [[package]]
 name = "spirv"
 version = "0.2.0+1.5.4"
@@ -1917,8 +1965,8 @@ dependencies = [
 
 [[package]]
 name = "spirv-builder"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 dependencies = [
  "memchr",
  "raw-string",
@@ -1930,8 +1978,8 @@ dependencies = [
 
 [[package]]
 name = "spirv-std"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 dependencies = [
  "bitflags",
  "glam",
@@ -1942,8 +1990,8 @@ dependencies = [
 
 [[package]]
 name = "spirv-std-macros"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1953,8 +2001,8 @@ dependencies = [
 
 [[package]]
 name = "spirv-std-types"
-version = "0.4.0-alpha.15"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0#dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0"
+version = "0.4.0"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=86d6042204e4c0f9ab04120155636d714037fadc#86d6042204e4c0f9ab04120155636d714037fadc"
 
 [[package]]
 name = "spirv-tools"
@@ -2000,6 +2048,12 @@ dependencies = [
  "coremem",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "stacked_cores"
 version = "0.1.0"
diff --git a/crates/coremem/Cargo.toml b/crates/coremem/Cargo.toml
index 2e7f5c1..574d95f 100644
--- a/crates/coremem/Cargo.toml
+++ b/crates/coremem/Cargo.toml
@@ -37,9 +37,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/Rust-GPU/rust-gpu", rev = "dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0", features = ["use-compiled-tools"] }
-spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0" }
-spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0" }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["use-compiled-tools"] }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc" }
+spirv-std-macros = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc" }
 spirv_backend = { path = "../spirv_backend" }
 spirv_backend_runner = { path = "../spirv_backend_runner" }
 coremem_cross = { path = "../cross", features = ["iter", "fmt", "serde", "std"] }
diff --git a/crates/spirv_backend/Cargo.toml b/crates/spirv_backend/Cargo.toml
index 9c5c7c9..eee99fe 100644
--- a/crates/spirv_backend/Cargo.toml
+++ b/crates/spirv_backend/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 crate-type = ["dylib", "lib"]
 
 [dependencies]
-spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0", features = ["glam"] }  # MIT or Apache 2.0
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["glam"] }  # MIT or Apache 2.0
 coremem_cross = { path = "../cross" }
diff --git a/crates/spirv_backend_builder/Cargo.toml b/crates/spirv_backend_builder/Cargo.toml
index a1c5699..5d00d9e 100644
--- a/crates/spirv_backend_builder/Cargo.toml
+++ b/crates/spirv_backend_builder/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Colin <colin@uninsane.org>"]
 edition = "2021"
 
 [dependencies]
-spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "dcf37b75a7f9e7a94f52c8a3a5d93af795e34cd0", features = ["use-compiled-tools"] }
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "86d6042204e4c0f9ab04120155636d714037fadc", features = ["use-compiled-tools"] }
 
 # these deps are to satisfy internal rustc stuff, since spirv-builder links into rustc internals (HACK).
 # this needs to match the rustc lock file -- not just its Cargo.toml -- so we pin down to the patch level
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index ecac634..fc8ffba 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2022-09-25"
+channel = "nightly-2022-12-18"
 components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ]
 targets = [ "x86_64-unknown-linux-gnu" ]
 profile = "default"