OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: allocate the attribute stack on demand

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák
2020-11-11 19:11:09 -05:00
committed by Marge Bot
parent c0456a6565
commit f097c8773e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesa/main/attrib.c
View File

@@ -78,7 +78,15 @@ _mesa_PushAttrib(GLbitfield mask)
return; return;
} }
head = &ctx->AttribStack[ctx->AttribStackDepth]; head = ctx->AttribStack[ctx->AttribStackDepth];
if (unlikely(!head)) {
head = CALLOC_STRUCT(gl_attrib_node);
if (unlikely(!head)) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glPushAttrib");
return;
}
ctx->AttribStack[ctx->AttribStackDepth] = head;
}
head->Mask = mask; head->Mask = mask;
if (mask & GL_ACCUM_BUFFER_BIT) if (mask & GL_ACCUM_BUFFER_BIT)
@@ -650,7 +658,7 @@ _mesa_PopAttrib(void)
} }
ctx->AttribStackDepth--; ctx->AttribStackDepth--;
attr = &ctx->AttribStack[ctx->AttribStackDepth]; attr = ctx->AttribStack[ctx->AttribStackDepth];
unsigned mask = attr->Mask; unsigned mask = attr->Mask;
@@ -1471,11 +1479,14 @@ _mesa_free_attrib_data(struct gl_context *ctx)
struct gl_attrib_node *attr; struct gl_attrib_node *attr;
ctx->AttribStackDepth--; ctx->AttribStackDepth--;
attr = &ctx->AttribStack[ctx->AttribStackDepth]; attr = ctx->AttribStack[ctx->AttribStackDepth];
if (attr->Mask & GL_TEXTURE_BIT) if (attr->Mask & GL_TEXTURE_BIT)
_mesa_reference_shared_state(ctx, &attr->Texture.SharedRef, NULL); _mesa_reference_shared_state(ctx, &attr->Texture.SharedRef, NULL);
} }
for (unsigned i = 0; i < ARRAY_SIZE(ctx->AttribStack); i++)
free(ctx->AttribStack[i]);
} }

2
src/mesa/main/mtypes.h
View File

@@ -5195,7 +5195,7 @@ struct gl_context
/** \name State attribute stack (for glPush/PopAttrib) */ /** \name State attribute stack (for glPush/PopAttrib) */
/*@{*/ /*@{*/
GLuint AttribStackDepth; GLuint AttribStackDepth;
struct gl_attrib_node AttribStack[MAX_ATTRIB_STACK_DEPTH]; struct gl_attrib_node *AttribStack[MAX_ATTRIB_STACK_DEPTH];
/*@}*/ /*@}*/
/** \name Renderer attribute groups /** \name Renderer attribute groups