fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/nir: optimize front_face in ac_nir_lower_ps_early

Browse source 
i.e. before future linking optimizations and shader_info gathering

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33024>
This commit is contained in:
Marek Olšák 2024-12-29 12:58:34 -05:00
parent 0939fc6fa8
commit 580304350b
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/amd/common/nir/ac_nir.h
View file

@ -275,6 +275,7 @@ typedef struct {
bool force_linear_sample_interp;
bool force_persp_center_interp;
bool force_linear_center_interp;
int force_front_face; /* 0 -> keep, 1 -> set to true, -1 -> set to false */
unsigned ps_iter_samples;
/* Outputs. */

20
src/amd/common/nir/ac_nir_lower_ps_early.c
View file

@ -150,8 +150,6 @@ rewrite_ps_load_barycentric(nir_builder *b, nir_intrinsic_instr *intrin, lower_p
if (!var)
return false;
b->cursor = nir_before_instr(&intrin->instr);
nir_def *replacement = nir_load_var(b, var);
nir_def_replace(&intrin->def, replacement);
return true;
@ -189,8 +187,6 @@ optimize_lower_ps_outputs(nir_builder *b, nir_intrinsic_instr *intrin, lower_ps_
nir_def *value = intrin->src[0].ssa;
bool progress = false;
b->cursor = nir_before_instr(&intrin->instr);
/* Clamp color. */
if (s->options->clamp_color) {
value = nir_fsat(b, value);
@ -288,9 +284,6 @@ lower_ps_load_sample_mask_in(nir_builder *b, nir_intrinsic_instr *intrin, lower_
* The samplemask loaded by hardware is always the coverage of the
* entire pixel/fragment, so mask bits out based on the sample ID.
*/
b->cursor = nir_before_instr(&intrin->instr);
uint32_t ps_iter_mask = ac_get_ps_iter_mask(s->options->ps_iter_samples);
nir_def *sampleid = nir_load_sample_id(b);
nir_def *submask = nir_ishl(b, nir_imm_int(b, ps_iter_mask), sampleid);
@ -310,6 +303,7 @@ lower_ps_intrinsic(nir_builder *b, nir_instr *instr, void *state)
if (instr->type != nir_instr_type_intrinsic)
return false;
b->cursor = nir_before_instr(instr);
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
@ -325,6 +319,18 @@ lower_ps_intrinsic(nir_builder *b, nir_instr *instr, void *state)
if (s->options->ps_iter_samples > 1)
return lower_ps_load_sample_mask_in(b, intrin, s);
break;
case nir_intrinsic_load_front_face:
if (s->options->force_front_face) {
nir_def_replace(&intrin->def, nir_imm_bool(b, s->options->force_front_face == 1));
return true;
}
break;
case nir_intrinsic_load_front_face_fsign:
if (s->options->force_front_face) {
nir_def_replace(&intrin->def, nir_imm_float(b, s->options->force_front_face == 1 ? 1 : -1));
return true;
}
break;
default:
break;
}

9
src/gallium/drivers/radeonsi/si_nir_lower_abi.c
View file

@ -572,15 +572,6 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s
case nir_intrinsic_load_alpha_reference_amd:
replacement = ac_nir_load_arg(b, &args->ac, args->alpha_reference);
break;
case nir_intrinsic_load_front_face:
case nir_intrinsic_load_front_face_fsign:
if (!key->ps.opt.force_front_face_input)
return false;
if (intrin->intrinsic == nir_intrinsic_load_front_face)
replacement = nir_imm_bool(b, key->ps.opt.force_front_face_input == 1);
else
replacement = nir_imm_float(b, key->ps.opt.force_front_face_input == 1 ? 1.0 : -1.0);
break;
case nir_intrinsic_load_color0:
case nir_intrinsic_load_color1: {
uint32_t colors_read = sel->info.colors_read;

1
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -2528,6 +2528,7 @@ static struct nir_shader *si_get_nir_shader(struct si_shader *shader, struct si_
.force_linear_sample_interp = key->ps.part.prolog.force_linear_sample_interp,
.force_persp_center_interp = key->ps.part.prolog.force_persp_center_interp,
.force_linear_center_interp = key->ps.part.prolog.force_linear_center_interp,
.force_front_face = key->ps.opt.force_front_face_input,
.ps_iter_samples = 1 << key->ps.part.prolog.samplemask_log_ps_iter,
.clamp_color = key->ps.part.epilog.clamp_color,