From 4f513a35291141345f741c26b435a8677771bdcf Mon Sep 17 00:00:00 2001
From: grovesNL <josh@joshgroves.com>
Date: Sat, 15 Sep 2018 11:04:36 -0600
Subject: [PATCH] Update to latest gfx-memory

---
 Cargo.lock    | 6 +++---
 Cargo.toml    | 3 +--
 src/device.rs | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 274c1554e..7d1b715a1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -291,7 +291,7 @@ dependencies = [
 [[package]]
 name = "gfx-memory"
 version = "0.1.0"
-source = "git+https://github.com/kvark/gfx-mem?branch=update#a82aa4221250a493c2fe6fcc22a2b6876742cef2"
+source = "git+https://github.com/gfx-rs/gfx-memory?rev=483d64d#483d64dba6d3e2acfcd8f77a2baade78f120d49f"
 dependencies = [
  "failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "gfx-hal 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)",
@@ -307,7 +307,7 @@ dependencies = [
  "gfx-backend-metal 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)",
  "gfx-backend-vulkan 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)",
  "gfx-hal 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)",
- "gfx-memory 0.1.0 (git+https://github.com/kvark/gfx-mem?branch=update)",
+ "gfx-memory 0.1.0 (git+https://github.com/gfx-rs/gfx-memory?rev=483d64d)",
 ]
 
 [[package]]
@@ -844,7 +844,7 @@ dependencies = [
 "checksum gfx-backend-metal 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)" = "<none>"
 "checksum gfx-backend-vulkan 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)" = "<none>"
 "checksum gfx-hal 0.1.0 (git+https://github.com/gfx-rs/gfx?rev=a435a05)" = "<none>"
-"checksum gfx-memory 0.1.0 (git+https://github.com/kvark/gfx-mem?branch=update)" = "<none>"
+"checksum gfx-memory 0.1.0 (git+https://github.com/gfx-rs/gfx-memory?rev=483d64d)" = "<none>"
 "checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
diff --git a/Cargo.toml b/Cargo.toml
index 663ffd9a9..b3079b9c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,5 +12,4 @@ gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05" }
 gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
 gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
 gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
-#gfx-memory = { git = "https://github.com/gfx-rs/gfx-memory" }
-gfx-memory = { git = "https://github.com/kvark/gfx-mem", branch = "update" }
+gfx-memory = { git = "https://github.com/gfx-rs/gfx-memory", rev = "483d64d" }
diff --git a/src/device.rs b/src/device.rs
index 63763bcb2..5a6eb9878 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -31,7 +31,7 @@ impl<B: hal::Backend> Device<B> {
 }
 
 pub struct Buffer<B: hal::Backend> {
-    pub raw: B::Buffer,
+    pub raw: B::UnboundBuffer,
 }
 
 pub extern "C"