OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: remove broadcast_last_cbuf because it can be deduced from NIR

Browse Source 
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32966>
This commit is contained in:
Marek Olšák
2024-12-28 14:20:57 -05:00
committed by Timur Kristóf
parent 084754a5e5
commit 62c184c491
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/amd/common/ac_nir.h
View File

@@ -294,7 +294,6 @@ typedef struct {
bool clamp_color;
bool alpha_to_one;
enum compare_func alpha_func;
unsigned broadcast_last_cbuf;
bool kill_z;
bool kill_stencil;
bool kill_samplemask;

11
src/amd/common/ac_nir_lower_ps.c
View File

@@ -28,6 +28,7 @@ typedef struct {
uint8_t colors_written;
nir_alu_type color_type[MAX_DRAW_BUFFERS];
bool has_dual_src_blending;
bool writes_all_cbufs;
/* MAX_DRAW_BUFFERS for MRT export, 1 for MRTZ export */
nir_intrinsic_instr *exp[MAX_DRAW_BUFFERS + 1];
@@ -243,6 +244,7 @@ gather_ps_store_output(nir_builder *b, nir_intrinsic_instr *intrin, lower_ps_sta
s->colors_written |= BITFIELD_BIT(color_index);
s->color_type[color_index] = nir_intrinsic_src_type(intrin);
s->has_dual_src_blending |= dual_src_blend_index == 1;
s->writes_all_cbufs |= slot == FRAG_RESULT_COLOR;
}
/* Keep output instruction if not exported in nir. */
@@ -784,10 +786,11 @@ export_ps_outputs(nir_builder *b, lower_ps_state *s)
}
}
if (s->options->broadcast_last_cbuf > 0) {
/* write to all color buffers */
assert(s->colors_written & 0x1);
for (int cbuf = 0; cbuf <= s->options->broadcast_last_cbuf; cbuf++)
if (s->writes_all_cbufs && s->colors_written == 0x1) {
/* This will do nothing for color buffers with SPI_SHADER_COL_FORMAT=ZERO, so always
* iterate over all 8.
*/
for (int cbuf = 0; cbuf < 8; cbuf++)
emit_ps_color_export(b, s, 0, cbuf);
} else {
for (int cbuf = 0; cbuf < MAX_DRAW_BUFFERS; cbuf++)

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

@@ -2536,7 +2536,6 @@ static struct nir_shader *si_get_nir_shader(struct si_shader *shader, struct si_
.clamp_color = key->ps.part.epilog.clamp_color,
.alpha_to_one = key->ps.part.epilog.alpha_to_one,
.alpha_func = key->ps.part.epilog.alpha_func,
.broadcast_last_cbuf = key->ps.part.epilog.last_cbuf,
.kill_z = key->ps.part.epilog.kill_z,
.kill_stencil = key->ps.part.epilog.kill_stencil,
.kill_samplemask = key->ps.part.epilog.kill_samplemask,