From d6553bf17736d07ea65cfbb89a95c1ad48ee8cb6 Mon Sep 17 00:00:00 2001
From: "Juan A. Suarez Romero" <jasuarez@igalia.com>
Date: Thu, 14 Mar 2024 22:15:38 +0100
Subject: [PATCH] compiler,gallium: move u_reduced_prim to common

Useful function that even Vulkan drivers can use.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28171>
---
 src/compiler/shader_enums.h         | 21 +++++++++++++++++++++
 src/gallium/auxiliary/util/u_prim.h | 21 ---------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index fa20762dbfe..0b51f464539 100644
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -1316,6 +1316,27 @@ u_decomposed_prim(enum mesa_prim prim)
    }
 }
 
+/**
+ * Reduce a primitive to one of MESA_PRIM_POINTS, MESA_PRIM_LINES, and
+ * MESA_PRIM_TRIANGLES.
+ */
+static inline enum mesa_prim
+u_reduced_prim(enum mesa_prim prim)
+{
+   switch (prim) {
+   case MESA_PRIM_POINTS:
+      return MESA_PRIM_POINTS;
+   case MESA_PRIM_LINES:
+   case MESA_PRIM_LINE_LOOP:
+   case MESA_PRIM_LINE_STRIP:
+   case MESA_PRIM_LINES_ADJACENCY:
+   case MESA_PRIM_LINE_STRIP_ADJACENCY:
+      return MESA_PRIM_LINES;
+   default:
+      return MESA_PRIM_TRIANGLES;
+   }
+}
+
 /**
  * A compare function enum for use in compiler lowering passes.  This is in
  * the same order as GL's compare functions (shifted down by GL_NEVER), and is
diff --git a/src/gallium/auxiliary/util/u_prim.h b/src/gallium/auxiliary/util/u_prim.h
index d28137bd276..bc06cdbcb96 100644
--- a/src/gallium/auxiliary/util/u_prim.h
+++ b/src/gallium/auxiliary/util/u_prim.h
@@ -44,27 +44,6 @@ struct u_prim_vertex_count {
    unsigned incr;
 };
 
-/**
- * Reduce a primitive to one of MESA_PRIM_POINTS, MESA_PRIM_LINES, and
- * MESA_PRIM_TRIANGLES.
- */
-static inline enum mesa_prim
-u_reduced_prim(enum mesa_prim prim)
-{
-   switch (prim) {
-   case MESA_PRIM_POINTS:
-      return MESA_PRIM_POINTS;
-   case MESA_PRIM_LINES:
-   case MESA_PRIM_LINE_LOOP:
-   case MESA_PRIM_LINE_STRIP:
-   case MESA_PRIM_LINES_ADJACENCY:
-   case MESA_PRIM_LINE_STRIP_ADJACENCY:
-      return MESA_PRIM_LINES;
-   default:
-      return MESA_PRIM_TRIANGLES;
-   }
-}
-
 /**
  * Re-assemble a primitive to remove its adjacency.
  */