From 2e70de7d2f703cf81cbe114a99f6328045143c26 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 30 Mar 2017 21:14:43 +1100 Subject: [PATCH] mesa/vbo: remove redundant _mesa_is_bufferobj() calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is already called inside the vbo_exec_vtx_{unmap,map}() functions. Reviewed-by: Brian Paul Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- src/mesa/vbo/vbo_exec_draw.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index c2fcb663cbe..df34f059b30 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -426,9 +426,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped) if (ctx->NewState) _mesa_update_state( ctx ); - if (_mesa_is_bufferobj(exec->vtx.bufferobj)) { - vbo_exec_vtx_unmap( exec ); - } + vbo_exec_vtx_unmap(exec); if (0) printf("%s %d %d\n", __func__, exec->vtx.prim_count, @@ -443,19 +441,15 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped) exec->vtx.vert_count - 1, NULL, 0, NULL); - /* If using a real VBO, get new storage -- unless asked not to. - */ - if (_mesa_is_bufferobj(exec->vtx.bufferobj) && !keepUnmapped) { + /* Get new storage -- unless asked not to. */ + if (!keepUnmapped) vbo_exec_vtx_map( exec ); - } } } /* May have to unmap explicitly if we didn't draw: */ - if (keepUnmapped && - _mesa_is_bufferobj(exec->vtx.bufferobj) && - exec->vtx.buffer_map) { + if (keepUnmapped && exec->vtx.buffer_map) { vbo_exec_vtx_unmap( exec ); } -- 2.30.2