Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Adreno 642L crash (#14937)

Browse source 
# Objective

The Android example on Adreno 642L currently crashes on startup.

Previous PRs #14176 and #13323 have adressed this specific crash
occurring on some Adreno GPUs, that fix works as it should but isn't
applied when to the GPU name contains a suffix like in the case of
`642L`.

## Solution

- Amending the logic to filter out any parts of the GPU name not
containing digits thus enabling the fix on `642L`.

## Testing

- Ran the Android example on a Nothing Phone 1. Before this change it
crashed, after it works as intended.

---------

Co-authored-by: Sam Pettersson <sam.pettersson@geoguessr.com>
This commit is contained in:
Sam Pettersson 2024-08-27 17:35:01 +00:00 committed by GitHub
parent 1690b28e9f
commit 5f061ea008
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/bevy_render/src/batching/gpu_preprocessing.rs
View file

@ -226,15 +226,31 @@ impl FromWorld for GpuPreprocessingSupport {
let adapter = world.resource::<RenderAdapter>();
let device = world.resource::<RenderDevice>();
if device.limits().max_compute_workgroup_size_x == 0 ||
// filter some Qualcomm devices on Android as they crash when using GPU preprocessing
(cfg!(target_os = "android") && {
let name = adapter.get_info().name;
// filter out Adreno 730 and earlier GPUs (except 720, it's newer than 730)
name.strip_prefix("Adreno (TM) ").is_some_and(|version|
version != "720" && version.parse::<u16>().is_ok_and(|version| version <= 730)
)
})
// filter some Qualcomm devices on Android as they crash when using GPU preprocessing.
fn is_non_supported_android_device(adapter: &RenderAdapter) -> bool {
if cfg!(target_os = "android") {
let adapter_name = adapter.get_info().name;
// Filter out Adreno 730 and earlier GPUs (except 720, as it's newer than 730)
// while also taking suffixes into account like Adreno 642L.
let non_supported_adreno_model = |model: &str| -> bool {
let model = model
.chars()
.map_while(|c| c.to_digit(10))
.fold(0, |acc, digit| acc * 10 + digit);
model != 720 && model <= 730
};
adapter_name
.strip_prefix("Adreno (TM) ")
.is_some_and(non_supported_adreno_model)
} else {
false
}
}
if device.limits().max_compute_workgroup_size_x == 0 || is_non_supported_android_device(adapter)
{
GpuPreprocessingSupport::None
} else if !device