Skip to content

Commit cf4ebb6

Browse files
committed
Merge pull request #104109 from Ivorforce/resize-zeroed
Use `resize_zeroed` instead of `resize` then `fill(0)` in several places.
2 parents b01e967 + f4de2cd commit cf4ebb6

File tree

6 files changed

+7
-15
lines changed

6 files changed

+7
-15
lines changed

core/io/pck_packer.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ Error PCKPacker::add_file_removal(const String &p_target_path) {
118118
pf.size = 0;
119119
pf.removal = true;
120120

121-
pf.md5.resize(16);
122-
pf.md5.fill(0);
121+
pf.md5.resize_zeroed(16);
123122

124123
files.push_back(pf);
125124

editor/export/editor_export_platform.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,8 +1642,7 @@ Error EditorExportPlatform::_remove_pack_file(void *p_userdata, const String &p_
16421642
pd->f->store_8(0);
16431643
}
16441644

1645-
sd.md5.resize(16);
1646-
sd.md5.fill(0);
1645+
sd.md5.resize_zeroed(16);
16471646

16481647
pd->file_ofs.push_back(sd);
16491648

platform/windows/windows_utils.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,8 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
229229
file->store_buffer(u8);
230230

231231
// Terminate string and fill the remaining part of the original string with the '\0'.
232-
// Can be replaced by file->store_8('\0');
233232
Vector<uint8_t> padding_buffer;
234-
padding_buffer.resize((int64_t)original_path_size - u8.size());
235-
padding_buffer.fill('\0');
233+
padding_buffer.resize_zeroed((int64_t)original_path_size - u8.size());
236234
file->store_buffer(padding_buffer);
237235
ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to write a new PDB path to '%s'.", p_dll_path));
238236

scene/resources/surface_tool.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,7 @@ Array SurfaceTool::commit_to_arrays() {
645645
case Mesh::ARRAY_BONES: {
646646
int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4;
647647
Vector<int> array;
648-
array.resize(varr_len * count);
649-
array.fill(0);
648+
array.resize_zeroed(varr_len * count);
650649
int *w = array.ptrw();
651650

652651
for (uint32_t idx = 0; idx < vertex_array.size(); idx++) {
@@ -669,8 +668,7 @@ Array SurfaceTool::commit_to_arrays() {
669668
Vector<float> array;
670669
int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4;
671670

672-
array.resize(varr_len * count);
673-
array.fill(0.0f);
671+
array.resize_zeroed(varr_len * count);
674672
float *w = array.ptrw();
675673

676674
for (uint32_t idx = 0; idx < vertex_array.size(); idx++) {

servers/rendering/renderer_rd/environment/fog.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,7 @@ void Fog::VolumetricFog::init(const Vector3i &fog_size, RID p_sky_shader) {
437437

438438
#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
439439
Vector<uint8_t> dm;
440-
dm.resize(fog_size.x * fog_size.y * fog_size.z * 4);
441-
dm.fill(0);
440+
dm.resize_zeroed(fog_size.x * fog_size.y * fog_size.z * 4);
442441

443442
density_map = RD::get_singleton()->storage_buffer_create(dm.size(), dm);
444443
RD::get_singleton()->set_resource_name(density_map, "Fog density map");

servers/rendering/renderer_rd/shader_rd.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ void ShaderRD::_initialize_version(Version *p_version) {
187187

188188
p_version->variants.resize_zeroed(variant_defines.size());
189189
p_version->variant_data.resize(variant_defines.size());
190-
p_version->group_compilation_tasks.resize(group_enabled.size());
191-
p_version->group_compilation_tasks.fill(0);
190+
p_version->group_compilation_tasks.resize_zeroed(group_enabled.size());
192191
}
193192

194193
void ShaderRD::_clear_version(Version *p_version) {

0 commit comments

Comments
 (0)