From edd77338267a64aae82e18cf5e5203fd73d596f4 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 10 Aug 2021 20:06:09 +0200 Subject: [PATCH] vbo/dlist: use buffer_in_ram_size MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The next commit will refactor buffer upload so we need to decouple the size from the CPU buffer holding the vertices from the size of the GPU buffer where we're uploading them. Reviewed-by: Marek Olšák Part-of: --- src/mesa/vbo/vbo_save_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index b728ea3e632..aed816d8c92 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -211,7 +211,7 @@ reset_counters(struct gl_context *ctx) assert(save->buffer_map == save->buffer_ptr); if (save->vertex_size) - save->max_vert = (save->vertex_store->bufferobj->Size / sizeof(float) - save->vertex_store->used) / + save->max_vert = (save->vertex_store->buffer_in_ram_size / sizeof(float) - save->vertex_store->used) / save->vertex_size; else save->max_vert = 0; @@ -908,7 +908,7 @@ end: * the next vertex lists as well. */ if (save->vertex_store->used > - save->vertex_store->bufferobj->Size / sizeof(float) - 16 * (save->vertex_size + 4)) { + save->vertex_store->buffer_in_ram_size / sizeof(float) - 16 * (save->vertex_size + 4)) { realloc_storage(ctx, -1, 0); } else { @@ -1073,7 +1073,7 @@ upgrade_vertex(struct gl_context *ctx, GLuint attr, GLuint newsz) save->enabled |= BITFIELD64_BIT(attr); save->vertex_size += newsz - oldsz; - save->max_vert = ((save->vertex_store->bufferobj->Size / sizeof(float) - + save->max_vert = ((save->vertex_store->buffer_in_ram_size / sizeof(float) - save->vertex_store->used) / save->vertex_size); save->vert_count = 0;