From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 1 Feb 2020 01:32:05 +0000 (-0500)
Subject: vbo: add/update unlikely statements in ATTR_UNION
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca99fe8a603b08883493c786037ca872c00df145;p=mesa.git

vbo: add/update unlikely statements in ATTR_UNION

Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3766>
---

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index a9a20ed66a5..597f07c0212 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -481,8 +481,8 @@ do {                                                                    \
    assert(sz == 1 || sz == 2);                                          \
                                                                         \
    /* check if attribute size or type is changing */                    \
-   if (unlikely(exec->vtx.attr[A].active_size != N * sz) ||             \
-       unlikely(exec->vtx.attr[A].type != T)) {                         \
+   if (unlikely(exec->vtx.attr[A].active_size != N * sz ||              \
+                exec->vtx.attr[A].type != T)) {                         \
       vbo_exec_fixup_vertex(ctx, A, N * sz, T);                         \
    }                                                                    \
                                                                         \
@@ -531,7 +531,7 @@ do {                                                                    \
       /* Current.Attrib[VBO_ATTRIB_POS] is never used. */               \
       ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;                   \
                                                                         \
-      if (++exec->vtx.vert_count >= exec->vtx.max_vert)                 \
+      if (unlikely(++exec->vtx.vert_count >= exec->vtx.max_vert))       \
          vbo_exec_vtx_wrap(exec);                                       \
    } else {                                                             \
       /* we now have accumulated per-vertex attributes */               \