From: Alyssa Rosenzweig Date: Thu, 6 Aug 2020 14:31:28 +0000 (-0400) Subject: panfrost: Don't mask coverage mask to 4-bits X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4c8c8e8fbd30968a43159cee0add48449f27a3b;p=mesa.git panfrost: Don't mask coverage mask to 4-bits While it is correct for MSAA 4x, it will break for MSAA 8x and 16x, and it is only dubiously correct for no-MSAA. Drop the mask. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index e17dae981e9..cff19bf121d 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -741,7 +741,7 @@ panfrost_frag_shader_meta_init(struct panfrost_context *ctx, fs = panfrost_get_shader_state(ctx, PIPE_SHADER_FRAGMENT); bool msaa = ctx->rasterizer && ctx->rasterizer->base.multisample; - fragmeta->coverage_mask = (msaa ? ctx->sample_mask : ~0) & 0xF; + fragmeta->coverage_mask = msaa ? ctx->sample_mask : ~0; fragmeta->unknown2_3 = MALI_DEPTH_FUNC(MALI_FUNC_ALWAYS) | 0x10; fragmeta->unknown2_4 = 0x4e0; diff --git a/src/panfrost/lib/pan_blit.c b/src/panfrost/lib/pan_blit.c index b93fcee962c..69b4b417912 100644 --- a/src/panfrost/lib/pan_blit.c +++ b/src/panfrost/lib/pan_blit.c @@ -245,7 +245,7 @@ panfrost_load_midg( .flags_lo = 0x20, .work_count = 4, }, - .coverage_mask = 0xF, + .coverage_mask = ~0, .unknown2_3 = MALI_DEPTH_FUNC(MALI_FUNC_ALWAYS) | 0x10, .unknown2_4 = 0x4e0, .stencil_mask_front = ~0,