From 546a600ba55e0be6ec1d9903237ed7ef5ea2f022 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 30 Jun 2020 16:53:38 -0400 Subject: [PATCH] panfrost: Don't advertise MSAA 2x Let the frontend promote to MSAA 4x if the app requests it. We don't support MSAA 2x. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_screen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index 6fb169358f0..c199dd71e32 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -466,12 +466,13 @@ panfrost_is_format_supported( struct pipe_screen *screen, return false; /* MSAA 4x supported, but no more. Technically some revisions of the - * hardware can go up to 16x but we don't support higher modes yet. */ + * hardware can go up to 16x but we don't support higher modes yet. + * MSAA 2x is notably not supported and gets rounded up to MSAA 4x. */ if (sample_count > 1 && !(pan_debug & (PAN_DBG_GL3 | PAN_DBG_DEQP))) return false; - if (sample_count > 4) + if (!(sample_count == 0 || sample_count == 1 || sample_count == 4)) return false; if (MAX2(sample_count, 1) != MAX2(storage_sample_count, 1)) -- 2.30.2