Skip to content

Commit 22f6827

Browse files
beicausebeicause
committed
BasisU: Use KTX2 format and add project settings
1 parent a210fe6 commit 22f6827

File tree

4 files changed

+48
-26
lines changed

4 files changed

+48
-26
lines changed

‎doc/classes/ProjectSettings.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3196,6 +3196,18 @@
31963196
<member name="rendering/shading/overrides/force_vertex_shading" type="bool" setter="" getter="" default="false">
31973197
If [code]true[/code], forces vertex shading for all rendering. This can increase performance a lot, but also reduces quality immensely. Can be used to optimize performance on low-end mobile devices.
31983198
</member>
3199+
<member name="rendering/textures/basis_universal/quality_level" type="int" setter="" getter="" default="1">
3200+
</member>
3201+
<member name="rendering/textures/basis_universal/rdo_enabled" type="bool" setter="" getter="" default="false">
3202+
</member>
3203+
<member name="rendering/textures/basis_universal/rdo_quality_scalar" type="float" setter="" getter="" default="1.0">
3204+
</member>
3205+
<member name="rendering/textures/basis_universal/uastc_pack_level" type="int" setter="" getter="" default="0">
3206+
</member>
3207+
<member name="rendering/textures/basis_universal/zstd_supercompression" type="bool" setter="" getter="" default="false">
3208+
</member>
3209+
<member name="rendering/textures/basis_universal/zstd_supercompression_level" type="int" setter="" getter="" default="6">
3210+
</member>
31993211
<member name="rendering/textures/canvas_textures/default_texture_filter" type="int" setter="" getter="" default="1">
32003212
The default texture filtering mode to use for [CanvasItem]s built-in texture. In shaders, this texture is accessed as [code]TEXTURE[/code].
32013213
[b]Note:[/b] For pixel art aesthetics, see also [member rendering/2d/snap/snap_2d_vertices_to_pixel] and [member rendering/2d/snap/snap_2d_transforms_to_pixel].

