From: Eric Anholt <eric@anholt.net>
Date: Sat, 23 Feb 2013 00:07:47 +0000 (-0800)
Subject: mesa: Remove the enum for the oom-within-debug-output case.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d9249935db113e1244510de0165dc96a0766bba9;p=mesa.git

mesa: Remove the enum for the oom-within-debug-output case.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---

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;