Module: Mesa Branch: main Commit: 491f6b138ecbe938471f7ee1bc339b32c61eed07 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=491f6b138ecbe938471f7ee1bc339b32c61eed07
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Tue Jan 17 10:13:00 2023 +0100 vbo: remove bogus assert grow_vertex_storage may call wrap_filled_vertex, which will trigger the assert incorrectly because the new size will be smaller than 'new_size' but it's correct because 'vertex_store->used' has been reset to 0. Fixes: a08baaff976 ("vbo/dlist: fix indentation in vbo_save_api.c") Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20748> --- src/mesa/vbo/vbo_save_api.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index d6bdfa3840a..49fa879cd4b 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1364,11 +1364,8 @@ do { \ save->vertex_store->used += save->vertex_size; \ unsigned used_next = (save->vertex_store->used + \ save->vertex_size) * sizeof(float); \ - if (used_next > save->vertex_store->buffer_in_ram_size) { \ + if (used_next > save->vertex_store->buffer_in_ram_size) \ grow_vertex_storage(ctx, get_vertex_count(save)); \ - assert(used_next <= \ - save->vertex_store->buffer_in_ram_size); \ - } \ } \ } while (0)
