From 869f0a4992f2e1efa8fb8e5b8da1dd0600568973 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 31 Aug 2021 16:41:12 -0400 Subject: [PATCH] mesa: skip fallback draw call if no primitives are being drawn MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/mesa/main/draw.c: In function ‘_mesa_draw_gallium_fallback’: ../src/mesa/main/draw.c:1056:4: warning: ‘prim’ may be used uninitialized [-Wmaybe-uninitialized] 1056 | ctx->Driver.Draw(ctx, prim, num_prims, index_size ? &ib : NULL, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1057 | index_bounds_valid, info->primitive_restart, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1058 | info->restart_index, min_index, max_index, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1059 | info->instance_count, info->start_instance); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/draw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index e74c407c595..60bef28378a 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -1064,10 +1064,11 @@ _mesa_draw_gallium_fallback(struct gl_context *ctx, } } - ctx->Driver.Draw(ctx, prim, num_prims, index_size ? &ib : NULL, - index_bounds_valid, info->primitive_restart, - info->restart_index, min_index, max_index, - info->instance_count, info->start_instance); + if (num_prims) + ctx->Driver.Draw(ctx, prim, num_prims, index_size ? &ib : NULL, + index_bounds_valid, info->primitive_restart, + info->restart_index, min_index, max_index, + info->instance_count, info->start_instance); FREE_PRIMS(prim, num_draws); }