AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etnaviv: shader: Apply output remapping

Browse Source 
The mapping between fragment shader output and and render target is not
fixed and depends on the framebuffer state. Apply the mapping during the
linking of the shaders.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26565>
This commit is contained in:
Christian Gmeiner
2023-11-28 15:04:24 +01:00
committed by Marge Bot
parent d3a5306b91
commit 9a082ae142
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/etnaviv/etnaviv_shader.c
+14 -8
View File
@@ -191,17 +191,23 @@ etna_link_shaders(struct etna_context *ctx, struct compiled_shader_state *cs,
cs->PS_END_PC = fs->code_size / 4;
/* apply output remapping based on current framebuffer state */
int ps_color_out_reg[PIPE_MAX_COLOR_BUFS];
for (unsigned i = 0; i < ARRAY_SIZE(ctx->framebuffer.ps_output_remap); i++)
ps_color_out_reg[i] = fs->ps_color_out_reg[ctx->framebuffer.ps_output_remap[i]];
cs->PS_OUTPUT_REG[0] =
VIVS_PS_OUTPUT_REG_0(fs->ps_color_out_reg[0]) |
VIVS_PS_OUTPUT_REG_1(fs->ps_color_out_reg[1]) |
VIVS_PS_OUTPUT_REG_2(fs->ps_color_out_reg[2]) |
VIVS_PS_OUTPUT_REG_3(fs->ps_color_out_reg[3]);
VIVS_PS_OUTPUT_REG_0(ps_color_out_reg[0]) |
VIVS_PS_OUTPUT_REG_1(ps_color_out_reg[1]) |
VIVS_PS_OUTPUT_REG_2(ps_color_out_reg[2]) |
VIVS_PS_OUTPUT_REG_3(ps_color_out_reg[3]);
cs->PS_OUTPUT_REG[1] =
VIVS_PS_OUTPUT_REG2_4(fs->ps_color_out_reg[4]) |
VIVS_PS_OUTPUT_REG2_5(fs->ps_color_out_reg[5]) |
VIVS_PS_OUTPUT_REG2_6(fs->ps_color_out_reg[6]) |
VIVS_PS_OUTPUT_REG2_7(fs->ps_color_out_reg[7]);
VIVS_PS_OUTPUT_REG2_4(ps_color_out_reg[4]) |
VIVS_PS_OUTPUT_REG2_5(ps_color_out_reg[5]) |
VIVS_PS_OUTPUT_REG2_6(ps_color_out_reg[6]) |
VIVS_PS_OUTPUT_REG2_7(ps_color_out_reg[7]);
cs->PS_INPUT_COUNT =
VIVS_PS_INPUT_COUNT_COUNT(link.num_varyings + 1) | /* Number of inputs plus position */