From 0eb551f658e444fa2f70653355db3e2c5c025e0f Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 20 Jul 2021 14:31:19 +0200 Subject: [PATCH] dlist: don't handle unmerged draws as merged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The comment was incorrect: we can have N draws using the same mode with N > 1 (eg: GL_QUAD_STRIP draws cannot be merged). This commit fixes the drawing code to use the correct draw function. This fixes a hang in Starsector (see issue #5086). Fixes: b328d8e9bc9 ("dlist: use an union instead of allocating a 1-sized array") Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 11d6441b94c7bf59ee32c8bcb0e30d370f3bd42c) --- .pick_status.json | 2 +- src/mesa/vbo/vbo_save_draw.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 7be072e7d5e..5068d56d55b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -121,7 +121,7 @@ "description": "dlist: don't handle unmerged draws as merged", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b328d8e9bc9900a0372d7c3307f18ad11d708af9" }, diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 279b064c2cd..b61c1e56be3 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -247,9 +247,11 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data, bool copy_to_c node->merged.start_counts, node->merged.mode, node->merged.num_draws); - } else if (node->merged.num_draws) { - /* If node->merged.mode is NULL then num_draws is 0 or 1 */ + } else if (node->merged.num_draws == 1) { ctx->Driver.DrawGallium(ctx, info, 0, &node->merged.start_count, 1); + } else if (node->merged.num_draws) { + ctx->Driver.DrawGallium(ctx, info, 0, node->merged.start_counts, + node->merged.num_draws); } info->index.gl_bo = gl_bo;