From 044b238507bb54ff8b6129c9754f1efc0f0834b9 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Tue, 23 Jun 2020 18:33:18 +0200 Subject: [PATCH] etnaviv: completely turn off MSAA MSAA worked before etnaviv landed in upstream mesa but got broken over time. Disable MSAA completely until it is fixed again. Fixes problems/crashes with applications that want to make use of MSAA. Cc: Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_screen.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 68befeeeee3..269089868ed 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -466,16 +466,9 @@ gpu_supports_render_format(struct etna_screen *screen, enum pipe_format format, if (fmt == ETNA_NO_MATCH) return false; - /* Validate MSAA; number of samples must be allowed, and render target - * must have MSAA'able format. */ - if (sample_count > 1) { - if (!VIV_FEATURE(screen, chipFeatures, MSAA)) + /* MSAA is broken */ + if (sample_count > 1) return false; - if (!translate_samples_to_xyscale(sample_count, NULL, NULL)) - return false; - if (translate_ts_format(format) == ETNA_NO_MATCH) - return false; - } if (format == PIPE_FORMAT_R8_UNORM) return VIV_FEATURE(screen, chipMinorFeatures5, HALTI5); -- 2.30.2