aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-01-31 20:32:05 -0500
committerMarge Bot <[email protected]>2020-02-11 00:34:57 +0000
commitca99fe8a603b08883493c786037ca872c00df145 (patch)
treeccfee2f7d392595f4afb37e59c18dd7e12040ca4 /src/mesa
parenta5f72c91e5ac38c82bcc1585e6d6f08b9929dba3 (diff)
vbo: add/update unlikely statements in ATTR_UNION
Reviewed-by: Mathias Fröhlich <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3766>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/vbo/vbo_exec_api.c6
1 files changed, 3 insertions, 3 deletions
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 */ \