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

panfrost: Disable tib read/write when colourmask = 0x0 

There might still be Z/S updates so we can't drop the whole shader but
we can shortcircuit the colour pipeline.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5124>
This commit is contained in:
Alyssa Rosenzweig 2020-05-20 12:56:01 -04:00
parent f69b6e9116
commit 3e4e849e6a
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/panfrost/pan_blend.h
View File

@ -99,10 +99,12 @@ struct panfrost_blend_final {
/* Set for a shader, clear for an equation */
bool is_shader;
/* Set if the destination needs to be loaded from the tilebuffer,
* basically (for an equation) or if a shader is present */
/* Clear if the destination needs to be loaded from the tilebuffer */
bool no_blending;
/* Set if the colour mask is 0x0 (nothing is written) */
bool no_colour;
union {
struct panfrost_blend_shader_final shader;
struct panfrost_blend_equation_final equation;

2
src/gallium/drivers/panfrost/pan_blend_cso.c
View File

@ -255,6 +255,8 @@ panfrost_get_blend_for_context(struct panfrost_context *ctx, unsigned rti, struc
(rt->equation.alpha_mode == 0x122) &&
(rt->equation.color_mask == 0xf);
final.no_colour = (rt->equation.color_mask == 0x0);
return final;
}
}

18
src/gallium/drivers/panfrost/pan_cmdstream.c
View File

@ -725,16 +725,18 @@ panfrost_frag_meta_blend_update(struct panfrost_context *ctx,
} else {
struct midgard_blend_rt *mrts = rts;
mrts[i].flags = 0x200;
if (!blend[i].no_colour) {
mrts[i].flags = 0x200;
bool is_srgb = (ctx->pipe_framebuffer.nr_cbufs > i) &&
(ctx->pipe_framebuffer.cbufs[i]) &&
util_format_is_srgb(ctx->pipe_framebuffer.cbufs[i]->format);
bool is_srgb = (ctx->pipe_framebuffer.nr_cbufs > i) &&
(ctx->pipe_framebuffer.cbufs[i]) &&
util_format_is_srgb(ctx->pipe_framebuffer.cbufs[i]->format);
SET_BIT(mrts[i].flags, MALI_BLEND_MRT_SHADER, blend[i].is_shader);
SET_BIT(mrts[i].flags, MALI_BLEND_LOAD_TIB, !blend[i].no_blending);
SET_BIT(mrts[i].flags, MALI_BLEND_SRGB, is_srgb);
SET_BIT(mrts[i].flags, MALI_BLEND_NO_DITHER, !ctx->blend->base.dither);
SET_BIT(mrts[i].flags, MALI_BLEND_MRT_SHADER, blend[i].is_shader);
SET_BIT(mrts[i].flags, MALI_BLEND_LOAD_TIB, !blend[i].no_blending);
SET_BIT(mrts[i].flags, MALI_BLEND_SRGB, is_srgb);
SET_BIT(mrts[i].flags, MALI_BLEND_NO_DITHER, !ctx->blend->base.dither);
}
if (blend[i].is_shader) {
mrts[i].blend.shader = blend[i].shader.gpu | blend[i].shader.first_tag;