diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
index 90c73c192a..cef7c00a58 100644
--- a/wgpu-core/Cargo.toml
+++ b/wgpu-core/Cargo.toml
@@ -30,7 +30,6 @@ log = "0.4"
 hal = { package = "gfx-hal", version = "0.5.2" }
 gfx-backend-empty = "0.5"
 gfx-descriptor = "0.1"
-gfx-memory = "0.1"
 parking_lot = "0.10"
 peek-poke = "0.2"
 raw-window-handle = { version = "0.3", optional = true }
@@ -44,6 +43,10 @@ vec_map = "0.8.1"
 git = "https://github.com/gfx-rs/naga"
 rev = "bce6358eb1026c13d2f1c6d365af37afe8869a86"
 
+[dependencies.gfx-memory]
+git = "https://github.com/gfx-rs/gfx-extras"
+rev = "438353c3f75368c12024ad2fc03cbeb15f351fd9"
+
 [dependencies.wgt]
 path = "../wgpu-types"
 package = "wgpu-types"
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
index 267eb7f9ec..70027d58f6 100644
--- a/wgpu-core/src/device/mod.rs
+++ b/wgpu-core/src/device/mod.rs
@@ -426,14 +426,7 @@ impl<B: GfxBackend> Device<B> {
         let memory = self
             .mem_allocator
             .lock()
-            .allocate(
-                &self.raw,
-                requirements.type_mask as u32,
-                mem_usage,
-                memory_kind,
-                requirements.size,
-                requirements.alignment,
-            )
+            .allocate(&self.raw, &requirements, mem_usage, memory_kind)
             .unwrap();
 
         unsafe {
@@ -524,11 +517,9 @@ impl<B: GfxBackend> Device<B> {
             .lock()
             .allocate(
                 &self.raw,
-                requirements.type_mask as u32,
+                &requirements,
                 gfx_memory::MemoryUsage::Private,
                 gfx_memory::Kind::General,
-                requirements.size,
-                requirements.alignment,
             )
             .unwrap();
 
diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs
index 23b871bd95..1f1c9dce19 100644
--- a/wgpu-core/src/device/queue.rs
+++ b/wgpu-core/src/device/queue.rs
@@ -90,11 +90,9 @@ impl<B: hal::Backend> super::Device<B> {
             .lock()
             .allocate(
                 &self.raw,
-                requirements.type_mask as u32,
+                &requirements,
                 gfx_memory::MemoryUsage::Staging { read_back: false },
                 gfx_memory::Kind::Linear,
-                requirements.size,
-                requirements.alignment,
             )
             .unwrap();
         unsafe {