From 67ead4edffc7cd40c5696fe55537b0ff0e3f6892 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Fri, 12 Jul 2024 17:42:48 -0700 Subject: [PATCH] intel/brw: Reduce scope of some TES specific functions Reviewed-by: Ian Romanick Part-of: --- src/intel/compiler/brw_compile_tes.cpp | 17 ++++++++++++++++- src/intel/compiler/brw_fs.cpp | 15 --------------- src/intel/compiler/brw_fs.h | 1 - 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/intel/compiler/brw_compile_tes.cpp b/src/intel/compiler/brw_compile_tes.cpp index f22c51c9f52..aee445a4a76 100644 --- a/src/intel/compiler/brw_compile_tes.cpp +++ b/src/intel/compiler/brw_compile_tes.cpp @@ -11,6 +11,21 @@ #include "dev/intel_debug.h" #include "util/macros.h" +static void +brw_assign_tes_urb_setup(fs_visitor &s) +{ + assert(s.stage == MESA_SHADER_TESS_EVAL); + + struct brw_vue_prog_data *vue_prog_data = brw_vue_prog_data(s.prog_data); + + s.first_non_payload_grf += 8 * vue_prog_data->urb_read_length; + + /* Rewrite all ATTR file references to HW_REGs. */ + foreach_block_and_inst(block, fs_inst, inst, s.cfg) { + s.convert_attr_sources_to_hw_regs(inst); + } +} + static bool run_tes(fs_visitor &s) { @@ -30,7 +45,7 @@ run_tes(fs_visitor &s) brw_fs_optimize(s); s.assign_curb_setup(); - s.assign_tes_urb_setup(); + brw_assign_tes_urb_setup(s); brw_fs_lower_3src_null_dest(s); brw_fs_workaround_memory_fence_before_eot(s); diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 6db8c151a7c..6bb11113978 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -1357,21 +1357,6 @@ fs_visitor::convert_attr_sources_to_hw_regs(fs_inst *inst) } } -void -fs_visitor::assign_tes_urb_setup() -{ - assert(stage == MESA_SHADER_TESS_EVAL); - - struct brw_vue_prog_data *vue_prog_data = brw_vue_prog_data(prog_data); - - first_non_payload_grf += 8 * vue_prog_data->urb_read_length; - - /* Rewrite all ATTR file references to HW_REGs. */ - foreach_block_and_inst(block, fs_inst, inst, cfg) { - convert_attr_sources_to_hw_regs(inst); - } -} - int brw_get_subgroup_id_param_index(const intel_device_info *devinfo, const brw_stage_prog_data *prog_data) diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 0b1ecb47793..220a92f1923 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -305,7 +305,6 @@ public: uint32_t compute_max_register_pressure(); void assign_curb_setup(); void convert_attr_sources_to_hw_regs(fs_inst *inst); - void assign_tes_urb_setup(); bool assign_regs(bool allow_spilling, bool spill_all); void assign_regs_trivial(); void calculate_payload_ranges(unsigned payload_node_count,