fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pco: Switch to common alpha to coverage lowering

Browse source 
Signed-off-by: Ella Stanforth <ella@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36412>
This commit is contained in:
Ella Stanforth 2025-08-04 10:15:17 +01:00 • committed by Marge Bot
parent 753af683b5
commit 8ea4e35a72
3 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/imagination/pco/pco_internal.h
View file

@ -1691,12 +1691,12 @@ bool pco_nir_compute_instance_check(nir_shader *shader);
bool pco_nir_link_clip_cull_vars(nir_shader *producer, nir_shader *consumer);
bool pco_nir_lower_algebraic(nir_shader *shader);
bool pco_nir_lower_algebraic_late(nir_shader *shader);
bool pco_nir_lower_alpha_to_coverage(nir_shader *shader);
bool pco_nir_lower_atomics(nir_shader *shader, bool *uses_usclib);
bool pco_nir_lower_barriers(nir_shader *shader,
pco_data *data,
bool *uses_usclib);
bool pco_nir_lower_clip_cull_vars(nir_shader *shader);
bool pco_nir_lower_demote_samples(nir_shader *shader);
bool pco_nir_lower_fs_intrinsics(nir_shader *shader);
bool pco_nir_lower_images(nir_shader *shader, pco_data *data);
bool pco_nir_lower_io(nir_shader *shader);

6
src/imagination/pco/pco_nir.c
View file

@ -840,8 +840,10 @@ void pco_lower_nir(pco_ctx *ctx, nir_shader *nir, pco_data *data)
NIR_PASS(_, nir, pco_nir_lower_tex, data);
if (nir->info.stage == MESA_SHADER_FRAGMENT) {
if (data->fs.uses.alpha_to_coverage)
NIR_PASS(_, nir, pco_nir_lower_alpha_to_coverage);
if (data->fs.uses.alpha_to_coverage) {
NIR_PASS(_, nir, nir_lower_alpha_to_coverage, 0, true);
NIR_PASS(_, nir, pco_nir_lower_demote_samples);
}
bool backup = nir->info.fs.uses_sample_shading;
NIR_PASS(_, nir, nir_lower_blend, &data->fs.blend_opts);

46
src/imagination/pco/pco_nir_pvfio.c
View file

@ -667,41 +667,33 @@ static bool is_frag_color_out(const nir_instr *instr,
return location >= FRAG_RESULT_DATA0 && location < FRAG_RESULT_MAX;
}
static nir_def *
lower_alpha_to_coverage(nir_builder *b, nir_instr *instr, UNUSED void *cb_data)
static bool lower_demote_samples(nir_builder *b,
nir_intrinsic_instr *intr,
UNUSED void *cb_data)
{
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_demote_samples)
return false;
/* "If multiple output colors, alpha for a2c is output color 0." */
nir_io_semantics io_sem = nir_intrinsic_io_semantics(intr);
if (io_sem.location != FRAG_RESULT_DATA0)
return NULL;
nir_def *input = intr->src[0].ssa;
b->cursor = nir_before_instr(&intr->instr);
nir_def *alpha = input->num_components < 4 ? nir_imm_float(b, 1.0f)
: nir_channel(b, input, 3);
nir_def *to_keep = nir_u2u32(b, nir_inot(b, intr->src[0].ssa));
nir_def *sample_mask = nir_load_savmsk_vm_pco(b);
nir_def *current_mask =
nir_ishl(b, nir_imm_int(b, 1), nir_load_sample_id(b));
nir_def *cond = nir_iand(b, to_keep, nir_iand(b, sample_mask, current_mask));
nir_demote_if(b, nir_ieq_imm(b, cond, 0));
nir_def *a2c_mask = nir_u2u32(b, nir_alpha_to_coverage(b, alpha));
nir_instr_remove(&intr->instr);
a2c_mask = nir_iand(b, a2c_mask, nir_load_savmsk_vm_pco(b));
a2c_mask = nir_iand(b,
a2c_mask,
nir_ishl(b, nir_imm_int(b, 1), nir_load_sample_id(b)));
nir_demote_if(b, nir_ieq_imm(b, a2c_mask, 0));
return NULL;
return true;
}
bool pco_nir_lower_alpha_to_coverage(nir_shader *shader)
bool pco_nir_lower_demote_samples(nir_shader *s)
{
assert(shader->info.stage == MESA_SHADER_FRAGMENT);
return nir_shader_lower_instructions(shader,
is_frag_color_out,
lower_alpha_to_coverage,
NULL);
assert(s->info.stage == MESA_SHADER_FRAGMENT);
return nir_shader_intrinsics_pass(s,
lower_demote_samples,
nir_metadata_control_flow,
NULL);
}
static nir_def *