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

Merge pull request #94628 from Chaosus/rendering_fix_crash

Browse source 
Fix crash when assigning more textures than expected to texture array
This commit is contained in:
Rémi Verschelde 2024-07-23 13:08:18 +02:00
commit ad1955a63d
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gles3/storage/material_storage.cpp
View file

@ -874,7 +874,8 @@ void MaterialData::update_textures(const HashMap<StringName, Variant> &p_paramet
if (V->value.is_array()) { if (V->value.is_array()) {
Array array = (Array)V->value; Array array = (Array)V->value;
if (uniform_array_size > 0) { if (uniform_array_size > 0) {
for (int j = 0; j < array.size(); j++) { int size = MIN(uniform_array_size, array.size());
for (int j = 0; j < size; j++) {
textures.push_back(array[j]); textures.push_back(array[j]);
} }
} else { } else {

3
servers/rendering/renderer_rd/storage_rd/material_storage.cpp
View file

@ -807,7 +807,8 @@ void MaterialStorage::MaterialData::update_textures(const HashMap<StringName, Va
if (V->value.is_array()) { if (V->value.is_array()) {
Array array = (Array)V->value; Array array = (Array)V->value;
if (uniform_array_size > 0) { if (uniform_array_size > 0) {
for (int j = 0; j < array.size(); j++) { int size = MIN(uniform_array_size, array.size());
for (int j = 0; j < size; j++) {
textures.push_back(array[j]); textures.push_back(array[j]);
} }
} else { } else {