From 8b1d48cf0b6238881c7feea7a2ec154a540affb9 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 1 Sep 2025 16:11:52 +1000 Subject: [PATCH] nir: move nir_lower_point_size_mov() to st Reviewed-by: Mike Blumenkrantz Part-of: --- src/compiler/nir/meson.build | 1 - src/compiler/nir/nir.h | 3 --- src/mesa/meson.build | 1 + src/mesa/state_tracker/st_nir.h | 3 +++ .../state_tracker/st_nir_lower_point_size_mov.c} | 6 +++--- src/mesa/state_tracker/st_program.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/{compiler/nir/nir_lower_point_size_mov.c => mesa/state_tracker/st_nir_lower_point_size_mov.c} (95%) diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 037d7f62b91..3c2b5be4f21 100644 --- a/src/compiler/nir/meson.build +++ b/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', diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 4071133c125..61d258097c5 100644 --- a/src/compiler/nir/nir.h +++ b/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); diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 479af279ad6..263d9cde00f 100644 --- a/src/mesa/meson.build +++ b/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', diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h index 7c25ce419ac..f50aed10229 100644 --- a/src/mesa/state_tracker/st_nir.h +++ b/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); diff --git a/src/compiler/nir/nir_lower_point_size_mov.c b/src/mesa/state_tracker/st_nir_lower_point_size_mov.c similarity index 95% rename from src/compiler/nir/nir_lower_point_size_mov.c rename to src/mesa/state_tracker/st_nir_lower_point_size_mov.c index e7139330345..35858bb4134 100644 --- a/src/compiler/nir/nir_lower_point_size_mov.c +++ b/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); diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 49be936e868..29a0b99f665 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/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;