nir: move nir_lower_point_size_mov() to st

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37037>

src/compiler/nir/meson.build

@@ -206,7 +206,6 @@ else
   'nir_lower_phis_to_scalar.c',
   'nir_lower_pntc_ytransform.c',
   'nir_lower_point_size.c',
-  'nir_lower_point_size_mov.c',
   'nir_lower_point_smooth.c',
   'nir_lower_poly_line_smooth.c',
   'nir_lower_printf.c',

src/compiler/nir/nir.h

@@ -5916,9 +5916,6 @@ bool nir_lower_clip_cull_distance_to_vec4s(nir_shader *shader);
 bool nir_lower_clip_cull_distance_array_vars(nir_shader *nir);
 bool nir_lower_clip_disable(nir_shader *shader, unsigned clip_plane_enable);
 
-bool nir_lower_point_size_mov(nir_shader *shader,
-                              const gl_state_index16 *pointsize_state_tokens);
-
 bool nir_lower_frexp(nir_shader *nir);
 
 bool nir_lower_two_sided_color(nir_shader *shader, bool face_sysval);

src/mesa/meson.build

@@ -348,6 +348,7 @@ files_libmesa = files(
   'state_tracker/st_nir_lower_builtin.c',
   'state_tracker/st_nir_lower_drawpixels.c',
   'state_tracker/st_nir_lower_fog.c',
+  'state_tracker/st_nir_lower_point_size_mov.c',
   'state_tracker/st_nir_lower_position_invariant.c',
   'state_tracker/st_nir_lower_tex_src_plane.c',
   'state_tracker/st_nir_unlower_io_to_vars.c',

src/mesa/state_tracker/st_nir.h

@@ -56,6 +56,9 @@ bool st_nir_lower_drawpixels(struct nir_shader *shader,
                              struct gl_program_parameter_list *paramList,
                              bool packed_driver_uniform_storage);
 
+bool st_nir_lower_point_size_mov(struct nir_shader *shader,
+                                 const gl_state_index16 *pointsize_state_tokens);
+
 bool st_nir_lower_builtin(struct nir_shader *shader);
 bool st_nir_lower_tex_src_plane(struct nir_shader *shader, unsigned free_slots,
                                 unsigned lower_2plane, unsigned lower_3plane);

src/mesa/state_tracker/st_nir_lower_point_size_mov.c

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "nir.h"
 #include "nir_builder.h"
+#include "st_nir.h"
 
 /** nir_lower_point_size_mov.c
  *
@@ -65,8 +65,8 @@ lower_point_size_mov(nir_builder *b, nir_intrinsic_instr *intr, void *data)
 }
 
 bool
-nir_lower_point_size_mov(nir_shader *shader,
-                         const gl_state_index16 *pointsize_state_tokens)
+st_nir_lower_point_size_mov(nir_shader *shader,
+                            const gl_state_index16 *pointsize_state_tokens)
 {
    assert(shader->info.stage != MESA_SHADER_FRAGMENT &&
           shader->info.stage != MESA_SHADER_COMPUTE);

src/mesa/state_tracker/st_program.c

@@ -811,7 +811,7 @@ st_create_common_variant(struct st_context *st,
    if (key->export_point_size) {
       /* if flag is set, shader must export psiz */
       _mesa_add_state_reference(params, point_size_state);
-      NIR_PASS(_, state.ir.nir, nir_lower_point_size_mov,
+      NIR_PASS(_, state.ir.nir, st_nir_lower_point_size_mov,
                   point_size_state);
 
       finalize = true;