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

glthread: fix multi draws with a negative draw count

Browse source 
This fixes the invalid pointers when draw_count is invalid.
I don't know if it had any adverse affect.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27350>
This commit is contained in:
Marek Olšák 2024-01-09 03:19:54 -05:00 • committed by Marge Bot
parent eda0b9f8d4
commit 97532db988
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -481,13 +481,14 @@ _mesa_unmarshal_MultiDrawArraysUserBuf(struct gl_context *ctx,
{
const GLenum mode = cmd->mode;
const GLsizei draw_count = cmd->draw_count;
const GLsizei real_draw_count = MAX2(draw_count, 0);
const GLuint user_buffer_mask = cmd->user_buffer_mask;
const char *variable_data = (const char *)(cmd + 1);
const GLint *first = (GLint *)variable_data;
variable_data += sizeof(GLint) * draw_count;
variable_data += sizeof(GLint) * real_draw_count;
const GLsizei *count = (GLsizei *)variable_data;
variable_data += sizeof(GLsizei) * draw_count;
variable_data += sizeof(GLsizei) * real_draw_count;
const struct glthread_attrib_binding *buffers =
(const struct glthread_attrib_binding *)variable_data;
@ -897,18 +898,19 @@ _mesa_unmarshal_MultiDrawElementsUserBuf(struct gl_context *ctx,
const struct marshal_cmd_MultiDrawElementsUserBuf *restrict cmd)
{
const GLsizei draw_count = cmd->draw_count;
const GLsizei real_draw_count = MAX2(draw_count, 0);
const GLuint user_buffer_mask = cmd->user_buffer_mask;
const bool has_base_vertex = cmd->has_base_vertex;
const char *variable_data = (const char *)(cmd + 1);
const GLsizei *count = (GLsizei *)variable_data;
variable_data += sizeof(GLsizei) * draw_count;
variable_data += sizeof(GLsizei) * real_draw_count;
const GLvoid *const *indices = (const GLvoid *const *)variable_data;
variable_data += sizeof(const GLvoid *const *) * draw_count;
variable_data += sizeof(const GLvoid *const *) * real_draw_count;
const GLsizei *basevertex = NULL;
if (has_base_vertex) {
basevertex = (GLsizei *)variable_data;
variable_data += sizeof(GLsizei) * draw_count;
variable_data += sizeof(GLsizei) * real_draw_count;
}
const struct glthread_attrib_binding *buffers =
(const struct glthread_attrib_binding *)variable_data;