Mesa (master): etnaviv: check if MSAA is supported

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 46b8273eb1c025f46d0c7a8b093e3752995476c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=46b8273eb1c025f46d0c7a8b093e3752995476c5

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Wed Jan  1 22:36:10 2020 +0100

etnaviv: check if MSAA is supported

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Jonathan Marek <jonathan at marek.ca>

---

 src/gallium/drivers/etnaviv/etnaviv_screen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index e847d26aa7f..9d3fee86fbe 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -434,6 +434,8 @@ gpu_supports_render_format(struct etna_screen *screen, enum pipe_format format,
    /* 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))
+         return false;
       if (!translate_samples_to_xyscale(sample_count, NULL, NULL))
          return false;
       if (translate_ts_format(format) == ETNA_NO_MATCH)