diff options
| author | Marek Olšák <[email protected]> | 2020-02-10 21:24:26 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-02-18 16:45:34 -0500 |
| commit | 3eeeb86cb0e8dd8ddb23b2eda0213c8f1a44feec (patch) | |
| tree | 907d2d46bf12f41e6a97e4abf320379bee91afbe /src | |
| parent | 2491a2ddeb53f3d44b4633f967bfa5b023946bce (diff) | |
vbo: remove dead code in vbo_can_merge_prims
This is only used by immediate mode and the values are immutable.
Reviewed-by: Mathias Fröhlich <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3861>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/vbo/vbo_exec.c | 7 |
1 files 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) |