util/indices: minor clean-ups

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>

diff --git a/src/gallium/auxiliary/indices/u_indices.c b/src/gallium/auxiliary/indices/u_indices.c
index cb9e460d010cbcbc35245c3233366e2243c95f01..3d1ebedffd6983a12a7154ecd43eb3318df3b7f2 100644 (file)
--- 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 fb6b31016d6e6ad54406f9d34789125af5ba616d..23d8bd782eb46aecb6c6b792e8ca04c2ac219c8e 100644 (file)
--- 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"