Merge pull request #103968 from Chubercik/basis_universal-1.60

basis_universal: Update to 1.60
This commit is contained in:
Thaddeus Crews 2025-04-27 19:21:17 -05:00
commit be994d59c9
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
43 changed files with 29563 additions and 6572 deletions

View file

@ -20,22 +20,24 @@ basisu_encoder = env.editor_build
if basisu_encoder:
encoder_sources = [
"3rdparty/android_astc_decomp.cpp",
"basisu_astc_hdr_enc.cpp",
"basisu_astc_hdr_6x6_enc.cpp",
"basisu_astc_hdr_common.cpp",
"basisu_backend.cpp",
"basisu_basis_file.cpp",
"basisu_bc7enc.cpp",
"basisu_opencl.cpp",
"basisu_comp.cpp",
"basisu_enc.cpp",
"basisu_etc.cpp",
"basisu_frontend.cpp",
"basisu_gpu_texture.cpp",
"basisu_kernels_sse.cpp",
"basisu_opencl.cpp",
"basisu_pvrtc1_4.cpp",
"basisu_resampler.cpp",
"basisu_resample_filters.cpp",
"basisu_resampler.cpp",
"basisu_ssim.cpp",
"basisu_uastc_enc.cpp",
"basisu_uastc_hdr_4x4_enc.cpp",
"pvpngreader.cpp",
]
encoder_sources = [thirdparty_dir + "encoder/" + file for file in encoder_sources]

View file

@ -101,13 +101,13 @@ Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedCha
basisu::basis_compressor_params params;
params.m_uastc = true;
params.m_quality_level = basisu::BASISU_QUALITY_MIN;
params.m_pack_uastc_flags &= ~basisu::cPackUASTCLevelMask;
params.m_pack_uastc_flags |= basisu::cPackUASTCLevelFastest;
params.m_etc1s_quality_level = basisu::BASISU_QUALITY_MIN;
params.m_pack_uastc_ldr_4x4_flags &= ~basisu::cPackUASTCLevelMask;
params.m_pack_uastc_ldr_4x4_flags |= basisu::cPackUASTCLevelFastest;
params.m_rdo_uastc = 0.0f;
params.m_rdo_uastc_quality_scalar = 0.0f;
params.m_rdo_uastc_dict_size = 1024;
params.m_rdo_uastc_ldr_4x4 = 0.0f;
params.m_rdo_uastc_ldr_4x4_quality_scalar = 0.0f;
params.m_rdo_uastc_ldr_4x4_dict_size = 1024;
params.m_mip_fast = true;
params.m_multithreading = true;
@ -127,7 +127,7 @@ Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedCha
if (is_hdr) {
decompress_format = BASIS_DECOMPRESS_HDR_RGB;
params.m_hdr = true;
params.m_uastc_hdr_options.set_quality_level(0);
params.m_uastc_hdr_4x4_options.set_quality_level(0);
} else {
switch (p_channels) {