[Mesa-dev] [PATCH 2/2] util: move pipe_prim_names array into u_prim_name()

[Jose Fonseca]

For series

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>


  23/02/15 15:59, Brian Paul wrote:
> Also, wrapping the array in #ifdef DEBUG / #endif doesn't seem necessary.
> ---
>   src/gallium/auxiliary/util/u_debug.c | 45 +++++++++++++++++-------------------
>   1 file changed, 21 insertions(+), 24 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
> index 169295f..731cdec 100644
> --- a/src/gallium/auxiliary/util/u_debug.c
> +++ b/src/gallium/auxiliary/util/u_debug.c
> @@ -402,31 +402,28 @@ void debug_print_format(const char *msg, unsigned fmt )
>   #endif
>
>
> -
> -static const struct debug_named_value pipe_prim_names[] = {
> -#ifdef DEBUG
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_POINTS),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_LINES),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_LOOP),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_FAN),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_LINES_ADJACENCY),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP_ADJACENCY),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES_ADJACENCY),
> -   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY),
> -#endif
> -   DEBUG_NAMED_VALUE_END
> -};
> -
> -
> -const char *u_prim_name( unsigned prim )
> +/** Return string name of given primitive type */
> +const char *
> +u_prim_name(unsigned prim)
>   {
> -   return debug_dump_enum(pipe_prim_names, prim);
> +   static const struct debug_named_value names[] = {
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_POINTS),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_LINES),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_LOOP),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_FAN),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_LINES_ADJACENCY),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP_ADJACENCY),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES_ADJACENCY),
> +      DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY),
> +      DEBUG_NAMED_VALUE_END
> +   };
> +   return debug_dump_enum(names, prim);
>   }
>
>
>