Merge #880

880: Port to gfx-hal-0.6 r=kvark a=kvark

This got a little more involved than I hoped, because of rust-lang/rust#34433 which is unfortunately closed.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>

player/Cargo.toml

@@ -19,7 +19,7 @@ env_logger = "0.7"
 log = "0.4"
 raw-window-handle = "0.3"
 renderdoc = { version = "0.8", optional = true, default_features = false }
-ron = "0.5"
+ron = "0.6"
 winit = { version = "0.22", optional = true }
 
 [dependencies.wgt]
@@ -39,7 +39,7 @@ path = "../wgpu-subscriber"
 version = "0.1"
 
 [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
-gfx-backend-vulkan = { version = "0.5", features = ["x11"] }
+gfx-backend-vulkan = { version = "0.6", features = ["x11"] }
 
 [dev-dependencies]
 serde = "1"

wgpu-core/Cargo.toml

@@ -25,45 +25,40 @@ arrayvec = "0.5"
 bitflags = "1.0"
 copyless = "0.1"
 fxhash = "0.2"
-hal = { package = "gfx-hal", version = "0.5.3" }
-gfx-backend-empty = "0.5"
-parking_lot = "0.10"
+hal = { package = "gfx-hal", version = "0.6" }
+gfx-backend-empty = "0.6"
+parking_lot = "0.11"
 raw-window-handle = { version = "0.3", optional = true }
-ron = { version = "0.5", optional = true }
+ron = { version = "0.6", optional = true }
 serde = { version = "1.0", features = ["serde_derive"], optional = true }
 smallvec = "1"
 tracing = { version = "0.1", default-features = false, features = ["std"] }
 thiserror = "1"
+gfx-descriptor = "0.2"
+gfx-memory = "0.2"
 
 [dependencies.naga]
-git = "https://github.com/gfx-rs/naga"
-rev = "1eb637038dd15fc1dad770eca8e6943424dbc122"
+version = "0.2"
+#git = "https://github.com/gfx-rs/naga"
+#rev = "1eb637038dd15fc1dad770eca8e6943424dbc122"
 features = ["spirv"]
 
-[dependencies.gfx-descriptor]
-git = "https://github.com/gfx-rs/gfx-extras"
-rev = "473a4cdc63463e7986707507c4a7f6a3a767e329"
-
-[dependencies.gfx-memory]
-git = "https://github.com/gfx-rs/gfx-extras"
-rev = "473a4cdc63463e7986707507c4a7f6a3a767e329"
-
 [dependencies.wgt]
 path = "../wgpu-types"
 package = "wgpu-types"
 version = "0.5"
 
 [target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
-gfx-backend-metal = { version = "0.5.6" }
-gfx-backend-vulkan = { version = "0.5.11", optional = true }
+gfx-backend-metal = { version = "0.6" }
+gfx-backend-vulkan = { version = "0.6", optional = true }
 
 [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
-gfx-backend-vulkan = { version = "0.5.11" }
+gfx-backend-vulkan = { version = "0.6.1" }
 
 [target.'cfg(windows)'.dependencies]
-gfx-backend-dx12 = { version = "0.5.8" }
-gfx-backend-dx11 = { version = "0.5" }
-gfx-backend-vulkan = { version = "0.5.11" }
+gfx-backend-dx12 = { version = "0.6" }
+gfx-backend-dx11 = { version = "0.6" }
+gfx-backend-vulkan = { version = "0.6" }
 
 [dev-dependencies]
 loom = "0.3"