diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 9345d2d79a..81dd6da587 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"] package = "wgpu-core" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "7e8b51b4286bd9452567eb1a56edb8e9b7c7f684" +rev = "096c57008f2907c07ddaa7d0ff02fae21a5e676b" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" version = "0.5" git = "https://github.com/gfx-rs/wgpu" -rev = "7e8b51b4286bd9452567eb1a56edb8e9b7c7f684" +rev = "096c57008f2907c07ddaa7d0ff02fae21a5e676b" [dependencies] arrayvec = "0.5" @@ -48,7 +48,7 @@ serde = { version = "1", features = ["derive"], optional = true } #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.5", features = ["x11"] } +gfx-backend-vulkan = { version = "0.6", features = ["x11"] } [dev-dependencies] cgmath = "0.17" @@ -64,7 +64,7 @@ ddsfile = "0.4.0" package = "wgpu-subscriber" version = "0.1" git = "https://github.com/gfx-rs/wgpu" -rev = "7e8b51b4286bd9452567eb1a56edb8e9b7c7f684" +rev = "096c57008f2907c07ddaa7d0ff02fae21a5e676b" [[example]] name="hello-compute" diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index 2b90528e5f..8ab21d75db 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -35,9 +35,12 @@ impl Context { let surface = wgc::instance::Surface { #[cfg(feature = "vulkan-portability")] vulkan: None, //TODO: create_surface_from_layer ? - metal: self.0.instance.metal.as_ref().map(|inst| { - inst.create_surface_from_layer(layer as *mut _, cfg!(debug_assertions)) - }), + metal: self + .0 + .instance + .metal + .as_ref() + .map(|inst| inst.create_surface_from_layer(std::mem::transmute(layer))), }; let id = self.0.surfaces.process_id(PhantomData);