From fca40bcce37e500f4a9e0fcf42c3188bbc7b885a Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 8 May 2024 14:38:10 +0200
Subject: [PATCH] radv: make radv_conv_gl_prim_to_gs_out() a non-static
 function

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28983>
---
 src/amd/vulkan/radv_pipeline_graphics.c | 22 ----------------------
 src/amd/vulkan/radv_pipeline_graphics.h | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c
index fcf04a32608..cb770265de6 100644
--- a/src/amd/vulkan/radv_pipeline_graphics.c
+++ b/src/amd/vulkan/radv_pipeline_graphics.c
@@ -299,28 +299,6 @@ radv_conv_tess_prim_to_gs_out(enum tess_primitive_mode prim)
    }
 }
 
-static uint32_t
-radv_conv_gl_prim_to_gs_out(unsigned gl_prim)
-{
-   switch (gl_prim) {
-   case MESA_PRIM_POINTS:
-      return V_028A6C_POINTLIST;
-   case MESA_PRIM_LINES:
-   case MESA_PRIM_LINE_STRIP:
-   case MESA_PRIM_LINES_ADJACENCY:
-      return V_028A6C_LINESTRIP;
-
-   case MESA_PRIM_TRIANGLES:
-   case MESA_PRIM_TRIANGLE_STRIP_ADJACENCY:
-   case MESA_PRIM_TRIANGLE_STRIP:
-   case MESA_PRIM_QUADS:
-      return V_028A6C_TRISTRIP;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
 static uint64_t
 radv_dynamic_state_mask(VkDynamicState state)
 {
diff --git a/src/amd/vulkan/radv_pipeline_graphics.h b/src/amd/vulkan/radv_pipeline_graphics.h
index 6c215fd37de..2a90ffa45fa 100644
--- a/src/amd/vulkan/radv_pipeline_graphics.h
+++ b/src/amd/vulkan/radv_pipeline_graphics.h
@@ -194,6 +194,28 @@ radv_conv_prim_to_gs_out(uint32_t topology, bool is_ngg)
    }
 }
 
+static inline uint32_t
+radv_conv_gl_prim_to_gs_out(unsigned gl_prim)
+{
+   switch (gl_prim) {
+   case MESA_PRIM_POINTS:
+      return V_028A6C_POINTLIST;
+   case MESA_PRIM_LINES:
+   case MESA_PRIM_LINE_STRIP:
+   case MESA_PRIM_LINES_ADJACENCY:
+      return V_028A6C_LINESTRIP;
+
+   case MESA_PRIM_TRIANGLES:
+   case MESA_PRIM_TRIANGLE_STRIP_ADJACENCY:
+   case MESA_PRIM_TRIANGLE_STRIP:
+   case MESA_PRIM_QUADS:
+      return V_028A6C_TRISTRIP;
+   default:
+      assert(0);
+      return 0;
+   }
+}
+
 static inline uint32_t
 radv_translate_prim(unsigned topology)
 {