Mesa (main): dlist: don't handle unmerged draws as merged

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 11d6441b94c7bf59ee32c8bcb0e30d370f3bd42c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11d6441b94c7bf59ee32c8bcb0e30d370f3bd42c

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Jul 20 14:31:19 2021 +0200

dlist: don't handle unmerged draws as merged

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 <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11978>

---

 src/mesa/vbo/vbo_save_draw.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 1b76c073917..eae03daf48f 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;