godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74010 from lyuma/fix_last_basis_lod

Browse Source 
Loop over the last mipmap lod in basis universal
This commit is contained in:
Rémi Verschelde 2023-02-27 08:25:01 +01:00
commit 745e994fc0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/basis_universal/register_types.cpp
View File

@ -74,7 +74,7 @@ static Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::
params.m_source_images.push_back(buimg_image); params.m_source_images.push_back(buimg_image);
} }
basisu::vector<basisu::image> images; basisu::vector<basisu::image> images;
for (int32_t mip_map_i = 1; mip_map_i < image->get_mipmap_count(); mip_map_i++) { for (int32_t mip_map_i = 1; mip_map_i <= image->get_mipmap_count(); mip_map_i++) {
Ref<Image> mip_map = image->get_image_from_mipmap(mip_map_i); Ref<Image> mip_map = image->get_image_from_mipmap(mip_map_i);
Vector<uint8_t> mip_map_vec = mip_map->get_data(); Vector<uint8_t> mip_map_vec = mip_map->get_data();
basisu::image buimg_mipmap(mip_map->get_width(), mip_map->get_height()); basisu::image buimg_mipmap(mip_map->get_width(), mip_map->get_height());
@ -247,7 +247,7 @@ static Ref<Image> basis_universal_unpacker_ptr(const uint8_t *p_data, int p_size
dst[i] = 0x00; dst[i] = 0x00;
} }
uint32_t mip_count = Image::get_image_required_mipmaps(info.m_orig_width, info.m_orig_height, imgfmt); uint32_t mip_count = Image::get_image_required_mipmaps(info.m_orig_width, info.m_orig_height, imgfmt);
for (uint32_t level_i = 0; level_i < mip_count; level_i++) { for (uint32_t level_i = 0; level_i <= mip_count; level_i++) {
basist::basisu_image_level_info level; basist::basisu_image_level_info level;
tr.get_image_level_info(ptr, size, level, 0, level_i); tr.get_image_level_info(ptr, size, level, 0, level_i);
int ofs = Image::get_image_mipmap_offset(info.m_width, info.m_height, imgfmt, level_i); int ofs = Image::get_image_mipmap_offset(info.m_width, info.m_height, imgfmt, level_i);