asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build warning with memset value being too large

Browse source 
Should resolve issue #83342
This commit is contained in:
Griffin Kroah-Hartman 2024-01-07 14:20:18 +01:00
parent c8c483cf57
commit b97cb5ec59
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/gles3/storage/texture_storage.cpp
View file

@ -1475,7 +1475,7 @@ void TextureStorage::update_texture_atlas() {
//generate atlas //generate atlas
Vector<TextureAtlas::SortItem> itemsv; Vector<TextureAtlas::SortItem> itemsv;
itemsv.resize(texture_atlas.textures.size()); itemsv.resize(texture_atlas.textures.size());
int base_size = 8; uint32_t base_size = 8;
int idx = 0; int idx = 0;
@ -1488,7 +1488,7 @@ void TextureStorage::update_texture_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);
} }
@ -1519,7 +1519,7 @@ void TextureStorage::update_texture_atlas() {
TextureAtlas::SortItem &si = items[i]; TextureAtlas::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];
@ -1550,7 +1550,7 @@ void TextureStorage::update_texture_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;
} }