Mesa (staging/22.0): zink: add VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for query binds

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 88762cf59baede448244819ff521b153e205dc4a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=88762cf59baede448244819ff521b153e205dc4a

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Jan 27 10:43:33 2022 -0500

zink: add VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for query binds

required by spec

cc: mesa-stable

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14853>
(cherry picked from commit 1e96542390adaaec2b3e84ef69239f580403b26d)

---

 .pick_status.json                        | 2 +-
 src/gallium/drivers/zink/zink_resource.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 86d1fad4fce..c7d8aa2889b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1183,7 +1183,7 @@
         "description": "zink: add VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for query binds",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index d3cd2e9a3ba..5cfbe785983 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -172,6 +172,9 @@ create_bci(struct zink_screen *screen, const struct pipe_resource *templ, unsign
    if (bind & PIPE_BIND_SHADER_IMAGE)
       bci.usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT;
 
+   if (bind & PIPE_BIND_QUERY_BUFFER)
+      bci.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT;
+
    if (templ->flags & PIPE_RESOURCE_FLAG_SPARSE)
       bci.flags |= VK_BUFFER_CREATE_SPARSE_BINDING_BIT;
    return bci;