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

glthread: fix matrix stack depth tracking

Browse Source 
Dont bump the depth if the application attempts to overflow or
underflow the stack.

Fixes: 6febe2b880 ("glthread: track all matrix stack depths")

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19059>
(cherry picked from commit a5e9e64aae)
This commit is contained in:
Timothy Arceri
2022-10-13 14:17:37 +11:00
committed by Dylan Baker
parent a9dcaf14a3
commit 4631b95688
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -832,7 +832,7 @@
"description": "glthread: fix matrix stack depth tracking",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "6febe2b880e79ac2b5347412ffdf6502ac47e5be"
},

39
src/mesa/main/glthread_marshal.h
View File

@@ -509,6 +509,9 @@ _mesa_glthread_PushAttrib(struct gl_context *ctx, GLbitfield mask)
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (ctx->GLThread.AttribStackDepth >= MAX_ATTRIB_STACK_DEPTH)
return;
struct glthread_attrib_node *attr =
&ctx->GLThread.AttribStack[ctx->GLThread.AttribStackDepth++];
@@ -533,6 +536,9 @@ _mesa_glthread_PopAttrib(struct gl_context *ctx)
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (ctx->GLThread.AttribStackDepth == 0)
return;
struct glthread_attrib_node *attr =
&ctx->GLThread.AttribStack[--ctx->GLThread.AttribStackDepth];
unsigned mask = attr->Mask;
@@ -552,12 +558,36 @@ _mesa_glthread_PopAttrib(struct gl_context *ctx)
}
}
static bool
is_matrix_stack_full(struct gl_context *ctx, gl_matrix_index idx)
{
int max_stack_depth = 0;
if (M_MODELVIEW == ctx->GLThread.MatrixIndex) {
max_stack_depth = MAX_MODELVIEW_STACK_DEPTH;
} else if (M_PROJECTION == ctx->GLThread.MatrixIndex) {
max_stack_depth = MAX_PROJECTION_STACK_DEPTH;
} else if (M_PROGRAM_LAST >= ctx->GLThread.MatrixIndex) {
max_stack_depth = MAX_PROGRAM_MATRIX_STACK_DEPTH;
} else if (M_TEXTURE_LAST >= ctx->GLThread.MatrixIndex) {
max_stack_depth = MAX_TEXTURE_STACK_DEPTH;
}
assert(max_stack_depth);
if (ctx->GLThread.MatrixStackDepth[idx] + 1 >= max_stack_depth)
return true;
return false;
}
static inline void
_mesa_glthread_MatrixPushEXT(struct gl_context *ctx, GLenum matrixMode)
{
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (is_matrix_stack_full(ctx, _mesa_get_matrix_index(ctx, matrixMode)))
return;
ctx->GLThread.MatrixStackDepth[_mesa_get_matrix_index(ctx, matrixMode)]++;
}
@@ -567,6 +597,9 @@ _mesa_glthread_MatrixPopEXT(struct gl_context *ctx, GLenum matrixMode)
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (ctx->GLThread.MatrixStackDepth[_mesa_get_matrix_index(ctx, matrixMode)] == 0)
return;
ctx->GLThread.MatrixStackDepth[_mesa_get_matrix_index(ctx, matrixMode)]--;
}
@@ -587,6 +620,9 @@ _mesa_glthread_PushMatrix(struct gl_context *ctx)
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (is_matrix_stack_full(ctx, ctx->GLThread.MatrixIndex))
return;
ctx->GLThread.MatrixStackDepth[ctx->GLThread.MatrixIndex]++;
}
@@ -596,6 +632,9 @@ _mesa_glthread_PopMatrix(struct gl_context *ctx)
if (ctx->GLThread.ListMode == GL_COMPILE)
return;
if (ctx->GLThread.MatrixStackDepth[ctx->GLThread.MatrixIndex] == 0)
return;
ctx->GLThread.MatrixStackDepth[ctx->GLThread.MatrixIndex]--;
}