Mesa (master): panfrost: Report MSAA 4x supported for dEQP

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Sat Jan  4 13:23:18 2020 -0500

panfrost: Report MSAA 4x supported for dEQP

Fixes dEQP-GLES3.functional.state_query.integers.max_samples_getinteger64

We'll have to actually implement multisampling next, but hey.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>

---

 src/gallium/drivers/panfrost/pan_screen.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 263dcd0fae9..680bae1de1a 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -427,7 +427,16 @@ panfrost_is_format_supported( struct pipe_screen *screen,
         if (!format_desc)
                 return false;
 
-        if (sample_count > 1)
+        /* MSAA 4x supported, but no more. Technically some revisions of the
+         * hardware can go up to 16x but we don't support higher modes yet. */
+
+        if (sample_count > 1 && !(pan_debug & PAN_DBG_DEQP))
+                return false;
+
+        if (sample_count > 4)
+                return false;
+
+        if (MAX2(sample_count, 1) != MAX2(storage_sample_count, 1))
                 return false;
 
         /* Format wishlist */