From 40ec7efa0791adca3bb5dba4030d3d3a489ca90c Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 26 Sep 2023 12:27:49 -0500
Subject: [PATCH] nak: Move NIR enum translation out of nak_sph.rs

Better to keep all the NIR stuff together.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24998>
---
 src/nouveau/compiler/nak_from_nir.rs | 24 +++++++++++++++++++-----
 src/nouveau/compiler/nak_sph.rs      | 25 -------------------------
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/src/nouveau/compiler/nak_from_nir.rs b/src/nouveau/compiler/nak_from_nir.rs
index a0844a63aa4..80faee7a4cd 100644
--- a/src/nouveau/compiler/nak_from_nir.rs
+++ b/src/nouveau/compiler/nak_from_nir.rs
@@ -43,13 +43,19 @@ fn init_info_from_nir(nir: &nir_shader, sm: u8) -> ShaderInfo {
             MESA_SHADER_FRAGMENT => ShaderStageInfo::Fragment,
             MESA_SHADER_GEOMETRY => {
                 let info_gs = unsafe { &nir.info.__bindgen_anon_1.gs };
+                let output_topology = match info_gs.input_primitive {
+                    MESA_PRIM_POINTS => OutputTopology::PointList,
+                    MESA_PRIM_TRIANGLES | MESA_PRIM_LINE_STRIP => {
+                        OutputTopology::LineStrip
+                    }
+                    MESA_PRIM_TRIANGLE_STRIP => OutputTopology::TriangleStrip,
+                    _ => panic!("Invalid GS input primitive"),
+                };
 
                 ShaderStageInfo::Geometry(GeometryShaderInfo {
                     stream_out_mask: info_gs.active_stream_mask(),
                     threads_per_input_primitive: info_gs.invocations,
-                    output_topology: OutputTopology::from(
-                        info_gs.input_primitive,
-                    ),
+                    output_topology: output_topology,
                     max_output_vertex_count: info_gs.vertices_out,
                 })
             }
@@ -1457,6 +1463,16 @@ impl<'a> ShaderFromNir<'a> {
                     nir_intrinsic_load_barycentric_sample => {
                         (InterpFreq::Pass, InterpLoc::Centroid)
                     }
+                    _ => panic!("Unsupported barycentric"),
+                };
+
+                let interp_mode = match bary.interp_mode() {
+                    INTERP_MODE_NONE | INTERP_MODE_SMOOTH => {
+                        PixelImap::Perspective
+                    }
+                    INTERP_MODE_FLAT => PixelImap::Constant,
+                    INTERP_MODE_NOPERSPECTIVE => PixelImap::ScreenLinear,
+                    INTERP_MODE_EXPLICIT => PixelImap::Unused,
                     _ => panic!("Unsupported interp mode"),
                 };
 
@@ -1472,8 +1488,6 @@ impl<'a> ShaderFromNir<'a> {
                     _ => panic!("Unsupported interp mode"),
                 };
 
-                let interp_mode = PixelImap::from(bary.interp_mode());
-
                 assert!(intrin.def.bit_size() == 32);
                 let dst =
                     b.alloc_ssa(RegFile::GPR, intrin.def.num_components());
diff --git a/src/nouveau/compiler/nak_sph.rs b/src/nouveau/compiler/nak_sph.rs
index 4f0d4cde2e0..5489ee7bee6 100644
--- a/src/nouveau/compiler/nak_sph.rs
+++ b/src/nouveau/compiler/nak_sph.rs
@@ -50,19 +50,6 @@ pub enum OutputTopology {
     TriangleStrip,
 }
 
-impl From<mesa_prim> for OutputTopology {
-    fn from(value: mesa_prim) -> Self {
-        match value {
-            MESA_PRIM_POINTS => OutputTopology::PointList,
-            MESA_PRIM_TRIANGLES | MESA_PRIM_LINE_STRIP => {
-                OutputTopology::LineStrip
-            }
-            MESA_PRIM_TRIANGLE_STRIP => OutputTopology::TriangleStrip,
-            _ => panic!("Invalid mesa_prim {}", value),
-        }
-    }
-}
-
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum PixelImap {
     Unused,
@@ -71,18 +58,6 @@ pub enum PixelImap {
     ScreenLinear,
 }
 
-impl From<glsl_interp_mode> for PixelImap {
-    fn from(value: glsl_interp_mode) -> Self {
-        match value {
-            INTERP_MODE_NONE | INTERP_MODE_SMOOTH => PixelImap::Perspective,
-            INTERP_MODE_FLAT => PixelImap::Constant,
-            INTERP_MODE_NOPERSPECTIVE => PixelImap::ScreenLinear,
-            INTERP_MODE_EXPLICIT => PixelImap::Unused,
-            _ => panic!("Unsupported INTERP_MODE"),
-        }
-    }
-}
-
 impl From<PixelImap> for u8 {
     fn from(value: PixelImap) -> u8 {
         match value {