diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c index 234dfd48f50..b6269f7e85d 100644 --- a/src/broadcom/compiler/nir_to_vir.c +++ b/src/broadcom/compiler/nir_to_vir.c @@ -3537,7 +3537,7 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr) ntq_store_def(c, &instr->def, 0, vir_uniform(c, QUNIFORM_DRAW_ID, 0)); break; - case nir_intrinsic_load_tlb_color_v3d: + case nir_intrinsic_load_tlb_color_brcm: vir_emit_tlb_color_read(c, instr); break; diff --git a/src/broadcom/compiler/v3d_nir_lower_logic_ops.c b/src/broadcom/compiler/v3d_nir_lower_logic_ops.c index 4affb79a7e2..f6bdac1bd20 100644 --- a/src/broadcom/compiler/v3d_nir_lower_logic_ops.c +++ b/src/broadcom/compiler/v3d_nir_lower_logic_ops.c @@ -211,9 +211,10 @@ v3d_nir_get_tlb_color(nir_builder *b, struct v3d_compile *c, int rt, int sample) for (int i = 0; i < 4; i++) { if (i < num_components) { color[i] = - nir_load_tlb_color_v3d(b, 1, 32, nir_imm_int(b, rt), - .base = sample, - .component = i); + nir_load_tlb_color_brcm(b, 1, 32, + nir_imm_int(b, rt), + .base = sample, + .component = i); } else { /* These will be DCEd */ color[i] = nir_imm_int(b, 0); diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 95f890f7b18..a049e6a7ff4 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -703,7 +703,7 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_mbcnt_amd: case nir_intrinsic_lane_permute_16_amd: case nir_intrinsic_elect: - case nir_intrinsic_load_tlb_color_v3d: + case nir_intrinsic_load_tlb_color_brcm: case nir_intrinsic_load_tess_rel_patch_id_amd: case nir_intrinsic_load_gs_vertex_offset_amd: case nir_intrinsic_is_subgroup_invocation_lt_amd: diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index e8f3bf53732..16b1bf68964 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1774,14 +1774,14 @@ system_value("ray_tracing_stack_base_lvp", 1) system_value("shader_call_data_offset_lvp", 1) -# V3D-specific instrinc for tile buffer color reads. +# Broadcom-specific instrinc for tile buffer color reads. # # The hardware requires that we read the samples and components of a pixel # in order, so we cannot eliminate or remove any loads in a sequence. # # src[] = { render_target } # BASE = sample index -load("tlb_color_v3d", [1], [BASE, COMPONENT], []) +load("tlb_color_brcm", [1], [BASE, COMPONENT], []) # V3D-specific instrinc for per-sample tile buffer color writes. #