From 76a428d03b557b5b0467417825f8f565bd1058e0 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 9 Nov 2020 14:43:36 -0500 Subject: [PATCH] panfrost: Account for sample count in tib offsets I don't know if we have tests for MRT + MSAA but that would hit this. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/gallium/drivers/panfrost/pan_mfbd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_mfbd.c b/src/gallium/drivers/panfrost/pan_mfbd.c index c532a2504b3..1cb19d4cea1 100644 --- a/src/gallium/drivers/panfrost/pan_mfbd.c +++ b/src/gallium/drivers/panfrost/pan_mfbd.c @@ -557,10 +557,13 @@ panfrost_mfbd_fragment(struct panfrost_batch *batch, bool has_draws) panfrost_mfbd_emit_rt(batch, rt, surf, rt_offset, cb); if (surf) { - if (MAX2(surf->nr_samples, surf->texture->nr_samples) > 1) + unsigned samples = MAX2(surf->nr_samples, surf->texture->nr_samples); + + if (samples > 1) batch->requirements |= PAN_REQ_MSAA; - rt_offset += pan_bytes_per_pixel_tib(surf->format) * tib_size; + rt_offset += pan_bytes_per_pixel_tib(surf->format) * tib_size * + MAX2(samples, 1); } }