Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

basis_universal: Sync with latest Git to solve more warnings

Browse source
This commit is contained in:
Rémi Verschelde 2025-10-09 12:28:20 +02:00
parent 9a5d6d1049
commit 845f9f73cd
No known key found for this signature in database
GPG key ID: C3336907360768E1
23 changed files with 297 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

28
thirdparty/basis_universal/encoder/basisu_comp.cpp vendored
View file

@ -3448,7 +3448,7 @@ namespace basisu
}
default:
assert(0);
fmt_debug_printf("HERE 1\n");
//fmt_debug_printf("HERE 1\n");
return false;
}
@ -3456,7 +3456,7 @@ namespace basisu
{
if ((m_params.m_ktx2_uastc_supercompression != basist::KTX2_SS_NONE) && (m_params.m_ktx2_uastc_supercompression != basist::KTX2_SS_ZSTANDARD))
{
fmt_debug_printf("HERE 2\n");
//fmt_debug_printf("HERE 2\n");
return false;
}
}
@ -3492,7 +3492,7 @@ namespace basisu
}
basist::ktx2_header header;
memset(&header, 0, sizeof(header));
memset((void *)&header, 0, sizeof(header));
memcpy(header.m_identifier, basist::g_ktx2_file_identifier, sizeof(basist::g_ktx2_file_identifier));
header.m_pixel_width = base_width;
@ -3544,7 +3544,7 @@ namespace basisu
}
default:
assert(0);
fmt_debug_printf("HERE 3\n");
//fmt_debug_printf("HERE 3\n");
return false;
}
}
@ -3584,7 +3584,7 @@ namespace basisu
if (ZSTD_isError(result))
{
fmt_debug_printf("HERE 5\n");
//fmt_debug_printf("HERE 5\n");
return false;
}
@ -3593,7 +3593,7 @@ namespace basisu
#else
// Can't get here
assert(0);
fmt_debug_printf("HERE 6\n");
//fmt_debug_printf("HERE 6\n");
return false;
#endif
}
@ -3618,7 +3618,7 @@ namespace basisu
etc1s_global_data_header.m_tables_byte_length = backend_output.m_slice_image_tables.size();
basisu::vector<basist::ktx2_etc1s_image_desc> etc1s_image_descs(total_levels * total_layers * total_faces);
memset(etc1s_image_descs.data(), 0, etc1s_image_descs.size_in_bytes());
memset((void *)etc1s_image_descs.data(), 0, etc1s_image_descs.size_in_bytes());
for (uint32_t slice_index = 0; slice_index < m_slice_descs.size(); slice_index++)
{
@ -3662,7 +3662,7 @@ namespace basisu
else if (m_fmt_mode == basist::basis_tex_format::cASTC_HDR_6x6_INTERMEDIATE)
{
basisu::vector<basist::ktx2_astc_hdr_6x6_intermediate_image_desc> image_descs(total_levels * total_layers * total_faces);
memset(image_descs.data(), 0, image_descs.size_in_bytes());
memset((void *)image_descs.data(), 0, image_descs.size_in_bytes());
for (uint32_t slice_index = 0; slice_index < m_slice_descs.size(); slice_index++)
{
@ -3717,7 +3717,7 @@ namespace basisu
uint8_vec dfd;
if (!get_dfd(dfd, header))
{
fmt_debug_printf("HERE 7\n");
//fmt_debug_printf("HERE 7\n");
return false;
}
@ -3729,20 +3729,20 @@ namespace basisu
{
if (key_values[i].m_key.size() < 2)
{
fmt_debug_printf("HERE 8\n");
//fmt_debug_printf("HERE 8\n");
return false;
}
if (key_values[i].m_key.back() != 0)
{
fmt_debug_printf("HERE 9\n");
//fmt_debug_printf("HERE 9\n");
return false;
}
const uint64_t total_len = (uint64_t)key_values[i].m_key.size() + (uint64_t)key_values[i].m_value.size();
if (total_len >= UINT32_MAX)
{
fmt_debug_printf("HERE 10\n");
//fmt_debug_printf("HERE 10\n");
return false;
}
@ -3777,7 +3777,7 @@ namespace basisu
assert(!pass);
if (pass)
{
fmt_debug_printf("HERE 11\n");
//fmt_debug_printf("HERE 11\n");
return false;
}
@ -3805,7 +3805,7 @@ namespace basisu
}
basisu::vector<basist::ktx2_level_index> level_index_array(total_levels);
memset(level_index_array.data(), 0, level_index_array.size_in_bytes());
memset((void *)level_index_array.data(), 0, level_index_array.size_in_bytes());
m_output_ktx2_file.clear();
m_output_ktx2_file.reserve(m_output_basis_file.size());