summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2013-02-22 16:07:47 -0800
committerEric Anholt <[email protected]>2013-03-05 14:25:01 -0800
commitd9249935db113e1244510de0165dc96a0766bba9 (patch)
tree2bf53af2eda733c2453f714c53989c396978e06c /src/mesa
parent6816f67de63c57306445683b05e40ab63f35af49 (diff)
mesa: Remove the enum for the oom-within-debug-output case.
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/errors.c5
-rw-r--r--src/mesa/main/mtypes.h5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 9dcf4ebee9e..405ee824829 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -310,12 +310,15 @@ _mesa_log_msg(struct gl_context *ctx, enum mesa_debug_source source,
emptySlot->id = id;
emptySlot->severity = severity;
} else {
+ static GLuint oom_msg_id = 0;
+ debug_get_id(&oom_msg_id);
+
/* malloc failed! */
emptySlot->message = out_of_memory;
emptySlot->length = strlen(out_of_memory)+1;
emptySlot->source = MESA_DEBUG_SOURCE_OTHER;
emptySlot->type = MESA_DEBUG_TYPE_ERROR;
- emptySlot->id = OTHER_ERROR_OUT_OF_MEMORY;
+ emptySlot->id = oom_msg_id;
emptySlot->severity = MESA_DEBUG_SEVERITY_HIGH;
}
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9b142e28393..0f1b321b02e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3421,11 +3421,6 @@ typedef enum {
API_ERROR_UNKNOWN,
} gl_api_error;
-typedef enum {
- OTHER_ERROR_UNKNOWN,
- OTHER_ERROR_OUT_OF_MEMORY,
-} gl_other_error;
-
struct gl_debug_namespace
{
struct _mesa_HashTable *IDs;