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: set GL_OUT_OF_MEMORY if we fail to upload indices

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20824>
This commit is contained in:
Marek Olšák 2023-01-17 14:37:03 -05:00
parent 777166cc66
commit e39b90311c
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,9 +71,11 @@ upload_indices(struct gl_context *ctx, unsigned count, unsigned index_size,
_mesa_glthread_upload(ctx, *indices, index_size * count,
&upload_offset, &upload_buffer, NULL, 0);
assert(upload_buffer);
*indices = (const GLvoid*)(intptr_t)upload_offset;
if (!upload_buffer)
_mesa_marshal_InternalSetError(GL_OUT_OF_MEMORY);
return upload_buffer;
}
@ -91,7 +93,10 @@ upload_multi_indices(struct gl_context *ctx, unsigned total_count,
_mesa_glthread_upload(ctx, NULL, index_size * total_count,
&upload_offset, &upload_buffer, &upload_ptr, 0);
assert(upload_buffer);
if (!upload_buffer) {
_mesa_marshal_InternalSetError(GL_OUT_OF_MEMORY);
return NULL;
}
for (unsigned i = 0, offset = 0; i < draw_count; i++) {
if (count[i] == 0)
@ -940,15 +945,18 @@ draw_elements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices,
goto sync;
struct glthread_attrib_binding buffers[VERT_ATTRIB_MAX];
if (user_buffer_mask &&
!upload_vertices(ctx, user_buffer_mask, start_vertex, num_vertices,
baseinstance, instance_count, buffers))
goto sync;
if (user_buffer_mask) {
upload_vertices(ctx, user_buffer_mask, start_vertex, num_vertices,
baseinstance, instance_count, buffers);
}
/* Upload indices. */
struct gl_buffer_object *index_buffer = NULL;
if (has_user_indices)
if (has_user_indices) {
index_buffer = upload_indices(ctx, count, index_size, &indices);
if (!index_buffer)
return; /* the error is set by upload_indices */
}
/* Draw asynchronously. */
draw_elements_async_user(ctx, mode, count, type, indices, instance_count,
@ -1224,6 +1232,9 @@ _mesa_marshal_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count,
index_buffer = upload_multi_indices(ctx, total_count, index_size,
draw_count, count, indices,
out_indices);
if (!index_buffer)
return; /* the error is set by upload_multi_indices */
indices = out_indices;
}