diff --git a/.pick_status.json b/.pick_status.json index 793209a11a0..c9d9a231a05 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2947,7 +2947,7 @@ "description": "vbo: remove bogus assert", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a08baaff9764372c29d89886bc1331343d4273bf" }, diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index a41d518a5db..a782e210563 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1336,11 +1336,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)