---
src/mesa/main/errors.c | 5 ++++-
src/mesa/main/mtypes.h | 5 -----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index 9dcf4eb..405ee82 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 65c823d..11242a8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3402,11 +3402,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;
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
