Mesa (staging/21.3): zink: stop exporting PIPE_SHADER_CAP_FP16_DERIVATIVES

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 43121ca407d49268e2c3fa3fcb01c7974f997f41
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=43121ca407d49268e2c3fa3fcb01c7974f997f41

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Oct 26 11:05:31 2021 -0400

zink: stop exporting PIPE_SHADER_CAP_FP16_DERIVATIVES

spirv doesn't support this

fixes #5561

cc: mesa-stable

Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13530>
(cherry picked from commit c13da98929809dd2d9f752e938f9ae650ce3fcd5)

---

 .pick_status.json                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 207f9c00840..53d77225a99 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -310,7 +310,7 @@
         "description": "zink: stop exporting PIPE_SHADER_CAP_FP16_DERIVATIVES",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 10207633c0a..c7606e8e748 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -827,8 +827,7 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       return screen->info.feats11.uniformAndStorageBuffer16BitAccess ||
              (screen->info.have_KHR_16bit_storage && screen->info.storage_16bit_feats.uniformAndStorageBuffer16BitAccess);
    case PIPE_SHADER_CAP_FP16_DERIVATIVES:
-      return screen->info.feats11.storageInputOutput16 ||
-             (screen->info.have_KHR_16bit_storage && screen->info.storage_16bit_feats.storageInputOutput16);
+      return 0; //spirv requires 32bit derivative srcs and dests
    case PIPE_SHADER_CAP_FP16:
       return screen->info.feats12.shaderFloat16 ||
              (screen->info.have_KHR_shader_float16_int8 &&