From f4de2cd22aac19264a1ec52c6a355adab1a285f1 Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Fri, 14 Mar 2025 09:26:29 +0100 Subject: [PATCH] Use `resize_zeroed` instead of `resize` then `fill(0)` in several places. --- core/io/pck_packer.cpp | 3 +-- editor/export/editor_export_platform.cpp | 3 +-- platform/windows/windows_utils.cpp | 4 +--- scene/resources/surface_tool.cpp | 6 ++---- servers/rendering/renderer_rd/environment/fog.cpp | 3 +-- servers/rendering/renderer_rd/shader_rd.cpp | 3 +-- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp index ae1f4bc93d7..75870f09b95 100644 --- a/core/io/pck_packer.cpp +++ b/core/io/pck_packer.cpp @@ -118,8 +118,7 @@ Error PCKPacker::add_file_removal(const String &p_target_path) { pf.size = 0; pf.removal = true; - pf.md5.resize(16); - pf.md5.fill(0); + pf.md5.resize_zeroed(16); files.push_back(pf); diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index fc6290fe508..70279a7c29f 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -1642,8 +1642,7 @@ Error EditorExportPlatform::_remove_pack_file(void *p_userdata, const String &p_ pd->f->store_8(0); } - sd.md5.resize(16); - sd.md5.fill(0); + sd.md5.resize_zeroed(16); pd->file_ofs.push_back(sd); diff --git a/platform/windows/windows_utils.cpp b/platform/windows/windows_utils.cpp index d749ed32121..4d2d47d687f 100644 --- a/platform/windows/windows_utils.cpp +++ b/platform/windows/windows_utils.cpp @@ -229,10 +229,8 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) { file->store_buffer(u8); // Terminate string and fill the remaining part of the original string with the '\0'. - // Can be replaced by file->store_8('\0'); Vector padding_buffer; - padding_buffer.resize((int64_t)original_path_size - u8.size()); - padding_buffer.fill('\0'); + padding_buffer.resize_zeroed((int64_t)original_path_size - u8.size()); file->store_buffer(padding_buffer); ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to write a new PDB path to '%s'.", p_dll_path)); diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index ce17cf8799a..3e12342973a 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -645,8 +645,7 @@ Array SurfaceTool::commit_to_arrays() { case Mesh::ARRAY_BONES: { int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4; Vector array; - array.resize(varr_len * count); - array.fill(0); + array.resize_zeroed(varr_len * count); int *w = array.ptrw(); for (uint32_t idx = 0; idx < vertex_array.size(); idx++) { @@ -669,8 +668,7 @@ Array SurfaceTool::commit_to_arrays() { Vector array; int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4; - array.resize(varr_len * count); - array.fill(0.0f); + array.resize_zeroed(varr_len * count); float *w = array.ptrw(); for (uint32_t idx = 0; idx < vertex_array.size(); idx++) { diff --git a/servers/rendering/renderer_rd/environment/fog.cpp b/servers/rendering/renderer_rd/environment/fog.cpp index b6a96b025cb..1950ce8d311 100644 --- a/servers/rendering/renderer_rd/environment/fog.cpp +++ b/servers/rendering/renderer_rd/environment/fog.cpp @@ -437,8 +437,7 @@ void Fog::VolumetricFog::init(const Vector3i &fog_size, RID p_sky_shader) { #if defined(MACOS_ENABLED) || defined(IOS_ENABLED) Vector dm; - dm.resize(fog_size.x * fog_size.y * fog_size.z * 4); - dm.fill(0); + dm.resize_zeroed(fog_size.x * fog_size.y * fog_size.z * 4); density_map = RD::get_singleton()->storage_buffer_create(dm.size(), dm); RD::get_singleton()->set_resource_name(density_map, "Fog density map"); diff --git a/servers/rendering/renderer_rd/shader_rd.cpp b/servers/rendering/renderer_rd/shader_rd.cpp index d2d226bc3af..8044e79f728 100644 --- a/servers/rendering/renderer_rd/shader_rd.cpp +++ b/servers/rendering/renderer_rd/shader_rd.cpp @@ -187,8 +187,7 @@ void ShaderRD::_initialize_version(Version *p_version) { p_version->variants.resize_zeroed(variant_defines.size()); p_version->variant_data.resize(variant_defines.size()); - p_version->group_compilation_tasks.resize(group_enabled.size()); - p_version->group_compilation_tasks.fill(0); + p_version->group_compilation_tasks.resize_zeroed(group_enabled.size()); } void ShaderRD::_clear_version(Version *p_version) {