From 0e1bb2f70e51df9c55dda53a55de5ba099235731 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sat, 7 Dec 2024 10:28:03 -0800 Subject: [PATCH] intel/brw: Use brw prefix instead of namespace in dynamic_msaa_flags() Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/compiler/brw_builder.cpp | 2 +- src/intel/compiler/brw_fs.h | 10 ++++------ src/intel/compiler/brw_lower_logical_sends.cpp | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/intel/compiler/brw_builder.cpp b/src/intel/compiler/brw_builder.cpp index 9d3c0c6645e..1562f809bbc 100644 --- a/src/intel/compiler/brw_builder.cpp +++ b/src/intel/compiler/brw_builder.cpp @@ -249,7 +249,7 @@ brw_check_dynamic_msaa_flag(const brw_builder &bld, enum intel_msaa_flags flag) { fs_inst *inst = bld.AND(bld.null_reg_ud(), - brw::dynamic_msaa_flags(wm_prog_data), + brw_dynamic_msaa_flags(wm_prog_data), brw_imm_ud(flag)); inst->conditional_mod = BRW_CONDITIONAL_NZ; } diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 019ced648ee..39a0d9f80cd 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -475,12 +475,10 @@ sample_mask_flag_subreg(const fs_visitor &s) return 2; } -namespace brw { - inline brw_reg - dynamic_msaa_flags(const struct brw_wm_prog_data *wm_prog_data) - { - return brw_uniform_reg(wm_prog_data->msaa_flags_param, BRW_TYPE_UD); - } +inline brw_reg +brw_dynamic_msaa_flags(const struct brw_wm_prog_data *wm_prog_data) +{ + return brw_uniform_reg(wm_prog_data->msaa_flags_param, BRW_TYPE_UD); } enum intel_barycentric_mode brw_barycentric_mode(const struct brw_wm_prog_key *key, diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp index 268ded3227f..2756e0bd35b 100644 --- a/src/intel/compiler/brw_lower_logical_sends.cpp +++ b/src/intel/compiler/brw_lower_logical_sends.cpp @@ -476,7 +476,7 @@ lower_fb_write_logical_send(const brw_builder &bld, fs_inst *inst, STATIC_ASSERT(INTEL_MSAA_FLAG_COARSE_RT_WRITES == (1 << 18)); const brw_builder &ubld = bld.exec_all().group(8, 0); desc = ubld.vgrf(BRW_TYPE_UD); - ubld.AND(desc, dynamic_msaa_flags(prog_data), + ubld.AND(desc, brw_dynamic_msaa_flags(prog_data), brw_imm_ud(INTEL_MSAA_FLAG_COARSE_RT_WRITES)); desc = component(desc, 0); } @@ -2124,7 +2124,7 @@ lower_interpolator_logical_send(const brw_builder &bld, fs_inst *inst, brw_reg orig_desc = desc; const brw_builder &ubld = bld.exec_all().group(8, 0); desc = ubld.vgrf(BRW_TYPE_UD); - ubld.AND(desc, dynamic_msaa_flags(wm_prog_data), + ubld.AND(desc, brw_dynamic_msaa_flags(wm_prog_data), brw_imm_ud(INTEL_MSAA_FLAG_COARSE_PI_MSG)); /* And, if it's AT_OFFSET, we might have a non-trivial descriptor */