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

Merge pull request #104302 from brennennen/reflection_probe_count_error_check

Browse Source 
Add error check for reflection probe invalid atlas index.
This commit is contained in:
Thaddeus Crews
2025-07-14 10:30:31 -05:00
parent 7e0b813abd 2583aa4a68
commit 35a2d7843e
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@ -2494,7 +2494,7 @@ void RasterizerSceneGLES3::render_scene(const Ref<RenderSceneBuffers> &p_render_
}
GLuint fbo = 0;
if (is_reflection_probe) {
if (is_reflection_probe && GLES3::LightStorage::get_singleton()->reflection_probe_has_atlas_index(render_data.reflection_probe)) {
fbo = GLES3::LightStorage::get_singleton()->reflection_probe_instance_get_framebuffer(render_data.reflection_probe, render_data.reflection_probe_pass);
} else {
rb->set_apply_color_adjustments_in_post(apply_color_adjustments_in_post);

3
drivers/gles3/storage/light_storage.cpp
View File

@ -1032,6 +1032,7 @@ GLuint LightStorage::reflection_probe_instance_get_texture(RID p_instance) {
ReflectionAtlas *atlas = reflection_atlas_owner.get_or_null(rpi->atlas);
ERR_FAIL_NULL_V(atlas, 0);
ERR_FAIL_COND_V(rpi->atlas_index < 0, 0);
return atlas->reflections[rpi->atlas_index].radiance;
}
@ -1043,6 +1044,8 @@ GLuint LightStorage::reflection_probe_instance_get_framebuffer(RID p_instance, i
ReflectionAtlas *atlas = reflection_atlas_owner.get_or_null(rpi->atlas);
ERR_FAIL_NULL_V(atlas, 0);
ERR_FAIL_COND_V(rpi->atlas_index < 0, 0);
return atlas->reflections[rpi->atlas_index].fbos[p_index];
}

4
servers/rendering/renderer_rd/storage_rd/light_storage.cpp
View File

@ -1663,6 +1663,8 @@ RID LightStorage::reflection_probe_instance_get_framebuffer(RID p_instance, int
ReflectionAtlas *atlas = reflection_atlas_owner.get_or_null(rpi->atlas);
ERR_FAIL_NULL_V(atlas, RID());
ERR_FAIL_COND_V_MSG(rpi->atlas_index < 0, RID(), "Reflection probe atlas index invalid. Maximum amount of reflection probes in use (" + itos(atlas->count) + ") may have been exceeded, reflections will not display properly. Consider increasing Rendering > Reflections > Reflection Atlas > Reflection Count in the Project Settings.");
return atlas->reflections[rpi->atlas_index].fbs[p_index];
}
@ -1886,7 +1888,7 @@ void LightStorage::lightmap_set_textures(RID p_lightmap, RID p_light, bool p_use
}
}
}
ERR_FAIL_COND_MSG(lm->array_index < 0, "Maximum amount of lightmaps in use (" + itos(lightmap_textures.size()) + ") has been exceeded, lightmap will nod display properly.");
ERR_FAIL_COND_MSG(lm->array_index < 0, "Maximum amount of lightmaps in use (" + itos(lightmap_textures.size()) + ") has been exceeded, lightmap will not display properly.");
lightmap_textures.write[lm->array_index] = t->rd_texture;
}