archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

[rs] Merge #651

Browse Source 
651: Removing gfx-backend-gl on macOS r=grovesNL a=lordnoriyuki

Updating to latest wgpu.
Removing references to gfx-backend-gl on macOS.

Fixes https://github.com/gfx-rs/wgpu-rs/issues/646

Co-authored-by: lordnoriyuki <lordnoriyuki@gmail.com>
This commit is contained in:
bors[bot] 2020-11-30 03:11:11 +00:00 committed by GitHub
commit a1ed4e6d59
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgpu/Cargo.toml
View File

@ -26,14 +26,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan", "gfx-backend-vulkan"]
package = "wgpu-core" package = "wgpu-core"
#version = "0.6" #version = "0.6"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "fd99466867a5d1dd03f543be89cda2958dddedb8" rev = "3efba7712abdd75a6b3b35c03969a59e9ac92032"
features = ["raw-window-handle"] features = ["raw-window-handle"]
[dependencies.wgt] [dependencies.wgt]
package = "wgpu-types" package = "wgpu-types"
#version = "0.6" #version = "0.6"
git = "https://github.com/gfx-rs/wgpu" git = "https://github.com/gfx-rs/wgpu"
rev = "fd99466867a5d1dd03f543be89cda2958dddedb8" rev = "3efba7712abdd75a6b3b35c03969a59e9ac92032"
[dependencies] [dependencies]
arrayvec = "0.5" arrayvec = "0.5"
@ -50,7 +50,6 @@ serde = { version = "1", features = ["derive"], optional = true }
# want to opt into X11 explicitly. # want to opt into X11 explicitly.
[target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies] [target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies]
gfx-backend-vulkan = { version = "0.6", features = ["x11"] } gfx-backend-vulkan = { version = "0.6", features = ["x11"] }
[target.'cfg(unix)'.dependencies]
gfx-backend-gl = { version = "0.6", features = ["x11"] } gfx-backend-gl = { version = "0.6", features = ["x11"] }
[dev-dependencies] [dev-dependencies]

1
wgpu/src/backend/direct.rs
View File

@ -66,7 +66,6 @@ impl Context {
.metal .metal
.as_ref() .as_ref()
.map(|inst| inst.create_surface_from_layer(std::mem::transmute(layer))), .map(|inst| inst.create_surface_from_layer(std::mem::transmute(layer))),
gl: None,
}; };
let id = self.0.surfaces.process_id(PhantomData); let id = self.0.surfaces.process_id(PhantomData);