diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2022-07-02 13:59:18 +0200 |
---|---|---|
committer | Marge Bot <emma+marge@anholt.net> | 2022-11-02 18:58:09 +0000 |
commit | c2387e6b3c47e4180484ff11fd089487f20f9d0b (patch) | |
tree | b664c576124c9bb73214ce91e2c13fb7ae438975 | |
parent | 22920d569112534455f4b4e40adaa6cd7a213ad8 (diff) |
Revert "etnaviv: completely turn off MSAA"22.3-branchpoint
This reverts commit 044b238507bb54ff8b6129c9754f1efc0f0834b9 and extends it with
- putting the comments directly in front of the if's
- do not support 2x MSAA on SMALL_MSAA hardware
- checking if blt/rs supports the format
MSAA should work as expected now. Tested with kmscube and qt5.
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/19013>
-rw-r--r-- | src/gallium/drivers/etnaviv/etnaviv_screen.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 62ebfa7b336..7c212ec97b5 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -495,10 +495,29 @@ gpu_supports_render_format(struct etna_screen *screen, enum pipe_format format, if (fmt == ETNA_NO_MATCH) return false; - /* MSAA is broken */ - if (sample_count > 1) + if (sample_count > 1) { + /* The hardware supports it. */ + if (!VIV_FEATURE(screen, chipFeatures, MSAA)) return false; + /* Number of samples must be allowed. */ + if (!translate_samples_to_xyscale(sample_count, NULL, NULL)) + return false; + + /* On SMALL_MSAA hardware 2x MSAA does not work. */ + if (sample_count == 2 && VIV_FEATURE(screen, chipMinorFeatures4, SMALL_MSAA)) + return false; + + /* BLT/RS supports the format. */ + if (screen->specs.use_blt) { + if (translate_blt_format(format) == ETNA_NO_MATCH) + return false; + } else { + if (translate_rs_format(format) == ETNA_NO_MATCH) + return false; + } + } + if (format == PIPE_FORMAT_R8_UNORM) return VIV_FEATURE(screen, chipMinorFeatures5, HALTI5); |