From 808eec704d04aaae93c4a146efc8bd0c9520ef76 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 27 Jan 2022 10:43:33 -0500 Subject: [PATCH] zink: add VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for query binds required by spec cc: mesa-stable Reviewed-by: Erik Faye-Lund Part-of: (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 c9736741b6a..37a3cb408bc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1543,7 +1543,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 c1ee6c4012d..5b5987ea5f0 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -165,6 +165,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;