From 4ece3931bcdf18f3f75513c2292bdaae5b57fe00 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 21 May 2021 05:29:59 -0400
Subject: [PATCH] aux/indices: break out index size conversion to separate
 function

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10965>
---
 src/gallium/auxiliary/indices/u_indices.c | 2 +-
 src/gallium/auxiliary/indices/u_indices.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/indices/u_indices.c b/src/gallium/auxiliary/indices/u_indices.c
index 6d8e86b0746..95cf856077c 100644
--- a/src/gallium/auxiliary/indices/u_indices.c
+++ b/src/gallium/auxiliary/indices/u_indices.c
@@ -140,7 +140,7 @@ u_index_translator(unsigned hw_mask,
    u_index_init();
 
    in_idx = in_size_idx(in_index_size);
-   *out_index_size = (in_index_size == 4) ? 4 : 2;
+   *out_index_size = u_index_size_convert(in_index_size);
    out_idx = out_size_idx(*out_index_size);
 
    if ((hw_mask & (1<<prim)) &&
diff --git a/src/gallium/auxiliary/indices/u_indices.h b/src/gallium/auxiliary/indices/u_indices.h
index 5953d7d8c7c..4509de84ecd 100644
--- a/src/gallium/auxiliary/indices/u_indices.h
+++ b/src/gallium/auxiliary/indices/u_indices.h
@@ -86,6 +86,12 @@ void u_index_init( void );
 enum pipe_prim_type
 u_index_prim_type_convert(unsigned hw_mask, enum pipe_prim_type prim);
 
+static inline unsigned
+u_index_size_convert(unsigned index_size)
+{
+   return (index_size == 4) ? 4 : 2;
+}
+
 
 /**
  * For indexed drawing, this function determines what kind of primitive