zink: Only expose PIPE_CAP_SHADER_ATOMIC_INT64 if we can do shared and ssbos.

Fixes: 3ac0706aa83b ("zink: export PIPE_CAP_SHADER_ATOMIC_INT64")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20506>
(cherry picked from commit b8d9f860a02daa253213b216488941807e8ea79a)

diff --git a/.pick_status.json b/.pick_status.json
index 31ebf8c..5df9eec 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2569,7 +2569,7 @@
         "description": "zink: Only expose PIPE_CAP_SHADER_ATOMIC_INT64 if we can do shared and ssbos.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "3ac0706aa83b10be1062dc61afe1f65ff3f716ff"
     },

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 74c25dd..d3b9d78 100644 (file)
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -598,7 +598,9 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
               screen->info.atomic_float_feats.shaderSharedFloat32AtomicAdd &&
               screen->info.atomic_float_feats.shaderBufferFloat32AtomicAdd);
    case PIPE_CAP_SHADER_ATOMIC_INT64:
-      return screen->info.have_KHR_shader_atomic_int64;
+      return (screen->info.have_KHR_shader_atomic_int64 &&
+              screen->info.atomic_int_feats.shaderSharedInt64Atomics &&
+              screen->info.atomic_int_feats.shaderBufferInt64Atomics);
 
    case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
       return screen->info.have_KHR_draw_indirect_count;