Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mipmap levels can be 0 and they should be interpreted as 1 #11767

Merged
merged 10 commits into from
Feb 11, 2024
Merged

mipmap levels can be 0 and they should be interpreted as 1 #11767

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f6b5efc
mipmap levels can be 0 and they should be interpreted as 1
anarelion Feb 7, 2024
449448e
formatting
anarelion Feb 7, 2024
59467cb
Warn on mipmap levels being 0
anarelion Feb 7, 2024
0854b63
Address feedback
anarelion Feb 8, 2024
c4d7274
cargo fmt
anarelion Feb 8, 2024
8824b13
Proper gating of the new param
anarelion Feb 8, 2024
567f782
Add features where needed and check all features
anarelion Feb 8, 2024
03e33a4
Merge branch 'bevyengine:main' into dds_mipmap_level
anarelion Feb 8, 2024
7817131
Correctly propagate the new features
anarelion Feb 8, 2024
518fc80
Merge branch 'bevyengine:main' into dds_mipmap_level
anarelion Feb 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion crates/bevy_render/src/texture/dds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ pub fn dds_buffer_to_image(
depth_or_array_layers,
}
.physical_size(texture_format);
image.texture_descriptor.mip_level_count = dds.get_num_mipmap_levels();
let mut mip_map_level = dds.get_num_mipmap_levels();
if mip_map_level == 0 {
warn!("Mipmap levels for texture are 0, bumping them to 1");
anarelion marked this conversation as resolved.
Show resolved Hide resolved
mip_map_level = 1;
}
image.texture_descriptor.mip_level_count = mip_map_level;
anarelion marked this conversation as resolved.
Show resolved Hide resolved
superdump marked this conversation as resolved.
Show resolved Hide resolved
image.texture_descriptor.format = texture_format;
image.texture_descriptor.dimension = if dds.get_depth() > 1 {
TextureDimension::D3
Expand Down
Loading