From 7cf9c06d25e4714e04fc9e337f88e23911345a4e Mon Sep 17 00:00:00 2001 From: lordnoriyuki Date: Sun, 29 Nov 2020 18:50:27 -0800 Subject: [PATCH] [rs] Updating wgpu-rs dependency for backend-gl removal on macOS, including reference in direct.rs --- wgpu/Cargo.toml | 5 ++--- wgpu/src/backend/direct.rs | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index cf400eb67..4db17fe8d 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"] package = "wgpu-core" #version = "0.6" git = "https://github.com/gfx-rs/wgpu" -rev = "fd99466867a5d1dd03f543be89cda2958dddedb8" +rev = "3efba7712abdd75a6b3b35c03969a59e9ac92032" features = ["raw-window-handle"] [dependencies.wgt] package = "wgpu-types" #version = "0.6" git = "https://github.com/gfx-rs/wgpu" -rev = "fd99466867a5d1dd03f543be89cda2958dddedb8" +rev = "3efba7712abdd75a6b3b35c03969a59e9ac92032" [dependencies] arrayvec = "0.5" @@ -50,7 +50,6 @@ serde = { version = "1", features = ["derive"], optional = true } # 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"] } -[target.'cfg(unix)'.dependencies] gfx-backend-gl = { version = "0.6", features = ["x11"] } [dev-dependencies] diff --git a/wgpu/src/backend/direct.rs b/wgpu/src/backend/direct.rs index 7aac3823e..9ae1e7dda 100644 --- a/wgpu/src/backend/direct.rs +++ b/wgpu/src/backend/direct.rs @@ -66,7 +66,6 @@ impl Context { .metal .as_ref() .map(|inst| inst.create_surface_from_layer(std::mem::transmute(layer))), - gl: None, }; let id = self.0.surfaces.process_id(PhantomData);