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>
(cherry picked from commit 044b238507)
This commit is contained in:
Christian Gmeiner 2020-06-23 18:33:18 +02:00 committed by Dylan Baker
parent 6e5874416d
commit d584839b9b
2 changed files with 3 additions and 10 deletions

View file

@ -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
},

View file

@ -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);