fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 13:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vbo: remove dead code in vbo_can_merge_prims

Browse source 
This is only used by immediate mode and the values are immutable.

Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3861>
This commit is contained in:
Marek Olšák 2020-02-10 21:24:26 -05:00
parent 2491a2ddeb
commit 3eeeb86cb0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/vbo/vbo_exec.c
View file

@ -191,10 +191,9 @@ vbo_can_merge_prims(const struct _mesa_prim *p0, const struct _mesa_prim *p1)
if (p0->start + p0->count != p1->start)
return false;
if (p0->basevertex != p1->basevertex ||
p0->num_instances != p1->num_instances ||
p0->base_instance != p1->base_instance)
return false;
assert(p0->basevertex == p1->basevertex &&
p0->num_instances == p1->num_instances &&
p0->base_instance == p1->base_instance);
/* can always merge subsequent GL_POINTS primitives */
if (p0->mode == GL_POINTS)