summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/astcenc/image_compress_astcenc.cpp175
-rw-r--r--modules/astcenc/image_compress_astcenc.h2
-rw-r--r--modules/cvtt/image_compress_cvtt.cpp2
-rw-r--r--modules/cvtt/image_compress_cvtt.h2
-rw-r--r--modules/etcpak/image_compress_etcpak.cpp16
-rw-r--r--modules/etcpak/image_compress_etcpak.h8
-rw-r--r--modules/gdscript/gdscript_compiler.cpp10
-rw-r--r--modules/gdscript/gdscript_parser.cpp6
-rw-r--r--modules/gdscript/tests/scripts/analyzer/features/vararg_call.gd6
-rw-r--r--modules/gdscript/tests/scripts/analyzer/features/vararg_call.out2
-rw-r--r--modules/text_server_adv/text_server_adv.cpp3
11 files changed, 139 insertions, 93 deletions
diff --git a/modules/astcenc/image_compress_astcenc.cpp b/modules/astcenc/image_compress_astcenc.cpp
index ce10201343..1c643d780d 100644
--- a/modules/astcenc/image_compress_astcenc.cpp
+++ b/modules/astcenc/image_compress_astcenc.cpp
@@ -35,7 +35,7 @@
#include <astcenc.h>
-void _compress_astc(Image *r_img, float p_lossy_quality, Image::ASTCFormat p_format) {
+void _compress_astc(Image *r_img, Image::ASTCFormat p_format) {
uint64_t start_time = OS::get_singleton()->get_ticks_msec();
// TODO: See how to handle lossy quality.
@@ -83,65 +83,91 @@ void _compress_astc(Image *r_img, float p_lossy_quality, Image::ASTCFormat p_for
const bool mipmaps = r_img->has_mipmaps();
int width = r_img->get_width();
int height = r_img->get_height();
+ int required_width = (width % block_x) != 0 ? width + (block_x - (width % block_x)) : width;
+ int required_height = (height % block_y) != 0 ? height + (block_y - (height % block_y)) : height;
+
+ if (width != required_width || height != required_height) {
+ // Resize texture to fit block size.
+ r_img->resize(required_width, required_height);
+ width = required_width;
+ height = required_height;
+ }
print_verbose(vformat("astcenc: Encoding image size %dx%d to format %s%s.", width, height, Image::get_format_name(target_format), mipmaps ? ", with mipmaps" : ""));
// Initialize astcenc.
+ int dest_size = Image::get_image_data_size(width, height, target_format, mipmaps);
+ Vector<uint8_t> dest_data;
+ dest_data.resize(dest_size);
+ uint8_t *dest_write = dest_data.ptrw();
+
astcenc_config config;
config.block_x = block_x;
config.block_y = block_y;
config.profile = profile;
- const float quality = ASTCENC_PRE_MEDIUM;
- astcenc_error status = astcenc_config_init(profile, block_x, block_y, block_x, quality, 0, &config);
+ const float quality = ASTCENC_PRE_MEDIUM;
+ astcenc_error status = astcenc_config_init(profile, block_x, block_y, 1, quality, 0, &config);
ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
vformat("astcenc: Configuration initialization failed: %s.", astcenc_get_error_string(status)));
// Context allocation.
astcenc_context *context;
- const unsigned int thread_count = OS::get_singleton()->get_processor_count();
-
+ const unsigned int thread_count = 1; // Godot compresses multiple images each on a thread, which is more efficient for large amount of images imported.
status = astcenc_context_alloc(&config, thread_count, &context);
ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
vformat("astcenc: Context allocation failed: %s.", astcenc_get_error_string(status)));
- // Compress image.
-
Vector<uint8_t> image_data = r_img->get_data();
- uint8_t *slices = image_data.ptrw();
- astcenc_image image;
- image.dim_x = width;
- image.dim_y = height;
- image.dim_z = 1;
- image.data_type = ASTCENC_TYPE_U8;
- if (is_hdr) {
- image.data_type = ASTCENC_TYPE_F32;
- }
- image.data = reinterpret_cast<void **>(&slices);
+ int mip_count = mipmaps ? Image::get_image_required_mipmaps(width, height, target_format) : 0;
+ for (int i = 0; i < mip_count + 1; i++) {
+ int src_mip_w, src_mip_h;
+ int src_ofs = Image::get_image_mipmap_offset_and_dimensions(width, height, r_img->get_format(), i, src_mip_w, src_mip_h);
- // Compute the number of ASTC blocks in each dimension.
- unsigned int block_count_x = (width + block_x - 1) / block_x;
- unsigned int block_count_y = (height + block_y - 1) / block_y;
- size_t comp_len = block_count_x * block_count_y * 16;
+ const uint8_t *slices = &image_data.ptr()[src_ofs];
- Vector<uint8_t> compressed_data;
- compressed_data.resize(comp_len);
- compressed_data.fill(0);
+ int dst_mip_w, dst_mip_h;
+ int dst_ofs = Image::get_image_mipmap_offset_and_dimensions(width, height, target_format, i, dst_mip_w, dst_mip_h);
+ // Ensure that mip offset is a multiple of 8 (etcpak expects uint64_t pointer).
+ ERR_FAIL_COND(dst_ofs % 8 != 0);
+ uint8_t *dest_mip_write = (uint8_t *)&dest_write[dst_ofs];
- const astcenc_swizzle swizzle = {
- ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A
- };
+ // Compress image.
- status = astcenc_compress_image(context, &image, &swizzle, compressed_data.ptrw(), comp_len, 0);
- ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
- vformat("astcenc: ASTC image compression failed: %s.", astcenc_get_error_string(status)));
+ astcenc_image image;
+ image.dim_x = src_mip_w;
+ image.dim_y = src_mip_h;
+ image.dim_z = 1;
+ image.data_type = ASTCENC_TYPE_U8;
+ if (is_hdr) {
+ image.data_type = ASTCENC_TYPE_F32;
+ }
+ image.data = (void **)(&slices);
+
+ // Compute the number of ASTC blocks in each dimension.
+ unsigned int block_count_x = (src_mip_w + block_x - 1) / block_x;
+ unsigned int block_count_y = (src_mip_h + block_y - 1) / block_y;
+ size_t comp_len = block_count_x * block_count_y * 16;
+
+ const astcenc_swizzle swizzle = {
+ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A
+ };
+
+ status = astcenc_compress_image(context, &image, &swizzle, dest_mip_write, comp_len, 0);
+
+ ERR_BREAK_MSG(status != ASTCENC_SUCCESS,
+ vformat("astcenc: ASTC image compression failed: %s.", astcenc_get_error_string(status)));
+ astcenc_compress_reset(context);
+ }
+
+ astcenc_context_free(context);
// Replace original image with compressed one.
- r_img->set_data(width, height, mipmaps, target_format, compressed_data);
+ r_img->set_data(width, height, mipmaps, target_format, dest_data);
print_verbose(vformat("astcenc: Encoding took %s ms.", rtos(OS::get_singleton()->get_ticks_msec() - start_time)));
}
@@ -184,68 +210,81 @@ void _decompress_astc(Image *r_img) {
astcenc_config config;
const float quality = ASTCENC_PRE_MEDIUM;
- astcenc_error status = astcenc_config_init(profile, block_x, block_y, block_x, quality, 0, &config);
+ astcenc_error status = astcenc_config_init(profile, block_x, block_y, 1, quality, 0, &config);
ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
vformat("astcenc: Configuration initialization failed: %s.", astcenc_get_error_string(status)));
// Context allocation.
astcenc_context *context = nullptr;
- const unsigned int thread_count = OS::get_singleton()->get_processor_count();
+ const unsigned int thread_count = 1;
status = astcenc_context_alloc(&config, thread_count, &context);
ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
vformat("astcenc: Context allocation failed: %s.", astcenc_get_error_string(status)));
- // Decompress image.
+ Image::Format target_format = is_hdr ? Image::FORMAT_RGBAF : Image::FORMAT_RGBA8;
const bool mipmaps = r_img->has_mipmaps();
int width = r_img->get_width();
int height = r_img->get_height();
+ int dest_size = Image::get_image_data_size(width, height, target_format, mipmaps);
+ Vector<uint8_t> dest_data;
+ dest_data.resize(dest_size);
+ uint8_t *dest_write = dest_data.ptrw();
- astcenc_image image;
- image.dim_x = width;
- image.dim_y = height;
- image.dim_z = 1;
- image.data_type = ASTCENC_TYPE_U8;
- Image::Format target_format = Image::FORMAT_RGBA8;
- if (is_hdr) {
- target_format = Image::FORMAT_RGBAF;
- image.data_type = ASTCENC_TYPE_F32;
- }
+ // Decompress image.
Vector<uint8_t> image_data = r_img->get_data();
+ int mip_count = mipmaps ? Image::get_image_required_mipmaps(width, height, target_format) : 0;
- Vector<uint8_t> new_image_data;
- new_image_data.resize(Image::get_image_data_size(width, height, target_format, false));
- new_image_data.fill(0);
- uint8_t *slices = new_image_data.ptrw();
- image.data = reinterpret_cast<void **>(&slices);
+ for (int i = 0; i < mip_count + 1; i++) {
+ int src_mip_w, src_mip_h;
+
+ int src_ofs = Image::get_image_mipmap_offset_and_dimensions(width, height, r_img->get_format(), i, src_mip_w, src_mip_h);
+ const uint8_t *src_data = &image_data.ptr()[src_ofs];
+ int src_size;
+ if (i == mip_count) {
+ src_size = image_data.size() - src_ofs;
+ } else {
+ int auxw, auxh;
+ src_size = Image::get_image_mipmap_offset_and_dimensions(width, height, r_img->get_format(), i + 1, auxw, auxh) - src_ofs;
+ }
- const astcenc_swizzle swizzle = {
- ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A
- };
+ int dst_mip_w, dst_mip_h;
+ int dst_ofs = Image::get_image_mipmap_offset_and_dimensions(width, height, target_format, i, dst_mip_w, dst_mip_h);
+ // Ensure that mip offset is a multiple of 8 (etcpak expects uint64_t pointer).
+ ERR_FAIL_COND(dst_ofs % 8 != 0);
+ uint8_t *dest_mip_write = (uint8_t *)&dest_write[dst_ofs];
+
+ astcenc_image image;
+ image.dim_x = dst_mip_w;
+ image.dim_y = dst_mip_h;
+ image.dim_z = 1;
+ image.data_type = ASTCENC_TYPE_U8;
+ if (is_hdr) {
+ target_format = Image::FORMAT_RGBAF;
+ image.data_type = ASTCENC_TYPE_F32;
+ }
- status = astcenc_decompress_image(context, image_data.ptr(), image_data.size(), &image, &swizzle, 0);
- ERR_FAIL_COND_MSG(status != ASTCENC_SUCCESS,
- vformat("astcenc: ASTC decompression failed: %s.", astcenc_get_error_string(status)));
- ERR_FAIL_COND_MSG(image.dim_z > 1,
- "astcenc: ASTC decompression failed because this is a 3D texture, which is not supported.");
+ image.data = (void **)(&dest_mip_write);
- // Replace original image with compressed one.
+ const astcenc_swizzle swizzle = {
+ ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A
+ };
- Image::Format image_format = Image::FORMAT_RGBA8;
- if (image.data_type == ASTCENC_TYPE_F32) {
- image_format = Image::FORMAT_RGBAF;
- } else if (image.data_type == ASTCENC_TYPE_U8) {
- image_format = Image::FORMAT_RGBA8;
- } else if (image.data_type == ASTCENC_TYPE_F16) {
- image_format = Image::FORMAT_RGBAH;
- } else {
- ERR_FAIL_MSG("astcenc: ASTC decompression failed with an unknown format.");
+ status = astcenc_decompress_image(context, src_data, src_size, &image, &swizzle, 0);
+ ERR_BREAK_MSG(status != ASTCENC_SUCCESS,
+ vformat("astcenc: ASTC decompression failed: %s.", astcenc_get_error_string(status)));
+ ERR_BREAK_MSG(image.dim_z > 1,
+ "astcenc: ASTC decompression failed because this is a 3D texture, which is not supported.");
+ astcenc_compress_reset(context);
}
+ astcenc_context_free(context);
+
+ // Replace original image with compressed one.
- r_img->set_data(image.dim_x, image.dim_y, mipmaps, image_format, new_image_data);
+ r_img->set_data(width, height, mipmaps, target_format, dest_data);
print_verbose(vformat("astcenc: Decompression took %s ms.", rtos(OS::get_singleton()->get_ticks_msec() - start_time)));
}
diff --git a/modules/astcenc/image_compress_astcenc.h b/modules/astcenc/image_compress_astcenc.h
index a197a91e0d..ad157d7c0a 100644
--- a/modules/astcenc/image_compress_astcenc.h
+++ b/modules/astcenc/image_compress_astcenc.h
@@ -33,7 +33,7 @@
#include "core/io/image.h"
-void _compress_astc(Image *r_img, float p_lossy_quality, Image::ASTCFormat p_format);
+void _compress_astc(Image *r_img, Image::ASTCFormat p_format);
void _decompress_astc(Image *r_img);
#endif // IMAGE_COMPRESS_ASTCENC_H
diff --git a/modules/cvtt/image_compress_cvtt.cpp b/modules/cvtt/image_compress_cvtt.cpp
index 4982b6b995..f19228cb18 100644
--- a/modules/cvtt/image_compress_cvtt.cpp
+++ b/modules/cvtt/image_compress_cvtt.cpp
@@ -129,7 +129,7 @@ static void _digest_row_task(const CVTTCompressionJobParams &p_job_params, const
}
}
-void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels) {
+void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
if (p_image->get_format() >= Image::FORMAT_BPTC_RGBA) {
return; //do not compress, already compressed
}
diff --git a/modules/cvtt/image_compress_cvtt.h b/modules/cvtt/image_compress_cvtt.h
index 5dc8b6f52c..ca88a9d4c9 100644
--- a/modules/cvtt/image_compress_cvtt.h
+++ b/modules/cvtt/image_compress_cvtt.h
@@ -33,7 +33,7 @@
#include "core/io/image.h"
-void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::UsedChannels p_channels);
+void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels);
void image_decompress_cvtt(Image *p_image);
#endif // IMAGE_COMPRESS_CVTT_H
diff --git a/modules/etcpak/image_compress_etcpak.cpp b/modules/etcpak/image_compress_etcpak.cpp
index a6aeec54cc..16a59d3880 100644
--- a/modules/etcpak/image_compress_etcpak.cpp
+++ b/modules/etcpak/image_compress_etcpak.cpp
@@ -74,25 +74,23 @@ EtcpakType _determine_dxt_type(Image::UsedChannels p_channels) {
}
}
-void _compress_etc1(Image *r_img, float p_lossy_quality) {
- _compress_etcpak(EtcpakType::ETCPAK_TYPE_ETC1, r_img, p_lossy_quality);
+void _compress_etc1(Image *r_img) {
+ _compress_etcpak(EtcpakType::ETCPAK_TYPE_ETC1, r_img);
}
-void _compress_etc2(Image *r_img, float p_lossy_quality, Image::UsedChannels p_channels) {
+void _compress_etc2(Image *r_img, Image::UsedChannels p_channels) {
EtcpakType type = _determine_etc_type(p_channels);
- _compress_etcpak(type, r_img, p_lossy_quality);
+ _compress_etcpak(type, r_img);
}
-void _compress_bc(Image *r_img, float p_lossy_quality, Image::UsedChannels p_channels) {
+void _compress_bc(Image *r_img, Image::UsedChannels p_channels) {
EtcpakType type = _determine_dxt_type(p_channels);
- _compress_etcpak(type, r_img, p_lossy_quality);
+ _compress_etcpak(type, r_img);
}
-void _compress_etcpak(EtcpakType p_compresstype, Image *r_img, float p_lossy_quality) {
+void _compress_etcpak(EtcpakType p_compresstype, Image *r_img) {
uint64_t start_time = OS::get_singleton()->get_ticks_msec();
- // TODO: See how to handle lossy quality.
-
Image::Format img_format = r_img->get_format();
if (img_format >= Image::FORMAT_DXT1) {
return; // Do not compress, already compressed.
diff --git a/modules/etcpak/image_compress_etcpak.h b/modules/etcpak/image_compress_etcpak.h
index 8cb17b1c8a..ff267631a6 100644
--- a/modules/etcpak/image_compress_etcpak.h
+++ b/modules/etcpak/image_compress_etcpak.h
@@ -43,10 +43,10 @@ enum class EtcpakType {
ETCPAK_TYPE_DXT5_RA_AS_RG,
};
-void _compress_etc1(Image *r_img, float p_lossy_quality);
-void _compress_etc2(Image *r_img, float p_lossy_quality, Image::UsedChannels p_channels);
-void _compress_bc(Image *r_img, float p_lossy_quality, Image::UsedChannels p_channels);
+void _compress_etc1(Image *r_img);
+void _compress_etc2(Image *r_img, Image::UsedChannels p_channels);
+void _compress_bc(Image *r_img, Image::UsedChannels p_channels);
-void _compress_etcpak(EtcpakType p_compresstype, Image *r_img, float p_lossy_quality);
+void _compress_etcpak(EtcpakType p_compresstype, Image *r_img);
#endif // IMAGE_COMPRESS_ETCPAK_H
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp
index c78dd1528f..6acdc9f212 100644
--- a/modules/gdscript/gdscript_compiler.cpp
+++ b/modules/gdscript/gdscript_compiler.cpp
@@ -196,7 +196,11 @@ static bool _is_exact_type(const PropertyInfo &p_par_type, const GDScriptDataTyp
}
}
-static bool _have_exact_arguments(const MethodBind *p_method, const Vector<GDScriptCodeGenerator::Address> &p_arguments) {
+static bool _can_use_ptrcall(const MethodBind *p_method, const Vector<GDScriptCodeGenerator::Address> &p_arguments) {
+ if (p_method->is_vararg()) {
+ // ptrcall won't work with vararg methods.
+ return false;
+ }
if (p_method->get_argument_count() != p_arguments.size()) {
// ptrcall won't work with default arguments.
return false;
@@ -563,7 +567,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
self.mode = GDScriptCodeGenerator::Address::SELF;
MethodBind *method = ClassDB::get_method(codegen.script->native->get_name(), call->function_name);
- if (_have_exact_arguments(method, arguments)) {
+ if (_can_use_ptrcall(method, arguments)) {
// Exact arguments, use ptrcall.
gen->write_call_ptrcall(result, self, method, arguments);
} else {
@@ -613,7 +617,7 @@ GDScriptCodeGenerator::Address GDScriptCompiler::_parse_expression(CodeGen &code
}
if (ClassDB::class_exists(class_name) && ClassDB::has_method(class_name, call->function_name)) {
MethodBind *method = ClassDB::get_method(class_name, call->function_name);
- if (_have_exact_arguments(method, arguments)) {
+ if (_can_use_ptrcall(method, arguments)) {
// Exact arguments, use ptrcall.
gen->write_call_ptrcall(result, base, method, arguments);
} else {
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp
index 06c66b155f..66374d0a6d 100644
--- a/modules/gdscript/gdscript_parser.cpp
+++ b/modules/gdscript/gdscript_parser.cpp
@@ -1906,10 +1906,8 @@ GDScriptParser::MatchNode *GDScriptParser::parse_match() {
return match;
}
-#ifdef DEBUG_ENABLED
bool all_have_return = true;
bool have_wildcard = false;
-#endif
while (!check(GDScriptTokenizer::Token::DEDENT) && !is_at_end()) {
MatchBranchNode *branch = parse_match_branch();
@@ -1922,21 +1920,19 @@ GDScriptParser::MatchNode *GDScriptParser::parse_match() {
if (have_wildcard && !branch->patterns.is_empty()) {
push_warning(branch->patterns[0], GDScriptWarning::UNREACHABLE_PATTERN);
}
+#endif
have_wildcard = have_wildcard || branch->has_wildcard;
all_have_return = all_have_return && branch->block->has_return;
-#endif
match->branches.push_back(branch);
}
complete_extents(match);
consume(GDScriptTokenizer::Token::DEDENT, R"(Expected an indented block after "match" statement.)");
-#ifdef DEBUG_ENABLED
if (all_have_return && have_wildcard) {
current_suite->has_return = true;
}
-#endif
return match;
}
diff --git a/modules/gdscript/tests/scripts/analyzer/features/vararg_call.gd b/modules/gdscript/tests/scripts/analyzer/features/vararg_call.gd
new file mode 100644
index 0000000000..d444250f1e
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/vararg_call.gd
@@ -0,0 +1,6 @@
+signal ok()
+
+@warning_ignore("return_value_discarded")
+func test():
+ ok.connect(func(): print('ok'))
+ emit_signal(&'ok')
diff --git a/modules/gdscript/tests/scripts/analyzer/features/vararg_call.out b/modules/gdscript/tests/scripts/analyzer/features/vararg_call.out
new file mode 100644
index 0000000000..1b47ed10dc
--- /dev/null
+++ b/modules/gdscript/tests/scripts/analyzer/features/vararg_call.out
@@ -0,0 +1,2 @@
+GDTEST_OK
+ok
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index e53aef965a..9b474bf2ce 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -4068,7 +4068,6 @@ void TextServerAdvanced::_realign(ShapedTextDataAdvanced *p_sd) const {
RID TextServerAdvanced::_shaped_text_substr(const RID &p_shaped, int64_t p_start, int64_t p_length) const {
_THREAD_SAFE_METHOD_
-
const ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
ERR_FAIL_COND_V(!sd, RID());
@@ -5513,6 +5512,7 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
}
bool TextServerAdvanced::_shaped_text_shape(const RID &p_shaped) {
+ _THREAD_SAFE_METHOD_
ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
ERR_FAIL_COND_V(!sd, false);
@@ -6569,6 +6569,7 @@ TextServerAdvanced::TextServerAdvanced() {
}
void TextServerAdvanced::_cleanup() {
+ _THREAD_SAFE_METHOD_
for (const KeyValue<SystemFontKey, SystemFontCache> &E : system_fonts) {
const Vector<SystemFontCacheRec> &sysf_cache = E.value.var;
for (const SystemFontCacheRec &F : sysf_cache) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-05 04:03:58 +0000