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

Avoid crash when CanvasTexture used with light decal atlas 

The decal atlas is used for Light2Ds, decals, and Light3Ds
This commit is contained in:
clayjohn 2023-01-30 20:59:53 -08:00
parent 551f5191e5
commit cfd5fe0f29
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -1499,6 +1499,9 @@ void RasterizerCanvasGLES3::light_set_texture(RID p_rid, RID p_texture) {
if (cl->texture == p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (cl->texture.is_valid()) {
texture_storage->texture_remove_from_texture_atlas(cl->texture);
}

3
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@ -1550,6 +1550,9 @@ void RendererCanvasRenderRD::light_set_texture(RID p_rid, RID p_texture) {
if (cl->texture == p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (cl->texture.is_valid()) {
texture_storage->texture_remove_from_decal_atlas(cl->texture);
}

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

@ -232,6 +232,8 @@ void LightStorage::light_set_projector(RID p_light, RID p_texture) {
return;
}
ERR_FAIL_COND(p_texture.is_valid() && !texture_storage->owns_texture(p_texture));
if (light->type != RS::LIGHT_DIRECTIONAL && light->projector.is_valid()) {
texture_storage->texture_remove_from_decal_atlas(light->projector, light->type == RS::LIGHT_OMNI);
}