Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-10-30 20:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

emcc warning fixes, fixing warnings in WASM cmakelists.txt files, changing ETC1S encoder to use std::map vs. std::unordered_map for hopefully more cross platform determinism

Browse Source
This commit is contained in:
Richard Geldreich
2025-06-24 17:22:05 -04:00
parent 75b19f6aff
commit 100ace82d2
15 changed files with 2201 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
encoder/basisu_comp.cpp
+4 -4
View File
@@ -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;
@@ -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++)
{
@@ -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());