godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build warning with memset value being too large 

same resolution for issue #83342 for texture_storage.cpp
This commit is contained in:
Griffin Kroah-Hartman 2024-01-13 19:05:38 +01:00
parent 26b1fd0d84
commit 21ae69a1de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
View File

@ -2552,7 +2552,7 @@ void TextureStorage::update_decal_atlas() {
//generate atlas //generate atlas
Vector<DecalAtlas::SortItem> itemsv; Vector<DecalAtlas::SortItem> itemsv;
itemsv.resize(decal_atlas.textures.size()); itemsv.resize(decal_atlas.textures.size());
int base_size = 8; uint32_t base_size = 8;
int idx = 0; int idx = 0;
@ -2565,7 +2565,7 @@ void TextureStorage::update_decal_atlas() {
si.size.height = (src_tex->height / border) + 1; si.size.height = (src_tex->height / border) + 1;
si.pixel_size = Size2i(src_tex->width, src_tex->height); si.pixel_size = Size2i(src_tex->width, src_tex->height);
if (base_size < si.size.width) { if (base_size < (uint32_t)si.size.width) {
base_size = nearest_power_of_2_templated(si.size.width); base_size = nearest_power_of_2_templated(si.size.width);
} }
@ -2596,7 +2596,7 @@ void TextureStorage::update_decal_atlas() {
DecalAtlas::SortItem &si = items[i]; DecalAtlas::SortItem &si = items[i];
int best_idx = -1; int best_idx = -1;
int best_height = 0x7FFFFFFF; int best_height = 0x7FFFFFFF;
for (int j = 0; j <= base_size - si.size.width; j++) { for (uint32_t j = 0; j <= base_size - si.size.width; j++) {
int height = 0; int height = 0;
for (int k = 0; k < si.size.width; k++) { for (int k = 0; k < si.size.width; k++) {
int h = v_offsets[k + j]; int h = v_offsets[k + j];
@ -2627,7 +2627,7 @@ void TextureStorage::update_decal_atlas() {
} }
} }
if (max_height <= base_size * 2) { if ((uint32_t)max_height <= base_size * 2) {
atlas_height = max_height; atlas_height = max_height;
break; //good ratio, break; break; //good ratio, break;
} }