fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-21 18:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

freedreno/ir3: add bary_ij as src for meta:tex_prefetch

Browse source 
This way RA doesn't have to special case it in use/def accounting..

This gets rid of an extra level of split/collect, which shouldn't be
needed.  And interferes with scheduler trying to put tex-prefetches
after inputs but before other instructions.  (Otherwise it would have
to figure out which split/collects need to go before the tex-prefetch)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4272>
This commit is contained in:
Rob Clark 2020-03-20 11:50:46 -07:00 • committed by Marge Bot
parent a0de0db0e4
commit c6a8792753
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/freedreno/ir3/ir3_compiler_nir.c
View file

@ -2197,6 +2197,7 @@ emit_tex(struct ir3_context *ctx, nir_tex_instr *tex)
sam = ir3_META_TEX_PREFETCH(b);
__ssa_dst(sam)->wrmask = MASK(ncomp); /* dst */
__ssa_src(sam, get_barycentric_pixel(ctx), 0);
sam->prefetch.input_offset =
ir3_nir_coord_offset(tex->src[idx].src.ssa);
sam->prefetch.tex = tex->texture_index;
@ -3017,14 +3018,8 @@ emit_instructions(struct ir3_context *ctx)
* only need ij_pixel for "old style" varying inputs (ie.
* tgsi_to_nir)
*/
struct ir3_instruction *vcoord = NULL;
if (ctx->so->type == MESA_SHADER_FRAGMENT) {
struct ir3_instruction *xy[2];
vcoord = create_input(ctx, 0x3);
ir3_split_dest(ctx->block, xy, vcoord, 0, 2);
ctx->ij_pixel = ir3_create_collect(ctx, xy, 2);
ctx->ij_pixel = create_input(ctx, 0x3);
}
/* Setup inputs: */
@ -3035,9 +3030,9 @@ emit_instructions(struct ir3_context *ctx)
/* Defer add_sysval_input() stuff until after setup_inputs(),
* because sysvals need to be appended after varyings:
*/
if (vcoord) {
if (ctx->ij_pixel) {
add_sysval_input_compmask(ctx, SYSTEM_VALUE_BARYCENTRIC_PERSP_PIXEL,
0x3, vcoord);
0x3, ctx->ij_pixel);
}