‎modules/basis_universal/SCsub

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,8 @@ env_thirdparty.disable_warnings()
5858
# <https://github.com/BinomialLLC/basis_universal/wiki/How-to-Use-and-Configure-the-Transcoder>
5959
env_thirdparty.Append(
6060
CPPDEFINES=[
61-
# Storage formats.
62-
# Godot only implements `.basis` support through basis_universal.
63-
# Support for `.ktx` files are implemented with a direct libktx implementation.
64-
# Building the encoder requires `BASISD_SUPPORT_KTX2` to be enabled,
65-
# so we can only disable Zstandard compression for `.ktx` files
66-
# (this is not used in `.basis` files).
67-
("BASISD_SUPPORT_KTX2_ZSTD", 0),
61+
# Enable ktx2 zstd_supercompression.
62+
("BASISD_SUPPORT_KTX2_ZSTD", 1),
6863
# GPU compression formats.
6964
("BASISD_SUPPORT_ATC", 0), # Proprietary Adreno format not supported by Godot.
7065
("BASISD_SUPPORT_FXT1", 0), # Legacy format not supported by Godot.

‎modules/basis_universal/image_compress_basisu.cpp

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "image_compress_basisu.h"
3232

33+
#include "core/config/project_settings.h"
3334
#include "core/io/image.h"
3435
#include "core/os/os.h"
3536
#include "core/string/print_string.h"
@@ -100,14 +101,24 @@ Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedCha
100101

101102
basisu::basis_compressor_params params;
102103

104+
int quality_level = GLOBAL_GET("rendering/textures/basis_universal/quality_level");
105+
int uastc_pack_level = GLOBAL_GET("rendering/textures/basis_universal/uastc_pack_level");
106+
int rdo_enabled = GLOBAL_GET("rendering/textures/basis_universal/rdo_enabled");
107+
int rdo_quality_scalar = GLOBAL_GET("rendering/textures/basis_universal/rdo_quality_scalar");
108+
int zstd_supercompression = GLOBAL_GET("rendering/textures/basis_universal/zstd_supercompression");
109+
int zstd_supercompression_level = GLOBAL_GET("rendering/textures/basis_universal/zstd_supercompression_level");
110+
103111
params.m_uastc = true;
104-
params.m_quality_level = basisu::BASISU_QUALITY_MIN;
112+
params.m_quality_level = quality_level;
105113
params.m_pack_uastc_flags &= ~basisu::cPackUASTCLevelMask;
106-
params.m_pack_uastc_flags |= basisu::cPackUASTCLevelFastest;
114+
params.m_pack_uastc_flags |= uastc_pack_level;
115+
116+
params.m_rdo_uastc = rdo_enabled;
117+
params.m_rdo_uastc_quality_scalar = rdo_quality_scalar;
107118

108-
params.m_rdo_uastc = 0.0f;
109-
params.m_rdo_uastc_quality_scalar = 0.0f;
110-
params.m_rdo_uastc_dict_size = 1024;
119+
params.m_create_ktx2_file = true;
120+
params.m_ktx2_uastc_supercompression = zstd_supercompression ? basist::KTX2_SS_ZSTANDARD : basist::KTX2_SS_NONE;
121+
params.m_ktx2_zstd_supercompression_level = zstd_supercompression_level;
111122

112123
params.m_mip_fast = true;
113124
params.m_multithreading = true;
@@ -241,7 +252,7 @@ Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedCha
241252
int basisu_err = compressor.process();
242253
ERR_FAIL_COND_V(basisu_err != basisu::basis_compressor::cECSuccess, Vector<uint8_t>());
243254

244-
const basisu::uint8_vec &basisu_encoded = compressor.get_output_basis_file();
255+
const basisu::uint8_vec &basisu_encoded = compressor.get_output_ktx2_file();
245256

246257
Vector<uint8_t> basisu_data;
247258
basisu_data.resize(basisu_encoded.size() + 4);
@@ -398,37 +409,34 @@ Ref<Image> basis_universal_unpacker_ptr(const uint8_t *p_data, int p_size) {
398409
src_ptr += 4;
399410
src_size -= 4;
400411

401-
basist::basisu_transcoder transcoder;
402-
ERR_FAIL_COND_V(!transcoder.validate_header(src_ptr, src_size), image);
403-
404-
transcoder.start_transcoding(src_ptr, src_size);
412+
basist::ktx2_transcoder transcoder;
413+
ERR_FAIL_COND_V(!transcoder.init(src_ptr, src_size), image);
405414

406-
basist::basisu_image_info basisu_info;
407-
transcoder.get_image_info(src_ptr, src_size, basisu_info, 0);
415+
transcoder.start_transcoding();
408416

409417
// Create the buffer for transcoded/decompressed data.
410418
Vector<uint8_t> out_data;
411-
out_data.resize(Image::get_image_data_size(basisu_info.m_width, basisu_info.m_height, image_format, basisu_info.m_total_levels > 1));
419+
out_data.resize(Image::get_image_data_size(transcoder.get_width(), transcoder.get_height(), image_format, transcoder.get_levels() > 1));
412420

413421
uint8_t *dst = out_data.ptrw();
414422
memset(dst, 0, out_data.size());
415423

416-
for (uint32_t i = 0; i < basisu_info.m_total_levels; i++) {
417-
basist::basisu_image_level_info basisu_level;
418-
transcoder.get_image_level_info(src_ptr, src_size, basisu_level, 0, i);
424+
for (uint32_t i = 0; i < transcoder.get_levels(); i++) {
425+
basist::ktx2_image_level_info basisu_level;
426+
transcoder.get_image_level_info(basisu_level, i, 0, 0);
419427

420428
uint32_t mip_block_or_pixel_count = Image::is_format_compressed(image_format) ? basisu_level.m_total_blocks : basisu_level.m_orig_width * basisu_level.m_orig_height;
421-
int64_t ofs = Image::get_image_mipmap_offset(basisu_info.m_width, basisu_info.m_height, image_format, i);
429+
int64_t ofs = Image::get_image_mipmap_offset(transcoder.get_width(), transcoder.get_height(), image_format, i);
422430

423-
bool result = transcoder.transcode_image_level(src_ptr, src_size, 0, i, dst + ofs, mip_block_or_pixel_count, basisu_format);
431+
bool result = transcoder.transcode_image_level(i, 0, 0, dst + ofs, mip_block_or_pixel_count, basisu_format);
424432

425433
if (!result) {
426434
print_line(vformat("BasisUniversal cannot unpack level %d.", i));
427435
break;
428436
}
429437
}
430438

431-
image = Image::create_from_data(basisu_info.m_width, basisu_info.m_height, basisu_info.m_total_levels > 1, image_format, out_data);
439+
image = Image::create_from_data(transcoder.get_width(), transcoder.get_height(), transcoder.get_levels() > 1, image_format, out_data);
432440

433441
if (needs_ra_rg_swap) {
434442
// Swap uncompressed RA-as-RG texture's color channels.

‎servers/rendering_server.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,6 +3597,13 @@ void RenderingServer::init() {
35973597
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/webp_compression/compression_method", PROPERTY_HINT_RANGE, "0,6,1"), 2);
35983598
GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/textures/webp_compression/lossless_compression_factor", PROPERTY_HINT_RANGE, "0,100,1"), 25);
35993599

3600+
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/basis_universal/quality_level"), 1);
3601+
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/basis_universal/uastc_pack_level", PROPERTY_HINT_ENUM, "Fastest,Faster,Medium,Slower,VerySlow"), 0);
3602+
GLOBAL_DEF(PropertyInfo(Variant::BOOL, "rendering/textures/basis_universal/rdo_enabled"), false);
3603+
GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/textures/basis_universal/rdo_quality_scalar"), 1.0);
3604+
GLOBAL_DEF(PropertyInfo(Variant::BOOL, "rendering/textures/basis_universal/zstd_supercompression"), false);
3605+
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/textures/basis_universal/zstd_supercompression_level"), 6);
3606+
36003607
GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/limits/time/time_rollover_secs", PROPERTY_HINT_RANGE, "1,10000,1,or_greater,suffix:s"), 3600);
36013608

36023609
GLOBAL_DEF_RST("rendering/lights_and_shadows/use_physical_light_units", false);

0 commit comments

Comments
 (0)