fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pan,nir: Add Bifrost texturing intrinsics

Browse source 
These are funky enough that they make more sense as intrinsics than
texture opcodes.

Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Reviewed-by: Lorenzo Rossi <lorenzo.rossi@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41036>
This commit is contained in:
Faith Ekstrand 2026-04-16 10:44:47 -04:00 • committed by Marge Bot
parent 4dfb07e7eb
commit 2369808cd1
4 changed files with 115 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/compiler/nir/nir_divergence_analysis.c
View file

@ -772,6 +772,11 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
case nir_intrinsic_cubeface_pan:
case nir_intrinsic_cube_ssel_pan:
case nir_intrinsic_cube_tsel_pan:
case nir_intrinsic_texs_2d_pan:
case nir_intrinsic_texs_cube_pan:
case nir_intrinsic_texc0_pan:
case nir_intrinsic_texc1_pan:
case nir_intrinsic_texc2_pan:
case nir_intrinsic_atomic_counter_read:
case nir_intrinsic_atomic_counter_read_deref:
case nir_intrinsic_is_sparse_texels_resident:

16
src/compiler/nir/nir_intrinsics.py
View file

@ -1745,6 +1745,22 @@ intrinsic("cube_ssel_pan", [1, 1, 1], dest_comp=1, bit_sizes=[32],
intrinsic("cube_tsel_pan", [1, 1, 1], dest_comp=1, bit_sizes=[32],
flags=[CAN_ELIMINATE, CAN_REORDER])
# src = { x, y }
intrinsic("texs_2d_pan", [1, 1], dest_comp=4, bit_sizes=[16, 32],
indices=[DEST_TYPE, FLAGS], flags=[CAN_ELIMINATE, CAN_REORDER])
# src = { s, t, face }
intrinsic("texs_cube_pan", [1, 1, 1], dest_comp=4, bit_sizes=[16, 32],
indices=[DEST_TYPE, FLAGS], flags=[CAN_ELIMINATE, CAN_REORDER])
# src = { s, t, desc, sr0, sr1 }
intrinsic("texc0_pan", [1, 1, 1], dest_comp=4, bit_sizes=[16, 32],
indices=[DEST_TYPE, FLAGS], flags=[CAN_ELIMINATE, CAN_REORDER])
intrinsic("texc1_pan", [1, 1, 1, -1], dest_comp=4, bit_sizes=[16, 32],
indices=[DEST_TYPE, FLAGS], flags=[CAN_ELIMINATE, CAN_REORDER])
intrinsic("texc2_pan", [1, 1, 1, -1, -1], dest_comp=4, bit_sizes=[16, 32],
indices=[DEST_TYPE, FLAGS], flags=[CAN_ELIMINATE, CAN_REORDER])
# Loads the sampler paramaters <min_lod, max_lod, lod_bias>
# src[] = { sampler_index }
load("sampler_lod_parameters", [1], flags=[CAN_ELIMINATE, CAN_REORDER])

73
src/panfrost/compiler/bifrost/bifrost_compile.c
View file

@ -2029,6 +2029,79 @@ bi_emit_intrinsic(bi_builder *b, nir_intrinsic_instr *instr)
bi_split_def(b, &instr->def);
break;
case nir_intrinsic_texs_2d_pan: {
struct pan_bi_tex_flags flags =
nir_intrinsic_pan_bi_tex_flags(instr);
bi_instr *I = bi_texs_2d_to(b, instr->def.bit_size,
bi_def_index(&instr->def),
bi_src_index(&instr->src[0]),
bi_src_index(&instr->src[1]),
flags.explicit_lod,
flags.sampler_idx,
flags.texture_idx);
I->skip = flags.skip;
bi_split_def(b, &instr->def);
break;
}
case nir_intrinsic_texs_cube_pan: {
struct pan_bi_tex_flags flags =
nir_intrinsic_pan_bi_tex_flags(instr);
assert(!flags.explicit_lod);
bi_instr *I = bi_texs_cube_to(b, instr->def.bit_size,
bi_def_index(&instr->def),
bi_src_index(&instr->src[0]),
bi_src_index(&instr->src[1]),
bi_src_index(&instr->src[2]),
flags.sampler_idx,
flags.texture_idx);
I->skip = flags.skip;
bi_split_def(b, &instr->def);
break;
}
case nir_intrinsic_texc0_pan:
case nir_intrinsic_texc1_pan:
case nir_intrinsic_texc2_pan: {
bi_index cx = bi_src_index(&instr->src[0]);
bi_index cy = bi_src_index(&instr->src[1]);
bi_index desc = bi_src_index(&instr->src[2]);
struct pan_bi_tex_flags flags =
nir_intrinsic_pan_bi_tex_flags(instr);
bi_index sr_comps[8];
unsigned sr_count = 0;
if (instr->intrinsic != nir_intrinsic_texc0_pan) {
bi_index sr0 = bi_src_index(&instr->src[3]);
for (unsigned i = 0; i < nir_src_num_components(instr->src[3]); i++)
sr_comps[sr_count++] = bi_extract(b, sr0, i);
}
if (instr->intrinsic == nir_intrinsic_texc2_pan) {
bi_index sr1 = bi_src_index(&instr->src[4]);
for (unsigned i = 0; i < nir_src_num_components(instr->src[4]); i++)
sr_comps[sr_count++] = bi_extract(b, sr1, i);
}
bi_index sr = bi_null();
if (sr_count > 0) {
sr = bi_temp(b->shader);
bi_emit_collect_to(b, sr, sr_comps, sr_count);
}
bi_instr *I = bi_texc_to(b, bi_def_index(&instr->def), sr, cx, cy,
desc, flags.explicit_lod, sr_count, 0);
I->register_format = bi_reg_fmt_for_nir(nir_intrinsic_dest_type(instr));
I->skip = flags.skip;
bi_split_def(b, &instr->def);
break;
}
case nir_intrinsic_load_pixel_coord:
/* Vectorized load of the preloaded i16vec2 */
bi_mov_i32_to(b, dst, bi_preload(b, BI_PRELOAD_POSITION_XY));

21
src/panfrost/compiler/pan_nir.h
View file

@ -85,6 +85,27 @@ bool pan_nir_lower_image_index(nir_shader *shader,
bool pan_nir_lower_texel_buffer_fetch_index(nir_shader *shader,
unsigned attrib_offset);
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct pan_bi_tex_flags {
bool skip : 1;
bool explicit_lod : 1;
unsigned _pad : 14;
unsigned sampler_idx : 8;
unsigned texture_idx : 8;
};
PRAGMA_DIAGNOSTIC_POP
static_assert(sizeof(struct pan_bi_tex_flags) == 4, "Must fit in uint32_t");
static inline struct pan_bi_tex_flags
nir_intrinsic_pan_bi_tex_flags(const nir_intrinsic_instr *instr)
{
uint32_t flags_u32 = nir_intrinsic_flags(instr);
struct pan_bi_tex_flags flags;
memcpy(&flags, &flags_u32, sizeof(flags));
return flags;
}
PRAGMA_DIAGNOSTIC_PUSH
PRAGMA_DIAGNOSTIC_ERROR(-Wpadded)
struct pan_va_tex_flags {