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

Merge pull request #46163 from lawnjelly/ewok_fix_lightmasking 

Batching - prevent joining of lightmasked items
This commit is contained in:
Rémi Verschelde 2021-02-18 11:57:32 +01:00 committed by GitHub
parent 96a3f01ac5 389dd6704e
commit 386402e05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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