nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-22 06:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #969

Browse Source 
969: Never prefer CPU devices over GPUs r=kvark a=myfreeweb

Mesa (development repo) now has a software renderer for Vulkan (`lavapipe`), it is incomplete for now and can't handle iced, so my app exploded after a mesa rebuild :)

Looks like someone forgot to push CPU renderers to the lowest priority.

(This commit should be cherry-pickable onto master I think, since this code hasn't really changed)

Co-authored-by: Greg V <greg@unrelenting.technology>
This commit is contained in:
bors[bot] 2020-10-12 03:03:40 +00:00 committed by GitHub
commit 05ae7d5f5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wgpu-core/src/instance.rs
View File

@ -480,7 +480,8 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
return Err(RequestAdapterError::NotFound); return Err(RequestAdapterError::NotFound);
} }
let (mut integrated, mut discrete, mut virt, mut other) = (None, None, None, None); let (mut integrated, mut discrete, mut virt, mut cpu, mut other) =
(None, None, None, None, None);
for (i, ty) in device_types.into_iter().enumerate() { for (i, ty) in device_types.into_iter().enumerate() {
match ty { match ty {
@ -493,7 +494,10 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
hal::adapter::DeviceType::VirtualGpu => { hal::adapter::DeviceType::VirtualGpu => {
virt = virt.or(Some(i)); virt = virt.or(Some(i));
} }
_ => { hal::adapter::DeviceType::Cpu => {
cpu = cpu.or(Some(i));
}
hal::adapter::DeviceType::Other => {
other = other.or(Some(i)); other = other.or(Some(i));
} }
} }
@ -501,9 +505,9 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
let preferred_gpu = match desc.power_preference { let preferred_gpu = match desc.power_preference {
PowerPreference::Default | PowerPreference::LowPower => { PowerPreference::Default | PowerPreference::LowPower => {
integrated.or(other).or(discrete).or(virt) integrated.or(other).or(discrete).or(virt).or(cpu)
} }
PowerPreference::HighPerformance => discrete.or(other).or(integrated).or(virt), PowerPreference::HighPerformance => discrete.or(other).or(integrated).or(virt).or(cpu),
}; };
let mut selected = preferred_gpu.unwrap_or(0); let mut selected = preferred_gpu.unwrap_or(0);