From 2f3f5728f7107176783d594bf6faf3112ded5329 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 5 Mar 2017 12:59:09 -0700 Subject: [PATCH] util/indices: minor clean-ups Reviewed-by: Edward O'Callaghan --- src/gallium/auxiliary/indices/u_indices.c | 2 +- src/gallium/auxiliary/indices/u_indices_gen.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/indices/u_indices.c b/src/gallium/auxiliary/indices/u_indices.c index cb9e460d010..3d1ebedffd6 100644 --- a/src/gallium/auxiliary/indices/u_indices.c +++ b/src/gallium/auxiliary/indices/u_indices.c @@ -85,7 +85,7 @@ u_index_translator(unsigned hw_mask, { unsigned in_idx; unsigned out_idx; - int ret = U_TRANSLATE_NORMAL; + enum indices_mode ret = U_TRANSLATE_NORMAL; assert(in_index_size == 1 || in_index_size == 2 || diff --git a/src/gallium/auxiliary/indices/u_indices_gen.py b/src/gallium/auxiliary/indices/u_indices_gen.py index fb6b31016d6..23d8bd782eb 100644 --- a/src/gallium/auxiliary/indices/u_indices_gen.py +++ b/src/gallium/auxiliary/indices/u_indices_gen.py @@ -70,7 +70,7 @@ pv_idx = dict(first='PV_FIRST', last='PV_LAST') pr_idx = dict(prdisable='PR_DISABLE', prenable='PR_ENABLE') def prolog(): - print '''/* File automatically generated by indices.py */''' + print '''/* File automatically generated by u_indices_gen.py */''' print copyright print r''' @@ -79,11 +79,8 @@ def prolog(): * Functions to translate and generate index lists */ -#include "indices/u_indices.h" #include "indices/u_indices_priv.h" -#include "pipe/p_compiler.h" #include "util/u_debug.h" -#include "pipe/p_defines.h" #include "util/u_memory.h" -- 2.30.2