diff --git a/Cargo.lock b/Cargo.lock
index bb1658d965..53b248a0a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -465,7 +465,7 @@ dependencies = [
 [[package]]
 name = "gfx-auxil"
 version = "0.8.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "fxhash",
  "gfx-hal",
@@ -475,7 +475,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx11"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -496,7 +496,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-dx12"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "arrayvec",
  "bit-set",
@@ -517,7 +517,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-empty"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "gfx-hal",
  "log",
@@ -527,7 +527,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-gl"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -550,7 +550,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-metal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -575,7 +575,7 @@ dependencies = [
 [[package]]
 name = "gfx-backend-vulkan"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "arrayvec",
  "ash",
@@ -595,7 +595,7 @@ dependencies = [
 [[package]]
 name = "gfx-hal"
 version = "0.7.0"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 dependencies = [
  "bitflags",
  "naga",
@@ -916,7 +916,7 @@ dependencies = [
 [[package]]
 name = "naga"
 version = "0.3.1"
-source = "git+https://github.com/gfx-rs/naga?tag=gfx-18#e87f57d82c44b12fe0288d876b050e9ddd1d6e1b"
+source = "git+https://github.com/gfx-rs/naga?tag=gfx-19#80a8243953f93c5265ed20cd2bca85bc336fe355"
 dependencies = [
  "bit-set",
  "bitflags",
@@ -1171,7 +1171,7 @@ dependencies = [
 [[package]]
 name = "range-alloc"
 version = "0.1.2"
-source = "git+https://github.com/gfx-rs/gfx?rev=2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0#2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0"
+source = "git+https://github.com/gfx-rs/gfx?rev=ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569#ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569"
 
 [[package]]
 name = "raw-window-handle"
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 36af27ab9a..39d08e6153 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -40,28 +40,28 @@ thiserror = "1"
 gpu-alloc = { git = "https://github.com/zakarumych/gpu-alloc.git", rev = "560ad651aa8f7aefcee8f5bcf41e67a84561bcda" }
 gpu-descriptor = { version = "0.1" }
 
-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
+hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
+gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
 
 [target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies]
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", features = ["naga"] }
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", features = ["naga"] }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
 
 [target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
-gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", optional = true }
+gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", optional = true }
 
 [target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0", features = ["naga"] }
+gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
+gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
+gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569", features = ["naga"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "2ac006f7fe86f32dd5b5e07f9daf44cd876a66f0" }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "ba32ecb9f45ad772e03d1ee4b99f2433bdb0b569" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-tag = "gfx-18"
+tag = "gfx-19"
 features = ["spv-in", "spv-out", "wgsl-in"]
 
 [dependencies.wgt]
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index 4ac652e36b..db32adbbdc 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -1033,6 +1033,7 @@ impl<B: GfxBackend> Device<B> {
                 let naga_result = if desc
                     .flags
                     .contains(wgt::ShaderFlags::EXPERIMENTAL_TRANSLATION)
+                    || !cfg!(feature = "cross")
                 {
                     match unsafe { self.raw.create_shader_module_from_naga(shader) } {
                         Ok(raw) => Ok(raw),