From ccce5b922fbcf893394ee4e6970fb35296b5ff24 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 29 Jan 2021 14:37:51 -0500 Subject: [PATCH] panfrost: Generalize MSAA handling This uses the framebuffer MSAA state directly and will generalize to MSAA 8x/16x when somebody gets around to it. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_mfbd.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c index 8928a48abc3..5e1a82d6a6f 100644 --- a/src/gallium/drivers/panfrost/pan_mfbd.c +++ b/src/gallium/drivers/panfrost/pan_mfbd.c @@ -628,11 +628,8 @@ panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws) params.color_buffer_allocation = internal_cbuf_size; - if (batch->requirements & PAN_REQ_MSAA) { - /* MSAA 4x */ - params.sample_count = 4; - params.sample_pattern = MALI_SAMPLE_PATTERN_ROTATED_4X_GRID; - } + params.sample_count = util_framebuffer_get_num_samples(&batch->key); + params.sample_pattern = panfrost_sample_pattern(params.sample_count); if (batch->key.zsbuf && ((batch->clear | batch->draws) & PIPE_CLEAR_DEPTHSTENCIL)) {