From 3eeeb86cb0e8dd8ddb23b2eda0213c8f1a44feec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 10 Feb 2020 21:24:26 -0500 Subject: [PATCH] vbo: remove dead code in vbo_can_merge_prims MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is only used by immediate mode and the values are immutable. Reviewed-by: Mathias Fröhlich Part-of: --- src/mesa/vbo/vbo_exec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c index e4775ba5c12..f1b1f8bff95 100644 --- a/src/mesa/vbo/vbo_exec.c +++ b/src/mesa/vbo/vbo_exec.c @@ -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) -- 2.30.2