Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-21 06:52:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Batching - add protection against invalid polys

Browse Source 
The editor under certain circumstances is passing invalid polys to the renderer. This should be fixed upstream but just in case this PR adds fault tolerance for invalid indices.
This commit is contained in:
lawnjelly 2021-03-20 10:23:43 +00:00
parent f50c8062dd
commit ae1c45329d
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -1539,8 +1539,9 @@ bool C_PREAMBLE::_prefill_polygon(RasterizerCanvas::Item::CommandPolygon *p_poly
int num_inds = p_poly->indices.size();
// nothing to draw?
if (!num_inds)
if (!num_inds || !p_poly->points.size()) {
return false;
}
// we aren't using indices, so will transform verts more than once .. less efficient.
// could be done with a temporary vertex buffer
@ -1667,6 +1668,13 @@ bool C_PREAMBLE::_prefill_polygon(RasterizerCanvas::Item::CommandPolygon *p_poly
RAST_DEV_DEBUG_ASSERT(ind < p_poly->points.size());
// recover at runtime from invalid polys (the editor may send invalid polys)
if ((unsigned int)ind >= (unsigned int)num_verts) {
// will recover as long as there is at least one vertex.
// if there are no verts, we will have quick rejected earlier in this function
ind = 0;
}
// this could be moved outside the loop
if (software_transform) {
Vector2 pos = p_poly->points[ind];
@ -1807,6 +1815,14 @@ PREAMBLE(bool)::_software_skin_poly(RasterizerCanvas::Item::CommandPolygon *p_po
int ind = p_poly->indices[n];
RAST_DEV_DEBUG_ASSERT(ind < num_verts);
// recover at runtime from invalid polys (the editor may send invalid polys)
if ((unsigned int)ind >= (unsigned int)num_verts) {
// will recover as long as there is at least one vertex.
// if there are no verts, we will have quick rejected earlier in this function
ind = 0;
}
const Point2 &pos = pTemps[ind];
bvs[n].pos.set(pos.x, pos.y);