diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2020-06-23 18:33:18 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-19 22:28:29 +0200 |
| commit | 2aef2efac653da7cf34176f2e88aa01f39e2b088 (patch) | |
| tree | e3b461f1cddf1bc7aea5ca543883632c97acd44c /src | |
| parent | d4880d750092cf7bf86a3fae507de4cea5239f58 (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>
(cherry picked from commit 044b238507bb54ff8b6129c9754f1efc0f0834b9)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_screen.c | 11 |
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 9fbacd3c49b..6b356688430 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -461,16 +461,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); |