fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 02:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbo: make flush recursion check code per-context

Browse source 
This fixes invalid failed assertions when running multi-threaded apps.
This commit is contained in:
Brian Paul 2009-12-01 13:26:15 -07:00
parent 8c26cefec7
commit c8cdce6657
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/vbo/vbo_exec.h
View file

@ -138,6 +138,10 @@ struct vbo_exec_context
*/
const struct gl_client_array *inputs[VERT_ATTRIB_MAX];
} array;
#ifdef DEBUG
GLint flush_call_depth;
#endif
};

11
src/mesa/vbo/vbo_exec_api.c
View file

@ -876,9 +876,8 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
#ifdef DEBUG
/* debug check: make sure we don't get called recursively */
static GLuint callDepth = 0;
callDepth++;
assert(callDepth == 1);
exec->flush_call_depth++;
assert(exec->flush_call_depth == 1);
#endif
if (0) _mesa_printf("%s\n", __FUNCTION__);
@ -886,7 +885,8 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
if (0) _mesa_printf("%s - inside begin/end\n", __FUNCTION__);
#ifdef DEBUG
callDepth--;
exec->flush_call_depth--;
assert(exec->flush_call_depth == 0);
#endif
return;
}
@ -903,7 +903,8 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
exec->ctx->Driver.NeedFlush &= ~flags;
#ifdef DEBUG
callDepth--;
exec->flush_call_depth--;
assert(exec->flush_call_depth == 0);
#endif
}