nir,v3d: rename tlb_color_v3d intrinsic

As this is intended to be used also by VC4, change the suffix to
something more convenient, like tlb_color_brcm.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29119>
This commit is contained in:
Juan A. Suarez Romero 2024-05-09 13:03:17 +02:00 committed by Marge Bot
parent 3ab023edee
commit 87cd11ecd2
4 changed files with 8 additions and 7 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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:

View File

@ -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.
#