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

lima: disable early-z if fragment shader uses discard

Browse Source 
We have to disable early-z if fragment shader uses discard,
otherwise we'll get misrendering.

Reported-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Andreas Baierl <ichgeh@imkreisrum.de>
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3570>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3570>
This commit is contained in:
Vasily Khoruzhick
2020-01-26 10:30:17 -08:00
parent 650c680545
commit fe5267d322
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/drivers/lima/lima_context.h
View File

@@ -55,6 +55,7 @@ struct lima_fs_shader_state {
void *shader;
int shader_size;
int stack_size;
bool uses_discard;
struct lima_bo *bo;
};

7
src/gallium/drivers/lima/lima_draw.c
View File

@@ -1132,6 +1132,7 @@ lima_calculate_depth_test(struct pipe_depth_state *depth, struct pipe_rasterizer
static void
lima_pack_render_state(struct lima_context *ctx, const struct pipe_draw_info *info)
{
struct lima_fs_shader_state *fs = ctx->fs;
struct lima_render_state *render =
lima_ctx_buff_alloc(ctx, lima_ctx_buff_pp_plb_rsw,
sizeof(*render));
@@ -1239,11 +1240,15 @@ lima_pack_render_state(struct lima_context *ctx, const struct pipe_draw_info *in
render->textures_address = 0x00000000;
/* more investigation */
render->aux0 = 0x00000300 | (ctx->vs->varying_stride >> 3);
render->aux0 = 0x00000100 | (ctx->vs->varying_stride >> 3);
render->aux1 = 0x00001000;
if (ctx->blend->base.dither)
render->aux1 |= 0x00002000;
/* Enable Early-Z if shader doesn't have discard */
if (!fs->uses_discard)
render->aux0 |= 0x200;
if (ctx->tex_stateobj.num_samplers) {
render->textures_address =
lima_ctx_buff_va(ctx, lima_ctx_buff_pp_tex_desc, LIMA_CTX_BUFF_SUBMIT_PP);

2
src/gallium/drivers/lima/lima_program.c
View File

@@ -287,6 +287,8 @@ lima_create_fs_state(struct pipe_context *pctx,
return NULL;
}
so->uses_discard = nir->info.fs.uses_discard;
return so;
}