summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Gmeiner <christian.gmeiner@gmail.com>2020-06-23 18:33:18 +0200
committerMarge Bot <eric+marge@anholt.net>2020-08-11 09:19:57 +0000
commit044b238507bb54ff8b6129c9754f1efc0f0834b9 (patch)
tree74811a48765694f9ebfd9de5212f1cdd888b04b3
parent5cf7eec6b153baa69788938cac902e59da965d62 (diff)
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: <mesa-stable@lists.freedesktop.org> Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5608>
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_screen.c11
1 files 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);