Mesa (staging/20.2): etnaviv: completely turn off MSAA
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 11 16:44:12 UTC 2020
Module: Mesa
Branch: staging/20.2
Commit: d584839b9bebb6cc371b2e1d1617359b5684dae9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d584839b9bebb6cc371b2e1d1617359b5684dae9
Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date: Tue Jun 23 18:33:18 2020 +0200
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 at lists.freedesktop.org>
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Lucas Stach <l.stach at pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5608>
(cherry picked from commit 044b238507bb54ff8b6129c9754f1efc0f0834b9)
---
.pick_status.json | 2 +-
src/gallium/drivers/etnaviv/etnaviv_screen.c | 11 ++---------
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index ad230ac33fb..89768ee53d9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -49,7 +49,7 @@
"description": "etnaviv: completely turn off MSAA",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": null
},
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);
More information about the mesa-commit
mailing list