forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not crash if RenderDevice doesn't exist (#4427)

Browse Source 
# Objective

Avoid crashing if `RenderDevice` doesn't exist (required for headless mode).
Fixes #4392.

## Solution

Use `CompressedImageFormats::all()` if there is no `RenderDevice`.
This commit is contained in:
Hennadii Chernyshchyk 2022-04-05 19:37:23 +00:00
parent dbb2fcb677
commit ea6e6f7db2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_gltf/src/loader.rs
View File

@ -88,10 +88,13 @@ impl AssetLoader for GltfLoader {
impl FromWorld for GltfLoader { impl FromWorld for GltfLoader {
fn from_world(world: &mut World) -> Self { fn from_world(world: &mut World) -> Self {
let supported_compressed_formats = match world.get_resource::<RenderDevice>() {
Some(render_device) => CompressedImageFormats::from_features(render_device.features()),
None => CompressedImageFormats::all(),
};
Self { Self {
supported_compressed_formats: CompressedImageFormats::from_features( supported_compressed_formats,
world.resource::<RenderDevice>().features(),
),
} }
} }
} }

9
crates/bevy_render/src/texture/image_texture_loader.rs
View File

@ -69,10 +69,13 @@ impl AssetLoader for ImageTextureLoader {
impl FromWorld for ImageTextureLoader { impl FromWorld for ImageTextureLoader {
fn from_world(world: &mut World) -> Self { fn from_world(world: &mut World) -> Self {
let supported_compressed_formats = match world.get_resource::<RenderDevice>() {
Some(render_device) => CompressedImageFormats::from_features(render_device.features()),
None => CompressedImageFormats::all(),
};
Self { Self {
supported_compressed_formats: CompressedImageFormats::from_features( supported_compressed_formats,
world.resource::<RenderDevice>().features(),
),
} }
} }
} }