fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glthread: fix typo related to upload_vertices()

Browse source 
Fixes: 68a926a15b ("glthread: set GL_OUT_OF_MEMORY if we fail to upload vertices")
Signed-off-by: Patrick Lerda <patrick9876@free.fr>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23166>
(cherry picked from commit 39a9ebde37)
This commit is contained in:
Patrick Lerda 2023-05-20 17:12:34 +02:00 • committed by Eric Engestrom
parent a8da5a0c0d
commit 04affaa567
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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"
},

4
src/mesa/main/glthread_draw.c
View file

@ -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;