Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using block_on directly from futures-executor instead of the umbrella crate

Browse Source
This commit is contained in:
Imbris 2021-06-03 14:28:28 -04:00
parent f3cb08170c
commit 6ffdad173d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -6030,7 +6030,7 @@ dependencies = [
"dot_vox", "dot_vox",
"enum-iterator", "enum-iterator",
"euc", "euc",
"futures", "futures-executor",
"gilrs", "gilrs",
"glyph_brush", "glyph_brush",
"guillotiere", "guillotiere",

2
voxygen/Cargo.toml
View File

@ -85,7 +85,7 @@ crossbeam-channel = "0.5"
directories-next = "2.0" directories-next = "2.0"
dot_vox = "4.0" dot_vox = "4.0"
enum-iterator = "0.6" enum-iterator = "0.6"
futures = "0.3" futures-executor = "0.3"
guillotiere = "0.6" guillotiere = "0.6"
hashbrown = {version = "0.9", features = ["rayon", "serde", "nightly"]} hashbrown = {version = "0.9", features = ["rayon", "serde", "nightly"]}
image = {version = "0.23.12", default-features = false, features = ["ico", "png"]} image = {version = "0.23.12", default-features = false, features = ["ico", "png"]}

4
voxygen/src/render/renderer.rs
View File

@ -176,7 +176,7 @@ impl Renderer {
#[allow(unsafe_code)] #[allow(unsafe_code)]
let surface = unsafe { instance.create_surface(window) }; let surface = unsafe { instance.create_surface(window) };
let adapter = futures::executor::block_on(instance.request_adapter( let adapter = futures_executor::block_on(instance.request_adapter(
&wgpu::RequestAdapterOptionsBase { &wgpu::RequestAdapterOptionsBase {
power_preference: wgpu::PowerPreference::HighPerformance, power_preference: wgpu::PowerPreference::HighPerformance,
compatible_surface: Some(&surface), compatible_surface: Some(&surface),
@ -189,7 +189,7 @@ impl Renderer {
..Default::default() ..Default::default()
}; };
let (device, queue) = futures::executor::block_on( let (device, queue) = futures_executor::block_on(
adapter.request_device( adapter.request_device(
&wgpu::DeviceDescriptor { &wgpu::DeviceDescriptor {
// TODO // TODO