From 389d59c72a903b5a9dc36ba63d01df4f8be84828 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 20 Sep 2018 11:36:44 -0700 Subject: [PATCH] gallium: split u_prim_name out of u_debug.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allows us to pull u_prim.h out of u_debug.h Tested-by: Brian Paul Reviewed-by: Marek Olšák --- src/gallium/auxiliary/Makefile.sources | 1 + src/gallium/auxiliary/meson.build | 1 + src/gallium/auxiliary/util/u_debug.c | 26 -------------- src/gallium/auxiliary/util/u_prim.c | 48 ++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 26 deletions(-) create mode 100644 src/gallium/auxiliary/util/u_prim.c diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 33d58dedf28..94851210142 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -302,6 +302,7 @@ C_SOURCES := \ util/u_pack_color.h \ util/u_pointer.h \ util/u_prim.h \ + util/u_prim.c \ util/u_prim_restart.c \ util/u_prim_restart.h \ util/u_pstipple.c \ diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 9e3673a53c0..e79089a7d00 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -322,6 +322,7 @@ files_libgallium = files( 'util/u_pack_color.h', 'util/u_pointer.h', 'util/u_prim.h', + 'util/u_prim.c', 'util/u_prim_restart.c', 'util/u_prim_restart.h', 'util/u_pstipple.c', diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c index edfb27fc6f6..8962050b1d5 100644 --- a/src/gallium/auxiliary/util/u_debug.c +++ b/src/gallium/auxiliary/util/u_debug.c @@ -39,7 +39,6 @@ #include "util/u_memory.h" #include "util/u_string.h" #include "util/u_math.h" -#include "util/u_prim.h" #include #include @@ -413,31 +412,6 @@ debug_print_format(const char *msg, unsigned fmt ) #endif -/** Return string name of given primitive type */ -const char * -u_prim_name(enum pipe_prim_type 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); -} - - #ifdef DEBUG int fl_indent = 0; diff --git a/src/gallium/auxiliary/util/u_prim.c b/src/gallium/auxiliary/util/u_prim.c new file mode 100644 index 00000000000..cbd48e26ab6 --- /dev/null +++ b/src/gallium/auxiliary/util/u_prim.c @@ -0,0 +1,48 @@ +/* Copyright (c) 2008 VMware, Inc. + * Copyright © 2018 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "u_prim.h" + + +/** Return string name of given primitive type */ +const char * +u_prim_name(enum pipe_prim_type 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); +} -- 2.30.2