From 04affaa56730976c2558f9579762cc455ff56633 Mon Sep 17 00:00:00 2001 From: Patrick Lerda Date: Sat, 20 May 2023 17:12:34 +0200 Subject: [PATCH] glthread: fix typo related to upload_vertices() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 68a926a15b7b ("glthread: set GL_OUT_OF_MEMORY if we fail to upload vertices") Signed-off-by: Patrick Lerda Reviewed-by: Tapani Pälli Reviewed-by: Marek Olšák Part-of: (cherry picked from commit 39a9ebde37887fd935d7b3e5ca4860abf49e6d95) --- .pick_status.json | 2 +- src/mesa/main/glthread_draw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5f784e55b2f..05fc335115e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -715,7 +715,7 @@ "description": "glthread: fix typo related to upload_vertices()", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "68a926a15b7b3724a29c050b8595177a32fc67a1" }, diff --git a/src/mesa/main/glthread_draw.c b/src/mesa/main/glthread_draw.c index 61fb8bcbd96..b747493aba7 100644 --- a/src/mesa/main/glthread_draw.c +++ b/src/mesa/main/glthread_draw.c @@ -207,7 +207,7 @@ upload_vertices(struct gl_context *ctx, unsigned user_buffer_mask, &upload_buffer, NULL, ctx->Const.VertexBufferOffsetIsInt32 ? 0 : start); if (!upload_buffer) { for (unsigned i = 0; i < num_buffers; i++) - _mesa_reference_buffer_object(ctx, &buffers->buffer, NULL); + _mesa_reference_buffer_object(ctx, &buffers[i].buffer, NULL); _mesa_marshal_InternalSetError(GL_OUT_OF_MEMORY); return false; @@ -267,7 +267,7 @@ upload_vertices(struct gl_context *ctx, unsigned user_buffer_mask, ctx->Const.VertexBufferOffsetIsInt32 ? 0 : offset); if (!upload_buffer) { for (unsigned i = 0; i < num_buffers; i++) - _mesa_reference_buffer_object(ctx, &buffers->buffer, NULL); + _mesa_reference_buffer_object(ctx, &buffers[i].buffer, NULL); _mesa_marshal_InternalSetError(GL_OUT_OF_MEMORY); return false;