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

Batching - prevent joining of lightmasked items

Browse source 
It turns out lights masking misbehaves when items that are masked are joined. This PR simply disables joining in this case.
This commit is contained in:
lawnjelly 2021-02-18 09:57:02 +00:00
parent 4384605cb1
commit 389dd6704e
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/gles2/rasterizer_canvas_gles2.cpp
View file

@ -1277,7 +1277,12 @@ bool RasterizerCanvasGLES2::try_join_item(Item *p_ci, RenderItemState &r_ris, bo
r_batch_break = false;
bool join = true;
// light_masked may possibly need state checking here. Check for regressions!
// light_masked objects we just don't currently support for joining
// (this could possibly be improved at a later date)
if (p_ci->light_masked) {
join = false;
r_batch_break = true;
}
// we will now allow joining even if final modulate is different
// we will instead bake the final modulate into the vertex colors

7
drivers/gles3/rasterizer_canvas_gles3.cpp
View file

@ -1678,7 +1678,12 @@ bool RasterizerCanvasGLES3::try_join_item(Item *p_ci, RenderItemState &r_ris, bo
r_batch_break = false;
bool join = true;
// light_masked may possibly need state checking here. Check for regressions!
// light_masked objects we just don't currently support for joining
// (this could possibly be improved at a later date)
if (p_ci->light_masked) {
join = false;
r_batch_break = true;
}
// we will now allow joining even if final modulate is different
// we will instead bake the final modulate into the vertex colors