commit 199fb00815f2cf87fd18b539192e5ce0e81fc28c
author Erik Faye-Lund <erik.faye-lund@collabora.com> Fri Jan 22 09:11:51 2021 +0100
committer Dylan Baker <dylan.c.baker@intel.com> Mon Jan 25 10:49:58 2021 -0800
tree 5b93fad0542c7a90b4328182b41ee9e1aa95f6b1
parent 3efcf3b34f77339f388f1814767252eb05500ff1

zink: respect feature-cap for sample-shading

Vulkan has a cap to enable this, we should check that one rather than
always claiming support.

Fixes: 0c70268ff73 ("zink: mark ARB_sample_shading as supported")
Reviewed-by: Hoe Hao Cheng <haochengho12907@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8640>
(cherry picked from commit 6f6941e2dd8f1d1d1d6e52276485d41c7dd0b029)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 018a60f..8cccfd5 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -58,7 +58,7 @@
         "description": "zink: respect feature-cap for sample-shading",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "0c70268ff73adfc9d588fa5a10c500ed9f66bab6"
     },

src/gallium/drivers/zink/zink_screen.c

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 8ae880f..001da29 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -123,9 +123,11 @@
       return screen->timestamp_valid_bits > 0;
 
    case PIPE_CAP_TEXTURE_MULTISAMPLE:
-   case PIPE_CAP_SAMPLE_SHADING:
       return 1;
 
+   case PIPE_CAP_SAMPLE_SHADING:
+      return screen->info.feats.features.sampleRateShading;
+
    case PIPE_CAP_TEXTURE_SWIZZLE:
       return 1;