gallium: Simplify format->name conversion.

diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index a3db13f96d988cbf403994dff1eb5987430f7d6b..082b0e9fb56e33cfc2dc873ccfe656f3f3abc4c4 100644 (file)
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -335,7 +335,7 @@ const char *
 debug_dump_enum(const struct debug_named_value *names, 
                 unsigned long value)
 {
-   static char rest[256];
+   static char rest[64];
    
    while(names->name) {
       if(names->value == value)
@@ -498,10 +498,9 @@ void debug_print_format(const char *msg, unsigned fmt )
 }
 #endif
 
-char *pf_sprint_name( char *str, enum pipe_format format )
+const char *pf_name( enum pipe_format format )
 {
-   strcpy( str, debug_dump_enum(pipe_format_names, format) );
-   return str;
+   return debug_dump_enum(pipe_format_names, format);
 }
 
 

diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h
index 947c4455835285ef8cb8b4c34af942a610b260b4..0a9cad8993f811c1c61eb40b0465e093ec83bb38 100644 (file)
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -379,7 +379,7 @@ enum pipe_format {
 /**
  * Builds pipe format name from format token.
  */
-extern char *pf_sprint_name( char *str, enum pipe_format format );
+extern const char *pf_name( enum pipe_format format );
 
 /**
  * Return bits for a particular component.