From c4906ee36ff8b7f3c68898789d0d884923b2ea02 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Wed, 23 Oct 2019 14:31:36 -0400 Subject: [PATCH] Always return an Id by request_adapter --- ffi/wgpu.h | 2 ++ wgpu-native/src/instance.rs | 14 +++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ffi/wgpu.h b/ffi/wgpu.h index 723367d71..b4935ef46 100644 --- a/ffi/wgpu.h +++ b/ffi/wgpu.h @@ -8,6 +8,8 @@ #include #include +#define WGPUDEFAULT_BIND_GROUPS 4 + #define WGPUDESIRED_NUM_FRAMES 3 #define WGPUMAX_BIND_GROUPS 4 diff --git a/wgpu-native/src/instance.rs b/wgpu-native/src/instance.rs index 75a1e50ec..a9390ea48 100644 --- a/wgpu-native/src/instance.rs +++ b/wgpu-native/src/instance.rs @@ -269,7 +269,7 @@ pub extern "C" fn wgpu_create_surface_from_windows_hwnd( pub fn request_adapter( desc: &RequestAdapterOptions, input_ids: &[Input], -) -> Option> { +) -> Option { let instance = &GLOBAL.instance; let mut device_types = Vec::new(); @@ -284,6 +284,10 @@ pub fn request_adapter( None } }; + #[cfg(feature = "remote")] + let pick = |_output, input_maybe| input_maybe; + #[cfg(not(feature = "remote"))] + let pick = |output, _input_maybe| Some(output); let id_vulkan = find_input(Backend::Vulkan); let id_metal = find_input(Backend::Metal); @@ -368,7 +372,7 @@ pub fn request_adapter( adapter, &mut token, ); - return Some(id_out); + return pick(id_out, id_vulkan); } selected -= adapters_vk.len(); } @@ -384,7 +388,7 @@ pub fn request_adapter( adapter, &mut token, ); - return Some(id_out); + return pick(id_out, id_metal); } selected -= adapters_mtl.len(); } @@ -400,7 +404,7 @@ pub fn request_adapter( adapter, &mut token, ); - return Some(id_out); + return pick(id_out, id_dx12); } selected -= adapters_dx12.len(); if selected < adapters_dx11.len() { @@ -413,7 +417,7 @@ pub fn request_adapter( adapter, &mut token, ); - return Some(id_out); + return pick(id_out, id_dx11); } selected -= adapters_dx11.len(); }