diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5aaff6124..792fd9754 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,36 +9,44 @@ on:
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    env:
-      RUSTFLAGS: ${{ matrix.RUSTFLAGS }}
     strategy:
       fail-fast: false
       matrix:
         os: [macos-10.15, ubuntu-18.04, windows-2019]
-        wasm: [true, false]
         include:
           - os: macos-10.15
-            wasm: false
+            PREPARE_COMMAND: echo "Ready"
             CHECK_COMMAND: cargo check --all-targets --all-features
             TEST_COMMAND: cargo test --all-targets --no-run
           - os: ubuntu-18.04
-            wasm: false
+            PREPARE_COMMAND: |
+              sudo apt-get update -y -qq
+              sudo apt-get install -y -qq libegl1-mesa-dev
             CHECK_COMMAND: cargo check --all-targets --all-features
             TEST_COMMAND: cargo test --all-targets --no-run
           - os: windows-2019
-            wasm: false
-            CHECK_COMMAND: rustup default stable-msvc && cargo check --all-targets --all-features
-            TEST_COMMAND: rustup default stable-msvc && cargo test --all-targets --no-run
-          - wasm: true
-            CHECK_COMMAND: rustup target add wasm32-unknown-unknown && cargo check --all-targets --all-features --target=wasm32-unknown-unknown
-            TEST_COMMAND: rustup target add wasm32-unknown-unknown && cargo test --all-targets --no-run --target=wasm32-unknown-unknown
-            RUSTFLAGS: --cfg=web_sys_unstable_apis
+            PREPARE_COMMAND: rustup default stable-msvc
+            CHECK_COMMAND: cargo check --all-targets --all-features
+            TEST_COMMAND: cargo test --all-targets --no-run
     steps:
     - uses: actions/checkout@v2
-    - name: cargo check
+    - name: Prepare
+      run: ${{ matrix.PREPARE_COMMAND }}
+    - name: Check
       run: ${{ matrix.CHECK_COMMAND }}
-    - name: cargo test
+    - name: Test
       run: ${{ matrix.TEST_COMMAND }}
+
+  wasm:
+    runs-on: [ubuntu-18.04]
+    env:
+      RUSTFLAGS: --cfg=web_sys_unstable_apis
+    steps:
+    - uses: actions/checkout@v2
+    - run: rustup target add wasm32-unknown-unknown
+    - name: Check
+      run: cargo check --all-targets --all-features --target=wasm32-unknown-unknown
+
   docs:
     runs-on: [ubuntu-18.04]
     steps:
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 9e4d7efe4..8f1cbf7fa 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -20,20 +20,20 @@ default = []
 trace = ["serde", "wgc/trace"]
 replay = ["serde", "wgc/replay"]
 # Make Vulkan backend available on platforms where it is by default not, e.g. macOS
-vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
+vulkan-portability = ["wgc/gfx-backend-vulkan"]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
 package = "wgpu-core"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "67e652f471d5b138a34231666c953f26ec25aa18"
+rev = "2d87fd9067e6600beea494f83aa27955b0c8e100"
 features = ["raw-window-handle"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 #version = "0.6"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "67e652f471d5b138a34231666c953f26ec25aa18"
+rev = "2d87fd9067e6600beea494f83aa27955b0c8e100"
 
 [dependencies]
 arrayvec = "0.5"
@@ -45,12 +45,11 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 typed-arena = "2.0.1"
 serde = { version = "1", features = ["derive"], optional = true }
 
-# Enable X11 support
+# Enable X11 support for GL
 # Note: we may consider switching this to "dev-dependencies" if users
 # want to opt into X11 explicitly.
 [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
-gfx-backend-vulkan = { version = "0.6", features = ["x11"] }
-gfx-backend-gl = { version = "0.6", features = ["x11"] }
+gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", features = ["x11"] }
 
 [dev-dependencies]
 cgmath = "0.17"
@@ -82,24 +81,20 @@ test = true
 [patch."https://github.com/gfx-rs/naga"]
 #naga = { path = "../naga" }
 
-[patch."https://github.com/gfx-rs/gfx-extras"]
-#gfx-descriptor = { version = "0.2", path = "../gfx-extras/gfx-descriptor" }
+[patch."https://github.com/zakarumych/gpu-descriptor"]
+#gpu-descriptor = { path = "../gpu-descriptor/gpu-descriptor" }
 
 [patch."https://github.com/zakarumych/gpu-alloc"]
 #gpu-alloc = { path = "../gpu-alloc/gpu-alloc" }
 
-[patch.crates-io]
-#gfx-hal = { version = "0.6", path = "../gfx/src/hal" }
-#gfx-backend-empty = { version = "0.6", path = "../gfx/src/backend/empty" }
-#gfx-backend-vulkan = { version = "0.6", path = "../gfx/src/backend/vulkan" }
-#gfx-backend-gl = { version = "0.6", path = "../gfx/src/backend/gl" }
-#gfx-backend-dx12 = { version = "0.6", path = "../gfx/src/backend/dx12" }
-#gfx-backend-dx11 = { version = "0.6", path = "../gfx/src/backend/dx11" }
-#gfx-backend-metal = { version = "0.6", path = "../gfx/src/backend/metal" }
-
-[target.'cfg(target_os = "macos")'.dependencies]
-objc = "0.2.7"
-gfx-backend-vulkan = { version = "0.6", optional = true }
+[patch."https://github.com/gfx-rs/gfx"]
+#gfx-hal = { path = "../gfx/src/hal" }
+#gfx-backend-empty = { path = "../gfx/src/backend/empty" }
+#gfx-backend-vulkan = { path = "../gfx/src/backend/vulkan" }
+#gfx-backend-gl = { path = "../gfx/src/backend/gl" }
+#gfx-backend-dx12 = { path = "../gfx/src/backend/dx12" }
+#gfx-backend-dx11 = { path = "../gfx/src/backend/dx11" }
+#gfx-backend-metal = { path = "../gfx/src/backend/metal" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = "=0.2.69" # remember to change version in readme as well
diff --git a/wgpu/bors.toml b/wgpu/bors.toml
index 2f750ca59..aaa83cfb8 100644
--- a/wgpu/bors.toml
+++ b/wgpu/bors.toml
@@ -1,11 +1,7 @@
 status = [
-  "build (macos-10.15, true)",
-  "build (macos-10.15, false)",
-  "build (ubuntu-18.04, true)",
-  "build (ubuntu-18.04, false)",
-  "build (windows-2019, true)",
-  "build (windows-2019, false)",
+  "build (macos-10.15)",
+  "build (ubuntu-18.04)",
+  "build (windows-2019)",
+  "wasm",
   "docs",
 ]
-
-timeout_sec = 18000 # 5 hours