From 8205042be60ccfe8d1661767e6f293c97d33e2cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 27 Feb 2020 15:30:08 -0500 Subject: [PATCH] vbo: clean up conditional blocks in ATTR_UNION MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Move the A != 0 code to the first block. Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Mathias Fröhlich Reviewed-by: Ian Romanick Part-of: --- src/mesa/vbo/vbo_exec_api.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 2f049ccd450..29773fbba4d 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -487,9 +487,10 @@ do { \ if (N>2) dest[2] = V2; \ if (N>3) dest[3] = V3; \ assert(exec->vtx.attr[A].type == T); \ - } \ \ - if ((A) == 0) { \ + /* we now have accumulated a per-vertex attribute */ \ + ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT; \ + } else { \ /* This is a glVertex call */ \ uint32_t *dst = (uint32_t *)exec->vtx.buffer_ptr; \ uint32_t *src = (uint32_t *)exec->vtx.vertex; \ @@ -523,9 +524,6 @@ do { \ \ if (unlikely(++exec->vtx.vert_count >= exec->vtx.max_vert)) \ vbo_exec_vtx_wrap(exec); \ - } else { \ - /* we now have accumulated per-vertex attributes */ \ - ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT; \ } \ } while (0) -- 2.30.2