diff --git a/Cargo.lock b/Cargo.lock
index 5ec373d75d5d..35ca11e64a72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3553,13 +3553,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "spirv_cross"
-version = "0.16.0"
-source = "git+https://github.com/kvark/spirv_cross?branch=wgpu#636677bad724797789239c16e6d332e9b4d97b86"
+name = "spirv-cross-internal"
+version = "0.1.0"
+source = "git+https://github.com/kvark/spirv_cross?branch=wgpu#9cb4de489bf80b2b23efffe5a79afb7db6247ba4"
 dependencies = [
  "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "spirv_cross"
+version = "0.16.0"
+source = "git+https://github.com/kvark/spirv_cross?branch=wgpu#9cb4de489bf80b2b23efffe5a79afb7db6247ba4"
+dependencies = [
+ "spirv-cross-internal 0.1.0 (git+https://github.com/kvark/spirv_cross?branch=wgpu)",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.0.0"
@@ -4905,6 +4913,7 @@ dependencies = [
 "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
 "checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
 "checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9"
+"checksum spirv-cross-internal 0.1.0 (git+https://github.com/kvark/spirv_cross?branch=wgpu)" = "<none>"
 "checksum spirv_cross 0.16.0 (git+https://github.com/kvark/spirv_cross?branch=wgpu)" = "<none>"
 "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
 "checksum storage-map 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0a4829a5c591dc24a944a736d6b1e4053e51339a79fd5d4702c4c999a9c45e"
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
index 74bb74ab6e39..22ec83a7f3eb 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -47,26 +47,16 @@ ifeq (1,$(MOZ_PARALLEL_BUILD))
 cargo_build_flags += -j1
 endif
 
-rustflags_lto = -Clto
-# Disable LTO when linking gkrust_gtest.
-ifneq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-rustflags_lto =
-endif
-# Disable LTO when linking for macOS with fuzzing for now,
-# see https://github.com/rust-lang/rust/issues/66285
-ifdef FUZZING_INTERFACES
-ifeq ($(OS_ARCH), Darwin)
-rustflags_lto =
-endif
-endif
-
 # These flags are passed via `cargo rustc` and only apply to the final rustc
 # invocation (i.e., only the top-level crate, not its dependencies).
 cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
 ifndef DEVELOPER_OPTIONS
 ifndef MOZ_DEBUG_RUST
-# Enable link-time optimization for release builds
-cargo_rustc_flags += $(rustflags_lto)
+# Enable link-time optimization for release builds, but not when linking
+# gkrust_gtest.
+ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+cargo_rustc_flags += -Clto
+endif
 endif
 endif
 
diff --git a/third_party/rust/spirv-cross-internal/.cargo-checksum.json b/third_party/rust/spirv-cross-internal/.cargo-checksum.json
new file mode 100644
index 000000000000..33ae53f24742
--- /dev/null
+++ b/third_party/rust/spirv-cross-internal/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"306d77fae1e434cea201d7f9b9f5a5b22c9322d089c89bc0ef5c0f8a70a4b578","build.rs":"975dd26cbee3c1987ed658e38fe2211224320ce7943d6ef7bd2735425280e89a","src/bindings_native.rs":"d999b7a89c4ab7f2b839995bac1cda77f63142c4fff3b6f6764e27dec774b45c","src/bindings_wasm.rs":"fce9a87f0af3d700e673cba68a771329e6a4841b9f048db5b5d648f83f6062b6","src/bindings_wasm_functions.rs":"3ea541791b3ea8f4881d813070c83549d0ee5e701d158a53942af415d42e7c6f","src/compiler.rs":"647370c53e95aacfd5f3c8b01821eb420630289cd66b5cfdc8f4f2d47dee90aa","src/emscripten.rs":"3169890001970610013026468739910afca0d85e00d7e34beadfdd31bbcbeeb7","src/glsl.rs":"0a80523899d168796a623d6ac1f65b0422843ec0bb29c6fe1bb5cb837ceee163","src/hlsl.rs":"f6b5a61e00cbabef4c64eda2640229ea82b130f4254d36d32dda7ced357cc213","src/lib.rs":"cc41cbbe48f3e96791ba5338c66fa1fe0e533eaed6bbdced3f008d5e9fe6c6ce","src/msl.rs":"a62d5a7d65fa0bc6d1e24db2c2ec11b850c0a1b5da7a71669e63f5639f064bc9","src/ptr_util.rs":"280404beede469b2c9ae40536323515a9213dac5d30014fac870a23b37672442","src/spirv.rs":"5dd16eb7402e70122459318ba9ac5aecda12837ed13ca5240d2e3c8611b67cbf","src/vendor/SPIRV-Cross/.clang-format":"9ec4314e20afecad827a2dbd4832256be8464e88aab4a53fab45173ed129b2ed","src/vendor/SPIRV-Cross/.gitignore":"7f23cc92ddb5e1f584447e98d3e8ab6543fc182f1543f0f6ec29856f9250cdd6","src/vendor/SPIRV-Cross/CMakeLists.txt":"a2a76ecacf1a0620e7a1c044c18fbe7210b4f9384cb8fd03095739f25b3d4f40","src/vendor/SPIRV-Cross/GLSL.std.450.h":"20f32378793c5f416bc0704f44345c2a14c99cba3f411e3beaf1bcea372d58ba","src/vendor/SPIRV-Cross/LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","src/vendor/SPIRV-Cross/Makefile":"e2255d32e47d447b100ce3cd0753d0758dc26460e0440d14cc157d4caf9b62f1","src/vendor/SPIRV-Cross/cmake/gitversion.in.h":"75408b8a0cf86d6cf3e59d840c26ab28d3bda48f0c7f30001082a5ddf05d4184","src/vendor/SPIRV-Cross/format_all.sh":"7682215b1a669cd5a574489b3918e4009942b30a69f43d46bf68bd32a81ed399","src/vendor/SPIRV-Cross/gn/BUILD.gn":"340a042ebd24a9cdeb756b22627701a8df085349660645e4eac8531dd0024010","src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp":"bb796625e89f75e239e92f9a61597d421ffe5fb1902d200691ebe95cf856a1f8","src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h":"cdceda962d87133e44989510edc944e99052d713869b406a8b6b2d54e3d02dd7","src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp":"681d0964b144c5009424196a8bc832cb81cfe5df5b91c2f3e1bfb625765a0c50","src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp":"ab8851e5708b944a9bf340ce17297d94bef4876d30c833ea83d44b16f60726f6","src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp":"ee7c48bda908d1a5153acc6157afb35f3c66a84179ad6dea1adfdaa791a58b03","src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp":"70d9e0400f62de71d3775972eadc196ddb218254fa8155e8e33daf8d99957cc0","src/vendor/SPIRV-Cross/main.cpp":"059dca8074ec16a981c38449959d102b1b30983bccd80989ff91dc21e5105a74","src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in":"cf4c55760569e296c5c2a0e306bb1af83272fb48a8d8ae1877b2196720129529","src/vendor/SPIRV-Cross/spirv.h":"7c2f6af34455c96957bad8a2d67197fbc6693308579d45e9740b5a9c330ca84a","src/vendor/SPIRV-Cross/spirv.hpp":"d937d4016e2fb8fca62838e0dec9f70d551751eaff07155f060750822373bc8b","src/vendor/SPIRV-Cross/spirv_cfg.cpp":"a7b47c8d05f96a9a51ac5a5d9d24cce65ea0661110ea499caf885a4dc0aa0bf4","src/vendor/SPIRV-Cross/spirv_cfg.hpp":"c803177e728e62e90856596d62b036c93d4a99dfc86edf597ea9597f0fbff8ea","src/vendor/SPIRV-Cross/spirv_common.hpp":"713ef166de2ac85b6a327110f98f21354dc6b4e8a112e0f3aa34543b2f5f36fc","src/vendor/SPIRV-Cross/spirv_cpp.cpp":"3cef3b9df5a5a5acc2aedc0ac6440a54c4afbd503c0281e7f8c9e123479188f9","src/vendor/SPIRV-Cross/spirv_cpp.hpp":"50f3704eb9b33f63284fcde37ee58859de83bdd19b87665bc410da3b7c952bfb","src/vendor/SPIRV-Cross/spirv_cross.cpp":"1b3d1d13b71b7c53d894d12ca1f6a22aa283d003c533df931a92b7ef202ab7b2","src/vendor/SPIRV-Cross/spirv_cross.hpp":"50558c0314234a9f438821f2ac4dc3a4e3489a3ab0df17dd5558e6ff8f0d79c3","src/vendor/SPIRV-Cross/spirv_cross_c.cpp":"ab4d72758f71c0f1c57a7412d91418850a2380bc57f2caa018e13e6a8918db84","src/vendor/SPIRV-Cross/spirv_cross_c.h":"6a98ccb6b9e6f366cb137a448134f19feba7929c543bf8acec86ab98da20e9f8","src/vendor/SPIRV-Cross/spirv_cross_containers.hpp":"5058178cb018420fc7ebb33a50bb1dabebe3dbd2e848560a1b22f0c618b81d08","src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp":"bf8b9a0a2f8b15db6e4fc87373f6ab437f772b546e2643c6edb3ec28ae8c10a9","src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp":"addf8ee2a81f731ecf0000a3bbf324fff463e8fb93f018d0f8ae99607c25da16","src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp":"a1e78ba7bade737b4b25e73119846ef0a5618025830f68292a2feef0f3718d3a","src/vendor/SPIRV-Cross/spirv_cross_util.cpp":"6d4126ab19c0754240b9d567565efcec20cf99c792c91c622b75a9395552e009","src/vendor/SPIRV-Cross/spirv_cross_util.hpp":"85139cbc86ae9cb93a5d25d398f109c142f1f646f86425bd51d89e0486506e4d","src/vendor/SPIRV-Cross/spirv_glsl.cpp":"f0c3e917b809c28b6d372f58b1ac6997c2cc7888e724af108c12ee4ebbe22723","src/vendor/SPIRV-Cross/spirv_glsl.hpp":"69fb8349964dbab7f1c2f1725b6329d0461968309778de069a7d6f8377cff11e","src/vendor/SPIRV-Cross/spirv_hlsl.cpp":"6bef1d3b301e55317da71afc911296d1d4e6dc1957b51cb5384e39a14a0d255d","src/vendor/SPIRV-Cross/spirv_hlsl.hpp":"199d1d677750b67964579e6abd33eefce90437813256138b2e0c4c41cc183e05","src/vendor/SPIRV-Cross/spirv_msl.cpp":"3e06f8ac4117e630b1b998d1b95f2594ef67ece4d51c124796d3f1bba3036239","src/vendor/SPIRV-Cross/spirv_msl.hpp":"95e53f03e124fd01bb450733e938666750d69c87451797c82ac8e1155a910978","src/vendor/SPIRV-Cross/spirv_parser.cpp":"76d5a9a9237a5fd6fd682a5562578d3cb2b27d0911cfb3df93e2b2c70011a8d7","src/vendor/SPIRV-Cross/spirv_parser.hpp":"b2dbbb6ba4e7fc774f9d6071e3f1765ee0824548f1732d65ebfc06b060426520","src/vendor/SPIRV-Cross/spirv_reflect.cpp":"22b0f0621afb953ba24143db4d2362c0677cd9bb2f6d7b010d0be39c5ed282f6","src/vendor/SPIRV-Cross/spirv_reflect.hpp":"35e7858287f94d865a4785e87ba9b4ab849b52ffc818801d13086ab304c9dca3","src/wrapper.cpp":"8a6bc6ed9c7916f13e4c940a51daa6ff8501e39265b0a56bcfc8ff7c60d0ba6a","src/wrapper.hpp":"c20bc6645e3041e608e3c0d3f7233c631e032485159deb0ea21f327fb0f7cd3e","tests/common/mod.rs":"2843bf104c7938d93065f7b5688c9f063ad9e5720c407c737aedc5f2dee5a80f","tests/glsl_tests.rs":"4983dec4551531d187dec6d277fdcd4d45d41def34f5afc6486f8ce627316583","tests/hlsl_tests.rs":"346842860dd6b1036584fff20192a725475f2252638152766fcff6aba6b75e06","tests/msl_tests.rs":"211d3b9cb43455a4c55bd619c05acdd21953358580c50ae75cac3f06eb26c5dd","tests/shaders/array.vert":"d0dab7ddea131e069961054f40a164602448aa78720b7ff480e141d1f7b0b2d6","tests/shaders/array.vert.spv":"8e44421590ade1716be66ad39f60fb1ce58eedeab8f0806335a7369687b308b1","tests/shaders/rasterize_disabled.vert":"da6de172549830216933c44edf18b13113d7ca87462e3d09ad50dfc9c9836821","tests/shaders/rasterize_disabled.vert.spv":"2ba809eb500ed6e5a067389ccc056551e796e7019517593d110fb62c9dca2056","tests/shaders/sampler.frag":"4c568e65176afe596dd8ef279485e992607e94d612786214ae1c6702d0322e1f","tests/shaders/sampler.frag.spv":"bd7bd1973a82dcfdf5755361fa4dd420fdf1c32c5de0a6f0896a8d5971f98684","tests/shaders/simple.vert":"ea143c97dff5ef03728b96b2dd893bdc59d56651581ecf9fe50f10807b0efdd0","tests/shaders/simple.vert.spv":"a2b5094ffd76288e0d08c37ce0351e28f20bb6d80ddd73fc44a71c1c7cbbf7db","tests/shaders/specialization.comp":"ce32fa1615737209f2e465ea347d79030ddcb33a88c38447e7cde7dffc920163","tests/shaders/specialization.comp.spv":"848604e37b870b8999692b266677be2ce0df6ce38093a0d81e6bc43d0bdf8a3f","tests/shaders/struct.frag":"d8840bb1961d6f14609b00ee54406c1e3ea31cecd8231b77cfb73d28b71910c0","tests/shaders/struct.frag.spv":"774aa886374eb95abf9bb7d0045ee77d97e26529e9ec96b90991a515fdbca4be","tests/shaders/struct.vert":"9299cda83ddb5b5c3d95ab0d057e4df2af137dfd92d6c4d3e96295b7d42e29a1","tests/shaders/struct.vert.spv":"4a82bdee72616ac058bc60d4255efa3e78199a2b8597570c013bebbee7107fb7","tests/shaders/workgroup.comp":"478044b5392e0d1fb042253d71ea6bf7b8a014af4a6ee35d8db4c5343ac69739","tests/shaders/workgroup.comp.spv":"72f636fe3d1d6d0c5963f71bf4349c7e40d544331b33b6b64fb5b65784e6abee","tests/spirv_tests.rs":"fe711deea874de5a1daf1759e4d88c014700f6d06e244288f1eac1a37c54e2ff"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/spirv-cross-internal/Cargo.toml b/third_party/rust/spirv-cross-internal/Cargo.toml
new file mode 100644
index 000000000000..3a6f1ed3487e
--- /dev/null
+++ b/third_party/rust/spirv-cross-internal/Cargo.toml
@@ -0,0 +1,25 @@
+# the name has to not be a prefix to any modules!
+[package]
+name = "spirv-cross-internal"
+version = "0.1.0"
+authors = ["Joshua Groves <josh@joshgroves.com>"]
+description = "Safe wrapper around SPIRV-Cross"
+license = "MIT/Apache-2.0"
+homepage = "https://github.com/grovesNL/spirv_cross"
+repository = "https://github.com/grovesNL/spirv_cross"
+readme = "../README.md"
+keywords = ["spirv", "cross"]
+build = "build.rs"
+edition = "2018"
+
+[lib]
+crate-type = ["rlib"]
+
+[features]
+default = []
+glsl = []
+hlsl = []
+msl = []
+
+[target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
+cc = "1.0.4"
diff --git a/third_party/rust/spirv_cross/build.rs b/third_party/rust/spirv-cross-internal/build.rs
similarity index 100%
rename from third_party/rust/spirv_cross/build.rs
rename to third_party/rust/spirv-cross-internal/build.rs
diff --git a/third_party/rust/spirv_cross/src/bindings_native.rs b/third_party/rust/spirv-cross-internal/src/bindings_native.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/bindings_native.rs
rename to third_party/rust/spirv-cross-internal/src/bindings_native.rs
diff --git a/third_party/rust/spirv_cross/src/bindings_wasm.rs b/third_party/rust/spirv-cross-internal/src/bindings_wasm.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/bindings_wasm.rs
rename to third_party/rust/spirv-cross-internal/src/bindings_wasm.rs
diff --git a/third_party/rust/spirv_cross/src/bindings_wasm_functions.rs b/third_party/rust/spirv-cross-internal/src/bindings_wasm_functions.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/bindings_wasm_functions.rs
rename to third_party/rust/spirv-cross-internal/src/bindings_wasm_functions.rs
diff --git a/third_party/rust/spirv_cross/src/compiler.rs b/third_party/rust/spirv-cross-internal/src/compiler.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/compiler.rs
rename to third_party/rust/spirv-cross-internal/src/compiler.rs
diff --git a/third_party/rust/spirv_cross/src/emscripten.rs b/third_party/rust/spirv-cross-internal/src/emscripten.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/emscripten.rs
rename to third_party/rust/spirv-cross-internal/src/emscripten.rs
diff --git a/third_party/rust/spirv_cross/src/glsl.rs b/third_party/rust/spirv-cross-internal/src/glsl.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/glsl.rs
rename to third_party/rust/spirv-cross-internal/src/glsl.rs
diff --git a/third_party/rust/spirv_cross/src/hlsl.rs b/third_party/rust/spirv-cross-internal/src/hlsl.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/hlsl.rs
rename to third_party/rust/spirv-cross-internal/src/hlsl.rs
diff --git a/third_party/rust/spirv_cross/src/lib.rs b/third_party/rust/spirv-cross-internal/src/lib.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/lib.rs
rename to third_party/rust/spirv-cross-internal/src/lib.rs
diff --git a/third_party/rust/spirv_cross/src/msl.rs b/third_party/rust/spirv-cross-internal/src/msl.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/msl.rs
rename to third_party/rust/spirv-cross-internal/src/msl.rs
diff --git a/third_party/rust/spirv_cross/src/ptr_util.rs b/third_party/rust/spirv-cross-internal/src/ptr_util.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/ptr_util.rs
rename to third_party/rust/spirv-cross-internal/src/ptr_util.rs
diff --git a/third_party/rust/spirv_cross/src/spirv.rs b/third_party/rust/spirv-cross-internal/src/spirv.rs
similarity index 100%
rename from third_party/rust/spirv_cross/src/spirv.rs
rename to third_party/rust/spirv-cross-internal/src/spirv.rs
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/.clang-format b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/.clang-format
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/.clang-format
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/.clang-format
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/.gitignore b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/.gitignore
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/.gitignore
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/.gitignore
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/CMakeLists.txt b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/CMakeLists.txt
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/CMakeLists.txt
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/CMakeLists.txt
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/GLSL.std.450.h b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/GLSL.std.450.h
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/GLSL.std.450.h
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/GLSL.std.450.h
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/LICENSE b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/LICENSE
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/LICENSE
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/LICENSE
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/Makefile b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/Makefile
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/Makefile
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/Makefile
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/cmake/gitversion.in.h b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/cmake/gitversion.in.h
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/cmake/gitversion.in.h
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/cmake/gitversion.in.h
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/format_all.sh b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/format_all.sh
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/format_all.sh
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/format_all.sh
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/gn/BUILD.gn b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/gn/BUILD.gn
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/gn/BUILD.gn
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/gn/BUILD.gn
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/main.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/main.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/main.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/main.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv.h b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv.h
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv.h
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv.h
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cfg.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cfg.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cfg.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cfg.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cfg.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cfg.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cfg.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cfg.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_common.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_common.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_common.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_common.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cpp.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cpp.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cpp.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cpp.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cpp.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cpp.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cpp.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cpp.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_c.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_c.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_c.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_c.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_c.h b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_c.h
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_c.h
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_c.h
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_containers.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_containers.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_containers.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_containers.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_util.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_util.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_util.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_util.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_util.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_util.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_cross_util.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_cross_util.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_glsl.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_glsl.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_glsl.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_glsl.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_glsl.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_glsl.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_glsl.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_glsl.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_hlsl.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_hlsl.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_hlsl.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_hlsl.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_hlsl.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_hlsl.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_hlsl.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_hlsl.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_msl.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_msl.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_msl.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_msl.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_msl.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_msl.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_msl.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_msl.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_parser.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_parser.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_parser.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_parser.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_parser.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_parser.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_parser.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_parser.hpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_reflect.cpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_reflect.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_reflect.cpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_reflect.cpp
diff --git a/third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_reflect.hpp b/third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_reflect.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/vendor/SPIRV-Cross/spirv_reflect.hpp
rename to third_party/rust/spirv-cross-internal/src/vendor/SPIRV-Cross/spirv_reflect.hpp
diff --git a/third_party/rust/spirv_cross/src/wrapper.cpp b/third_party/rust/spirv-cross-internal/src/wrapper.cpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/wrapper.cpp
rename to third_party/rust/spirv-cross-internal/src/wrapper.cpp
diff --git a/third_party/rust/spirv_cross/src/wrapper.hpp b/third_party/rust/spirv-cross-internal/src/wrapper.hpp
similarity index 100%
rename from third_party/rust/spirv_cross/src/wrapper.hpp
rename to third_party/rust/spirv-cross-internal/src/wrapper.hpp
diff --git a/third_party/rust/spirv_cross/tests/common/mod.rs b/third_party/rust/spirv-cross-internal/tests/common/mod.rs
similarity index 100%
rename from third_party/rust/spirv_cross/tests/common/mod.rs
rename to third_party/rust/spirv-cross-internal/tests/common/mod.rs
diff --git a/third_party/rust/spirv_cross/tests/glsl_tests.rs b/third_party/rust/spirv-cross-internal/tests/glsl_tests.rs
similarity index 98%
rename from third_party/rust/spirv_cross/tests/glsl_tests.rs
rename to third_party/rust/spirv-cross-internal/tests/glsl_tests.rs
index e62e21c4291d..bb6e069f1968 100644
--- a/third_party/rust/spirv_cross/tests/glsl_tests.rs
+++ b/third_party/rust/spirv-cross-internal/tests/glsl_tests.rs
@@ -1,4 +1,4 @@
-use spirv_cross::{glsl, spirv};
+use spirv_cross_internal::{glsl, spirv};
 
 mod common;
 use crate::common::words_from_bytes;
@@ -49,7 +49,7 @@ void main()
 
 #[test]
 fn ast_compiles_all_versions_to_glsl() {
-    use spirv_cross::glsl::Version::*;
+    use spirv_cross_internal::glsl::Version::*;
 
     let module =
         spirv::Module::from_words(words_from_bytes(include_bytes!("shaders/simple.vert.spv")));
diff --git a/third_party/rust/spirv_cross/tests/hlsl_tests.rs b/third_party/rust/spirv-cross-internal/tests/hlsl_tests.rs
similarity index 98%
rename from third_party/rust/spirv_cross/tests/hlsl_tests.rs
rename to third_party/rust/spirv-cross-internal/tests/hlsl_tests.rs
index fc9a3c73f44c..c88754cea6ff 100644
--- a/third_party/rust/spirv_cross/tests/hlsl_tests.rs
+++ b/third_party/rust/spirv-cross-internal/tests/hlsl_tests.rs
@@ -1,4 +1,4 @@
-use spirv_cross::{hlsl, spirv};
+use spirv_cross_internal::{hlsl, spirv};
 
 mod common;
 use crate::common::words_from_bytes;
diff --git a/third_party/rust/spirv_cross/tests/msl_tests.rs b/third_party/rust/spirv-cross-internal/tests/msl_tests.rs
similarity index 97%
rename from third_party/rust/spirv_cross/tests/msl_tests.rs
rename to third_party/rust/spirv-cross-internal/tests/msl_tests.rs
index 56649e2ade6a..2b138b4f4b64 100644
--- a/third_party/rust/spirv_cross/tests/msl_tests.rs
+++ b/third_party/rust/spirv-cross-internal/tests/msl_tests.rs
@@ -1,4 +1,4 @@
-use spirv_cross::{msl, spirv};
+use spirv_cross_internal::{msl, spirv};
 
 use std::collections::BTreeMap;
 
@@ -257,18 +257,18 @@ fn sets_argument_buffer_index() {
         spirv::Module::from_words(words_from_bytes(include_bytes!("shaders/sampler.frag.spv")));
     let mut ast = spirv::Ast::<msl::Target>::parse(&module).unwrap();
     let mut resource_binding_overrides = BTreeMap::new();
-    resource_binding_overrides.insert(spirv_cross::msl::ResourceBindingLocation {
+    resource_binding_overrides.insert(msl::ResourceBindingLocation {
         stage: spirv::ExecutionModel::Fragment,
         desc_set: 0,
         binding: msl::ARGUMENT_BUFFER_BINDING,
-    }, spirv_cross::msl::ResourceBinding {
+    }, msl::ResourceBinding {
         buffer_id: 2,
         texture_id: 0,
         sampler_id: 0,
     });
     let compiler_options = msl::CompilerOptions {
         resource_binding_overrides,
-        version: spirv_cross::msl::Version::V2_0,
+        version: msl::Version::V2_0,
         enable_argument_buffers: true,
         ..Default::default()
     };
diff --git a/third_party/rust/spirv_cross/tests/shaders/array.vert b/third_party/rust/spirv-cross-internal/tests/shaders/array.vert
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/array.vert
rename to third_party/rust/spirv-cross-internal/tests/shaders/array.vert
diff --git a/third_party/rust/spirv_cross/tests/shaders/array.vert.spv b/third_party/rust/spirv-cross-internal/tests/shaders/array.vert.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/array.vert.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/array.vert.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/rasterize_disabled.vert b/third_party/rust/spirv-cross-internal/tests/shaders/rasterize_disabled.vert
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/rasterize_disabled.vert
rename to third_party/rust/spirv-cross-internal/tests/shaders/rasterize_disabled.vert
diff --git a/third_party/rust/spirv_cross/tests/shaders/rasterize_disabled.vert.spv b/third_party/rust/spirv-cross-internal/tests/shaders/rasterize_disabled.vert.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/rasterize_disabled.vert.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/rasterize_disabled.vert.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/sampler.frag b/third_party/rust/spirv-cross-internal/tests/shaders/sampler.frag
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/sampler.frag
rename to third_party/rust/spirv-cross-internal/tests/shaders/sampler.frag
diff --git a/third_party/rust/spirv_cross/tests/shaders/sampler.frag.spv b/third_party/rust/spirv-cross-internal/tests/shaders/sampler.frag.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/sampler.frag.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/sampler.frag.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/simple.vert b/third_party/rust/spirv-cross-internal/tests/shaders/simple.vert
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/simple.vert
rename to third_party/rust/spirv-cross-internal/tests/shaders/simple.vert
diff --git a/third_party/rust/spirv_cross/tests/shaders/simple.vert.spv b/third_party/rust/spirv-cross-internal/tests/shaders/simple.vert.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/simple.vert.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/simple.vert.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/specialization.comp b/third_party/rust/spirv-cross-internal/tests/shaders/specialization.comp
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/specialization.comp
rename to third_party/rust/spirv-cross-internal/tests/shaders/specialization.comp
diff --git a/third_party/rust/spirv_cross/tests/shaders/specialization.comp.spv b/third_party/rust/spirv-cross-internal/tests/shaders/specialization.comp.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/specialization.comp.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/specialization.comp.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/struct.frag b/third_party/rust/spirv-cross-internal/tests/shaders/struct.frag
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/struct.frag
rename to third_party/rust/spirv-cross-internal/tests/shaders/struct.frag
diff --git a/third_party/rust/spirv_cross/tests/shaders/struct.frag.spv b/third_party/rust/spirv-cross-internal/tests/shaders/struct.frag.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/struct.frag.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/struct.frag.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/struct.vert b/third_party/rust/spirv-cross-internal/tests/shaders/struct.vert
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/struct.vert
rename to third_party/rust/spirv-cross-internal/tests/shaders/struct.vert
diff --git a/third_party/rust/spirv_cross/tests/shaders/struct.vert.spv b/third_party/rust/spirv-cross-internal/tests/shaders/struct.vert.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/struct.vert.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/struct.vert.spv
diff --git a/third_party/rust/spirv_cross/tests/shaders/workgroup.comp b/third_party/rust/spirv-cross-internal/tests/shaders/workgroup.comp
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/workgroup.comp
rename to third_party/rust/spirv-cross-internal/tests/shaders/workgroup.comp
diff --git a/third_party/rust/spirv_cross/tests/shaders/workgroup.comp.spv b/third_party/rust/spirv-cross-internal/tests/shaders/workgroup.comp.spv
similarity index 100%
rename from third_party/rust/spirv_cross/tests/shaders/workgroup.comp.spv
rename to third_party/rust/spirv-cross-internal/tests/shaders/workgroup.comp.spv
diff --git a/third_party/rust/spirv_cross/tests/spirv_tests.rs b/third_party/rust/spirv-cross-internal/tests/spirv_tests.rs
similarity index 99%
rename from third_party/rust/spirv_cross/tests/spirv_tests.rs
rename to third_party/rust/spirv-cross-internal/tests/spirv_tests.rs
index 2f0c0e7ffd8f..216c798052ed 100644
--- a/third_party/rust/spirv_cross/tests/spirv_tests.rs
+++ b/third_party/rust/spirv-cross-internal/tests/spirv_tests.rs
@@ -1,4 +1,4 @@
-use spirv_cross::{hlsl as lang, spirv};
+use spirv_cross_internal::{hlsl as lang, spirv};
 
 mod common;
 use crate::common::words_from_bytes;
diff --git a/third_party/rust/spirv_cross/.cargo-checksum.json b/third_party/rust/spirv_cross/.cargo-checksum.json
index 01919d6eac47..3ee85576360e 100644
--- a/third_party/rust/spirv_cross/.cargo-checksum.json
+++ b/third_party/rust/spirv_cross/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"8e60146336b8a4501f075c7f5f784ea426f10df4c1d5d48301d043908f025c81","build.rs":"975dd26cbee3c1987ed658e38fe2211224320ce7943d6ef7bd2735425280e89a","src/bindings_native.rs":"d999b7a89c4ab7f2b839995bac1cda77f63142c4fff3b6f6764e27dec774b45c","src/bindings_wasm.rs":"fce9a87f0af3d700e673cba68a771329e6a4841b9f048db5b5d648f83f6062b6","src/bindings_wasm_functions.rs":"3ea541791b3ea8f4881d813070c83549d0ee5e701d158a53942af415d42e7c6f","src/compiler.rs":"647370c53e95aacfd5f3c8b01821eb420630289cd66b5cfdc8f4f2d47dee90aa","src/emscripten.rs":"3169890001970610013026468739910afca0d85e00d7e34beadfdd31bbcbeeb7","src/glsl.rs":"0a80523899d168796a623d6ac1f65b0422843ec0bb29c6fe1bb5cb837ceee163","src/hlsl.rs":"f6b5a61e00cbabef4c64eda2640229ea82b130f4254d36d32dda7ced357cc213","src/lib.rs":"cc41cbbe48f3e96791ba5338c66fa1fe0e533eaed6bbdced3f008d5e9fe6c6ce","src/msl.rs":"a62d5a7d65fa0bc6d1e24db2c2ec11b850c0a1b5da7a71669e63f5639f064bc9","src/ptr_util.rs":"280404beede469b2c9ae40536323515a9213dac5d30014fac870a23b37672442","src/spirv.rs":"5dd16eb7402e70122459318ba9ac5aecda12837ed13ca5240d2e3c8611b67cbf","src/vendor/SPIRV-Cross/.clang-format":"9ec4314e20afecad827a2dbd4832256be8464e88aab4a53fab45173ed129b2ed","src/vendor/SPIRV-Cross/.gitignore":"7f23cc92ddb5e1f584447e98d3e8ab6543fc182f1543f0f6ec29856f9250cdd6","src/vendor/SPIRV-Cross/CMakeLists.txt":"a2a76ecacf1a0620e7a1c044c18fbe7210b4f9384cb8fd03095739f25b3d4f40","src/vendor/SPIRV-Cross/GLSL.std.450.h":"20f32378793c5f416bc0704f44345c2a14c99cba3f411e3beaf1bcea372d58ba","src/vendor/SPIRV-Cross/LICENSE":"cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30","src/vendor/SPIRV-Cross/Makefile":"e2255d32e47d447b100ce3cd0753d0758dc26460e0440d14cc157d4caf9b62f1","src/vendor/SPIRV-Cross/cmake/gitversion.in.h":"75408b8a0cf86d6cf3e59d840c26ab28d3bda48f0c7f30001082a5ddf05d4184","src/vendor/SPIRV-Cross/format_all.sh":"7682215b1a669cd5a574489b3918e4009942b30a69f43d46bf68bd32a81ed399","src/vendor/SPIRV-Cross/gn/BUILD.gn":"340a042ebd24a9cdeb756b22627701a8df085349660645e4eac8531dd0024010","src/vendor/SPIRV-Cross/include/spirv_cross/barrier.hpp":"bb796625e89f75e239e92f9a61597d421ffe5fb1902d200691ebe95cf856a1f8","src/vendor/SPIRV-Cross/include/spirv_cross/external_interface.h":"cdceda962d87133e44989510edc944e99052d713869b406a8b6b2d54e3d02dd7","src/vendor/SPIRV-Cross/include/spirv_cross/image.hpp":"681d0964b144c5009424196a8bc832cb81cfe5df5b91c2f3e1bfb625765a0c50","src/vendor/SPIRV-Cross/include/spirv_cross/internal_interface.hpp":"ab8851e5708b944a9bf340ce17297d94bef4876d30c833ea83d44b16f60726f6","src/vendor/SPIRV-Cross/include/spirv_cross/sampler.hpp":"ee7c48bda908d1a5153acc6157afb35f3c66a84179ad6dea1adfdaa791a58b03","src/vendor/SPIRV-Cross/include/spirv_cross/thread_group.hpp":"70d9e0400f62de71d3775972eadc196ddb218254fa8155e8e33daf8d99957cc0","src/vendor/SPIRV-Cross/main.cpp":"059dca8074ec16a981c38449959d102b1b30983bccd80989ff91dc21e5105a74","src/vendor/SPIRV-Cross/pkg-config/spirv-cross-c-shared.pc.in":"cf4c55760569e296c5c2a0e306bb1af83272fb48a8d8ae1877b2196720129529","src/vendor/SPIRV-Cross/spirv.h":"7c2f6af34455c96957bad8a2d67197fbc6693308579d45e9740b5a9c330ca84a","src/vendor/SPIRV-Cross/spirv.hpp":"d937d4016e2fb8fca62838e0dec9f70d551751eaff07155f060750822373bc8b","src/vendor/SPIRV-Cross/spirv_cfg.cpp":"a7b47c8d05f96a9a51ac5a5d9d24cce65ea0661110ea499caf885a4dc0aa0bf4","src/vendor/SPIRV-Cross/spirv_cfg.hpp":"c803177e728e62e90856596d62b036c93d4a99dfc86edf597ea9597f0fbff8ea","src/vendor/SPIRV-Cross/spirv_common.hpp":"713ef166de2ac85b6a327110f98f21354dc6b4e8a112e0f3aa34543b2f5f36fc","src/vendor/SPIRV-Cross/spirv_cpp.cpp":"3cef3b9df5a5a5acc2aedc0ac6440a54c4afbd503c0281e7f8c9e123479188f9","src/vendor/SPIRV-Cross/spirv_cpp.hpp":"50f3704eb9b33f63284fcde37ee58859de83bdd19b87665bc410da3b7c952bfb","src/vendor/SPIRV-Cross/spirv_cross.cpp":"1b3d1d13b71b7c53d894d12ca1f6a22aa283d003c533df931a92b7ef202ab7b2","src/vendor/SPIRV-Cross/spirv_cross.hpp":"50558c0314234a9f438821f2ac4dc3a4e3489a3ab0df17dd5558e6ff8f0d79c3","src/vendor/SPIRV-Cross/spirv_cross_c.cpp":"ab4d72758f71c0f1c57a7412d91418850a2380bc57f2caa018e13e6a8918db84","src/vendor/SPIRV-Cross/spirv_cross_c.h":"6a98ccb6b9e6f366cb137a448134f19feba7929c543bf8acec86ab98da20e9f8","src/vendor/SPIRV-Cross/spirv_cross_containers.hpp":"5058178cb018420fc7ebb33a50bb1dabebe3dbd2e848560a1b22f0c618b81d08","src/vendor/SPIRV-Cross/spirv_cross_error_handling.hpp":"bf8b9a0a2f8b15db6e4fc87373f6ab437f772b546e2643c6edb3ec28ae8c10a9","src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.cpp":"addf8ee2a81f731ecf0000a3bbf324fff463e8fb93f018d0f8ae99607c25da16","src/vendor/SPIRV-Cross/spirv_cross_parsed_ir.hpp":"a1e78ba7bade737b4b25e73119846ef0a5618025830f68292a2feef0f3718d3a","src/vendor/SPIRV-Cross/spirv_cross_util.cpp":"6d4126ab19c0754240b9d567565efcec20cf99c792c91c622b75a9395552e009","src/vendor/SPIRV-Cross/spirv_cross_util.hpp":"85139cbc86ae9cb93a5d25d398f109c142f1f646f86425bd51d89e0486506e4d","src/vendor/SPIRV-Cross/spirv_glsl.cpp":"f0c3e917b809c28b6d372f58b1ac6997c2cc7888e724af108c12ee4ebbe22723","src/vendor/SPIRV-Cross/spirv_glsl.hpp":"69fb8349964dbab7f1c2f1725b6329d0461968309778de069a7d6f8377cff11e","src/vendor/SPIRV-Cross/spirv_hlsl.cpp":"6bef1d3b301e55317da71afc911296d1d4e6dc1957b51cb5384e39a14a0d255d","src/vendor/SPIRV-Cross/spirv_hlsl.hpp":"199d1d677750b67964579e6abd33eefce90437813256138b2e0c4c41cc183e05","src/vendor/SPIRV-Cross/spirv_msl.cpp":"3e06f8ac4117e630b1b998d1b95f2594ef67ece4d51c124796d3f1bba3036239","src/vendor/SPIRV-Cross/spirv_msl.hpp":"95e53f03e124fd01bb450733e938666750d69c87451797c82ac8e1155a910978","src/vendor/SPIRV-Cross/spirv_parser.cpp":"76d5a9a9237a5fd6fd682a5562578d3cb2b27d0911cfb3df93e2b2c70011a8d7","src/vendor/SPIRV-Cross/spirv_parser.hpp":"b2dbbb6ba4e7fc774f9d6071e3f1765ee0824548f1732d65ebfc06b060426520","src/vendor/SPIRV-Cross/spirv_reflect.cpp":"22b0f0621afb953ba24143db4d2362c0677cd9bb2f6d7b010d0be39c5ed282f6","src/vendor/SPIRV-Cross/spirv_reflect.hpp":"35e7858287f94d865a4785e87ba9b4ab849b52ffc818801d13086ab304c9dca3","src/wrapper.cpp":"8a6bc6ed9c7916f13e4c940a51daa6ff8501e39265b0a56bcfc8ff7c60d0ba6a","src/wrapper.hpp":"c20bc6645e3041e608e3c0d3f7233c631e032485159deb0ea21f327fb0f7cd3e","tests/common/mod.rs":"2843bf104c7938d93065f7b5688c9f063ad9e5720c407c737aedc5f2dee5a80f","tests/glsl_tests.rs":"89bba5a10b48ee2117485c31d37e7d96be09efbcc86ce7edfa80f0b5e30d97f6","tests/hlsl_tests.rs":"1e535461e3a1a1395a43890e12e3f4bbf947d2880238f7e71f9e52920808d014","tests/msl_tests.rs":"995fea74bb8548b0c50b5689c8b370cd032d6805f1ad33332a09d28cdeba7a30","tests/shaders/array.vert":"d0dab7ddea131e069961054f40a164602448aa78720b7ff480e141d1f7b0b2d6","tests/shaders/array.vert.spv":"8e44421590ade1716be66ad39f60fb1ce58eedeab8f0806335a7369687b308b1","tests/shaders/rasterize_disabled.vert":"da6de172549830216933c44edf18b13113d7ca87462e3d09ad50dfc9c9836821","tests/shaders/rasterize_disabled.vert.spv":"2ba809eb500ed6e5a067389ccc056551e796e7019517593d110fb62c9dca2056","tests/shaders/sampler.frag":"4c568e65176afe596dd8ef279485e992607e94d612786214ae1c6702d0322e1f","tests/shaders/sampler.frag.spv":"bd7bd1973a82dcfdf5755361fa4dd420fdf1c32c5de0a6f0896a8d5971f98684","tests/shaders/simple.vert":"ea143c97dff5ef03728b96b2dd893bdc59d56651581ecf9fe50f10807b0efdd0","tests/shaders/simple.vert.spv":"a2b5094ffd76288e0d08c37ce0351e28f20bb6d80ddd73fc44a71c1c7cbbf7db","tests/shaders/specialization.comp":"ce32fa1615737209f2e465ea347d79030ddcb33a88c38447e7cde7dffc920163","tests/shaders/specialization.comp.spv":"848604e37b870b8999692b266677be2ce0df6ce38093a0d81e6bc43d0bdf8a3f","tests/shaders/struct.frag":"d8840bb1961d6f14609b00ee54406c1e3ea31cecd8231b77cfb73d28b71910c0","tests/shaders/struct.frag.spv":"774aa886374eb95abf9bb7d0045ee77d97e26529e9ec96b90991a515fdbca4be","tests/shaders/struct.vert":"9299cda83ddb5b5c3d95ab0d057e4df2af137dfd92d6c4d3e96295b7d42e29a1","tests/shaders/struct.vert.spv":"4a82bdee72616ac058bc60d4255efa3e78199a2b8597570c013bebbee7107fb7","tests/shaders/workgroup.comp":"478044b5392e0d1fb042253d71ea6bf7b8a014af4a6ee35d8db4c5343ac69739","tests/shaders/workgroup.comp.spv":"72f636fe3d1d6d0c5963f71bf4349c7e40d544331b33b6b64fb5b65784e6abee","tests/spirv_tests.rs":"4660f40d6d4598df4426bbc4b377280e00f85485e810d97d0c23cab96d824696"},"package":null}
\ No newline at end of file
+{"files":{"Cargo.toml":"4f16705c4ddd3d88ce861283f056fa71ab6b66d5abd95f659cdef9b215ab0b11","README.md":"396d46be2d3b596a4b2ab869b2647f667100fd581e91490dc61fac4faa5d9147","lib.rs":"8d56ad9d9fffbe139fa7c206b593627dd2dac104ca7d772b4e4eaf0f8d3291fc"},"package":null}
\ No newline at end of file
diff --git a/third_party/rust/spirv_cross/Cargo.toml b/third_party/rust/spirv_cross/Cargo.toml
index 2518ef187754..ea3590236a32 100644
--- a/third_party/rust/spirv_cross/Cargo.toml
+++ b/third_party/rust/spirv_cross/Cargo.toml
@@ -1,24 +1,17 @@
 [package]
 name = "spirv_cross"
 version = "0.16.0"
-authors = ["Joshua Groves <josh@joshgroves.com>"]
-description = "Safe wrapper around SPIRV-Cross"
 license = "MIT/Apache-2.0"
-homepage = "https://github.com/grovesNL/spirv_cross"
-repository = "https://github.com/grovesNL/spirv_cross"
-readme = "../README.md"
-keywords = ["spirv", "cross"]
-build = "build.rs"
 edition = "2018"
 
+[features]
+glsl = ["spirv-cross-internal/glsl"]
+hlsl = ["spirv-cross-internal/hlsl"]
+msl = ["spirv-cross-internal/msl"]
+
 [lib]
 crate-type = ["rlib"]
+path = "lib.rs"
 
-[features]
-default = []
-glsl = []
-hlsl = []
-msl = []
-
-[target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
-cc = "1.0.4"
+[dependencies]
+spirv-cross-internal = { path = "../spirv_cross" }
diff --git a/third_party/rust/spirv_cross/README.md b/third_party/rust/spirv_cross/README.md
new file mode 100644
index 000000000000..74365b243844
--- /dev/null
+++ b/third_party/rust/spirv_cross/README.md
@@ -0,0 +1 @@
+This is a hacky wrapper, so that our innermost crate has a name that's different from all the object it links together.
diff --git a/third_party/rust/spirv_cross/lib.rs b/third_party/rust/spirv_cross/lib.rs
new file mode 100644
index 000000000000..d699e7c86759
--- /dev/null
+++ b/third_party/rust/spirv_cross/lib.rs
@@ -0,0 +1 @@
+pub use spirv_cross_internal::*;