[Mesa-dev] [PATCH] gallium/util: remove u_linkage
Brian Paul
brianp at vmware.com
Thu Mar 26 16:38:30 PDT 2015
Reviewed-by: Brian Paul <brianp at vmware.com>
On 03/26/2015 05:26 PM, Ilia Mirkin wrote:
> Does not appear to be used in tree. Coverity spotted some errors in the
> bitmask stuff, but the whole thing appears to be unused.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
> src/gallium/auxiliary/Makefile.sources | 2 -
> src/gallium/auxiliary/util/u_linkage.c | 149 -----------------------
> src/gallium/auxiliary/util/u_linkage.h | 67 ----------
> src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 1 -
> src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c | 1 -
> 5 files changed, 220 deletions(-)
> delete mode 100644 src/gallium/auxiliary/util/u_linkage.c
> delete mode 100644 src/gallium/auxiliary/util/u_linkage.h
>
> diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
> index b7174d6..09496fa 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -251,8 +251,6 @@ C_SOURCES := \
> util/u_keymap.h \
> util/u_linear.c \
> util/u_linear.h \
> - util/u_linkage.c \
> - util/u_linkage.h \
> util/u_math.c \
> util/u_math.h \
> util/u_memory.h \
> diff --git a/src/gallium/auxiliary/util/u_linkage.c b/src/gallium/auxiliary/util/u_linkage.c
> deleted file mode 100644
> index 245d941..0000000
> --- a/src/gallium/auxiliary/util/u_linkage.c
> +++ /dev/null
> @@ -1,149 +0,0 @@
> -/**************************************************************************
> - *
> - * Copyright 2010 Luca Barbieri
> - *
> - * 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 (including the
> - * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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 "util/u_debug.h"
> -#include "pipe/p_shader_tokens.h"
> -#include "tgsi/tgsi_parse.h"
> -#include "tgsi/tgsi_scan.h"
> -#include "util/u_linkage.h"
> -
> -/* we must only record the registers that are actually used, not just declared */
> -static INLINE boolean
> -util_semantic_set_test_and_set(struct util_semantic_set *set, unsigned value)
> -{
> - unsigned mask = 1 << (value % (sizeof(long) * 8));
> - unsigned long *p = &set->masks[value / (sizeof(long) * 8)];
> - unsigned long v = *p & mask;
> - *p |= mask;
> - return !!v;
> -}
> -
> -unsigned
> -util_semantic_set_from_program_file(struct util_semantic_set *set, const struct tgsi_token *tokens, enum tgsi_file_type file)
> -{
> - struct tgsi_shader_info info;
> - struct tgsi_parse_context parse;
> - unsigned count = 0;
> - ubyte *semantic_name;
> - ubyte *semantic_index;
> -
> - tgsi_scan_shader(tokens, &info);
> -
> - if(file == TGSI_FILE_INPUT)
> - {
> - semantic_name = info.input_semantic_name;
> - semantic_index = info.input_semantic_index;
> - }
> - else if(file == TGSI_FILE_OUTPUT)
> - {
> - semantic_name = info.output_semantic_name;
> - semantic_index = info.output_semantic_index;
> - }
> - else
> - {
> - assert(0);
> - semantic_name = NULL;
> - semantic_index = NULL;
> - }
> -
> - tgsi_parse_init(&parse, tokens);
> -
> - memset(set->masks, 0, sizeof(set->masks));
> - while(!tgsi_parse_end_of_tokens(&parse))
> - {
> - tgsi_parse_token(&parse);
> -
> - if(parse.FullToken.Token.Type == TGSI_TOKEN_TYPE_INSTRUCTION)
> - {
> - const struct tgsi_full_instruction *finst = &parse.FullToken.FullInstruction;
> - unsigned i;
> - for(i = 0; i < finst->Instruction.NumDstRegs; ++i)
> - {
> - if(finst->Dst[i].Register.File == file)
> - {
> - unsigned idx = finst->Dst[i].Register.Index;
> - if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)
> - {
> - if(!util_semantic_set_test_and_set(set, semantic_index[idx]))
> - ++count;
> - }
> - }
> - }
> -
> - for(i = 0; i < finst->Instruction.NumSrcRegs; ++i)
> - {
> - if(finst->Src[i].Register.File == file)
> - {
> - unsigned idx = finst->Src[i].Register.Index;
> - if(semantic_name[idx] == TGSI_SEMANTIC_GENERIC)
> - {
> - if(!util_semantic_set_test_and_set(set, semantic_index[idx]))
> - ++count;
> - }
> - }
> - }
> - }
> - }
> - tgsi_parse_free(&parse);
> -
> - return count;
> -}
> -
> -#define UTIL_SEMANTIC_SET_FOR_EACH(i, set) for(i = 0; i < 256; ++i) if(set->masks[i / (sizeof(long) * 8)] & (1 << (i % (sizeof(long) * 8))))
> -
> -void
> -util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_set *set, unsigned efficient_slots, unsigned num_slots)
> -{
> - int first = -1;
> - int last = -1;
> - unsigned i;
> -
> - memset(layout, 0xff, num_slots);
> -
> - UTIL_SEMANTIC_SET_FOR_EACH(i, set)
> - {
> - if(first < 0)
> - first = i;
> - last = i;
> - }
> -
> - if (last < (int) efficient_slots)
> - {
> - UTIL_SEMANTIC_SET_FOR_EACH(i, set)
> - layout[i] = i;
> - }
> - else if ((last - first) < (int) efficient_slots)
> - {
> - UTIL_SEMANTIC_SET_FOR_EACH(i, set)
> - layout[i - first] = i;
> - }
> - else
> - {
> - unsigned idx = 0;
> - UTIL_SEMANTIC_SET_FOR_EACH(i, set)
> - layout[idx++] = i;
> - }
> -}
> diff --git a/src/gallium/auxiliary/util/u_linkage.h b/src/gallium/auxiliary/util/u_linkage.h
> deleted file mode 100644
> index 7b23123..0000000
> --- a/src/gallium/auxiliary/util/u_linkage.h
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/**************************************************************************
> - *
> - * Copyright 2010 Luca Barbieri
> - *
> - * 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 (including the
> - * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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.
> - *
> - **************************************************************************/
> -
> -#ifndef U_LINKAGE_H_
> -#define U_LINKAGE_H_
> -
> -#include "pipe/p_compiler.h"
> -#include "pipe/p_shader_tokens.h"
> -
> -struct util_semantic_set
> -{
> - unsigned long masks[256 / 8 / sizeof(unsigned long)];
> -};
> -
> -static INLINE boolean
> -util_semantic_set_contains(struct util_semantic_set *set, unsigned char value)
> -{
> - return !!(set->masks[value / (sizeof(long) * 8)] & (1 << (value / (sizeof(long) * 8))));
> -}
> -
> -unsigned util_semantic_set_from_program_file(struct util_semantic_set *set, const struct tgsi_token *tokens, enum tgsi_file_type file);
> -
> -/* efficient_slots is the number of slots such that hardware performance is
> - * the same for using that amount, with holes, or less slots but with less
> - * holes.
> - *
> - * num_slots is the size of the layout array and hardware limit instead.
> - *
> - * efficient_slots == 0 or efficient_slots == num_slots are typical settings.
> - */
> -void util_semantic_layout_from_set(unsigned char *layout, const struct util_semantic_set *set, unsigned efficient_slots, unsigned num_slots);
> -
> -static INLINE void
> -util_semantic_table_from_layout(unsigned char *table, size_t table_size, unsigned char *layout,
> - unsigned char first_slot_value, unsigned char num_slots)
> -{
> - unsigned char i;
> - memset(table, 0xff, table_size);
> -
> - for(i = 0; i < num_slots; ++i)
> - table[layout[i]] = first_slot_value + i;
> -}
> -
> -#endif /* U_LINKAGE_H_ */
> diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
> index 6600997..bbdca81 100644
> --- a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
> +++ b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c
> @@ -3,7 +3,6 @@
> #include "pipe/p_defines.h"
> #include "pipe/p_state.h"
> #include "util/u_dynarray.h"
> -#include "util/u_linkage.h"
> #include "util/u_inlines.h"
> #include "util/u_debug.h"
>
> diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
> index 51e1fb6..29d506b 100644
> --- a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
> +++ b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c
> @@ -2,7 +2,6 @@
> #include "pipe/p_defines.h"
> #include "pipe/p_state.h"
> #include "util/u_dynarray.h"
> -#include "util/u_linkage.h"
> #include "util/u_debug.h"
>
> #include "pipe/p_shader_tokens.h"
>
More information about the mesa-dev
mailing list