From 44bdd5225c48d266e42d93defbb7ca9ae74aa21b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 14 Jan 2021 15:42:01 -0800 Subject: [PATCH] vbo: Don't set node->min_index = max_index = indices_offset when merging MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I'm can't see why this is necessary. There are already new fields (node->merged.{min,max}_index) for the new values in the merged case. But in vbo_save_draw.c, in the !draw_using_merged_prim case, we would try and use the original node...with the now destroyed min/max index. Fixes some assert failures when running with swtnl and forcing the non-merged path (though it takes the merged path by default). Fixes: 4c751ad67aa ("vbo/dlist: use a shared index buffer") Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Marek Olšák Part-of: --- src/mesa/vbo/vbo_save_api.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index b8edee7..b258e6a 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -670,7 +670,6 @@ compile_vertex_list(struct gl_context *ctx) int available = save->previous_ib ? (save->previous_ib->Size / 4 - save->ib_first_free_index) : 0; if (available >= max_indices_count) { indices_offset = save->ib_first_free_index; - node->min_index = node->max_index = indices_offset; } int size = max_indices_count * sizeof(uint32_t); uint32_t* indices = (uint32_t*) malloc(size); -- 2.7.4