Mesa (master): panfrost: Don't expose some atomic stuff even with dEQP

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Tue Jul 23 19:18:44 2019 -0700

panfrost: Don't expose some atomic stuff even with dEQP

Fixes dEQP crashes.

Fixes: 2f93ecd654e ("panfrost: Fake CAPs for dEQP-GLES31")

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>

---

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

diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 048d68ad991..294fc456fa1 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -317,9 +317,10 @@ panfrost_get_shader_param(struct pipe_screen *screen,
 
         case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
         case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
+                return is_deqp;
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTERS:
         case PIPE_SHADER_CAP_MAX_HW_ATOMIC_COUNTER_BUFFERS:
-                return is_deqp;
+                return 0;
 
         case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
         case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD: