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

mesa: use accessors for struct gl_debug_state

Browse Source 
When GL_DEBUG_OUTPUT_SYNCHRONOUS is GL_TRUE, drivers are allowed to log debug
messages from other threads.  That requires gl_debug_state to be protected by
a mutex, even when it is a context state.  While we do not spawn threads in
Mesa yet, this commit makes it easier to do when we want to.

Since the definition of struct gl_debug_state is no longer needed by the rest
of the driver, move it to main/errors.c.  This should make it even harder to
use the struct incorrectly.

v2: add comments for the accessors

Signed-off-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Chia-I Wu
2014-04-22 14:22:49 +08:00
parent 94e45c98e1
commit cf61ea3029
8 changed files with 156 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
src/mesa/main/errors.c
View File

@@ -47,6 +47,45 @@ struct gl_debug_severity
GLuint ID;
};
/**
* An error, warning, or other piece of debug information for an application
* to consume via GL_ARB_debug_output/GL_KHR_debug.
*/
struct gl_debug_msg
{
enum mesa_debug_source source;
enum mesa_debug_type type;
GLuint id;
enum mesa_debug_severity severity;
GLsizei length;
GLcharARB *message;
};
struct gl_debug_namespace
{
struct _mesa_HashTable *IDs;
unsigned ZeroID; /* a HashTable won't take zero, so store its state here */
/** lists of IDs in the hash table at each severity */
struct simple_node Severity[MESA_DEBUG_SEVERITY_COUNT];
};
struct gl_debug_state
{
GLDEBUGPROC Callback;
const void *CallbackData;
GLboolean SyncOutput;
GLboolean DebugOutput;
GLboolean Defaults[MAX_DEBUG_GROUP_STACK_DEPTH][MESA_DEBUG_SEVERITY_COUNT][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];
struct gl_debug_namespace Namespaces[MAX_DEBUG_GROUP_STACK_DEPTH][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];
struct gl_debug_msg Log[MAX_DEBUG_LOGGED_MESSAGES];
struct gl_debug_msg DebugGroupMsgs[MAX_DEBUG_GROUP_STACK_DEPTH];
GLint GroupStackDepth;
GLint NumMessages;
GLint NextMsg;
GLint NextMsgLength; /* redundant, but copied here from Log[NextMsg].length
for the sake of the offsetof() code in get.c */
};
static char out_of_memory[] = "Debugging error: out of memory";
static const GLenum debug_source_enums[] = {
@@ -597,7 +636,7 @@ debug_pop_group(struct gl_debug_state *debug)
* Return debug state for the context. The debug state will be allocated
* and initialized upon the first call.
*/
struct gl_debug_state *
static struct gl_debug_state *
_mesa_get_debug_state(struct gl_context *ctx)
{
if (!ctx->Debug) {
@@ -610,6 +649,102 @@ _mesa_get_debug_state(struct gl_context *ctx)
return ctx->Debug;
}
/**
* Set the integer debug state specified by \p pname. This can be called from
* _mesa_set_enable for example.
*/
bool
_mesa_set_debug_state_int(struct gl_context *ctx, GLenum pname, GLint val)
{
struct gl_debug_state *debug = _mesa_get_debug_state(ctx);
if (!debug)
return false;
switch (pname) {
case GL_DEBUG_OUTPUT:
debug->DebugOutput = (val != 0);
break;
case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
debug->SyncOutput = (val != 0);
break;
default:
assert(!"unknown debug output param");
break;
}
return true;
}
/**
* Query the integer debug state specified by \p pname. This can be called
* _mesa_GetIntegerv for example.
*/
GLint
_mesa_get_debug_state_int(struct gl_context *ctx, GLenum pname)
{
struct gl_debug_state *debug;
GLint val;
debug = ctx->Debug;
if (!debug)
return 0;
switch (pname) {
case GL_DEBUG_OUTPUT:
val = debug->DebugOutput;
break;
case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
val = debug->SyncOutput;
break;
case GL_DEBUG_LOGGED_MESSAGES:
val = debug->NumMessages;
break;
case GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH:
val = debug->NextMsgLength;
break;
case GL_DEBUG_GROUP_STACK_DEPTH:
val = debug->GroupStackDepth;
break;
default:
assert(!"unknown debug output param");
val = 0;
break;
}
return val;
}
/**
* Query the pointer debug state specified by \p pname. This can be called
* _mesa_GetPointerv for example.
*/
void *
_mesa_get_debug_state_ptr(struct gl_context *ctx, GLenum pname)
{
struct gl_debug_state *debug;
void *val;
debug = ctx->Debug;
if (!debug)
return NULL;
switch (pname) {
case GL_DEBUG_CALLBACK_FUNCTION_ARB:
val = (void *) debug->Callback;
break;
case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
val = (void *) debug->CallbackData;
break;
default:
assert(!"unknown debug output param");
val = NULL;
break;
}
return val;
}
/**
* Log a client or driver debug message.