diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 49079ed55802b..47442b7837e1f 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -82,7 +82,7 @@ thread_local = "1.1" thiserror = "1.0" futures-lite = "2.0.1" hexasphere = "10.0" -ddsfile = { version = "0.5.0", optional = true } +ddsfile = { version = "0.5.2", optional = true } ktx2 = { version = "0.3.0", optional = true } # For ktx2 supercompression flate2 = { version = "1.0.22", optional = true } diff --git a/crates/bevy_render/src/texture/dds.rs b/crates/bevy_render/src/texture/dds.rs index b3ae1e7cfeb87..5f5afcb6ece5a 100644 --- a/crates/bevy_render/src/texture/dds.rs +++ b/crates/bevy_render/src/texture/dds.rs @@ -24,23 +24,22 @@ pub fn dds_buffer_to_image( } let mut image = Image::default(); let is_cubemap = dds.header.caps2.contains(Caps2::CUBEMAP); - let mut depth_or_array_layers = if dds.get_num_array_layers() > 1 { + let depth_or_array_layers = if dds.get_num_array_layers() > 1 { dds.get_num_array_layers() } else { dds.get_depth() }; - if is_cubemap { - if !dds.header.caps2.contains( + if is_cubemap + && !dds.header.caps2.contains( Caps2::CUBEMAP_NEGATIVEX | Caps2::CUBEMAP_NEGATIVEY | Caps2::CUBEMAP_NEGATIVEZ | Caps2::CUBEMAP_POSITIVEX | Caps2::CUBEMAP_POSITIVEY | Caps2::CUBEMAP_POSITIVEZ, - ) { - return Err(TextureError::IncompleteCubemap); - } - depth_or_array_layers *= 6; + ) + { + return Err(TextureError::IncompleteCubemap); } image.texture_descriptor.size = Extent3d { width: dds.get_width(),