Mesa (master): zink: respect feature-cap for multi-draw indirect

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Jan 22 15:45:44 UTC 2021


Module: Mesa
Branch: master
Commit: c9340744a3c6310f0f36c6c5576ea1bc87b65f03
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9340744a3c6310f0f36c6c5576ea1bc87b65f03

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Jan 22 09:15:10 2021 +0100

zink: respect feature-cap for multi-draw indirect

Even in the presence of VK_KHR_draw_indirect_count, we still technically
need to respect the feature-cap when using a Vk 1.0 core-function.

Fixes: cef876910a0 ("zink: enable PIPE_CAP_MULTI_DRAW_INDIRECT(_PARAMS) caps")
Reviewed-by: Hoe Hao Cheng <haochengho12907 at gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8640>

---

 src/gallium/drivers/zink/zink_screen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index e7afeecbb5c..121251e1719 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -117,6 +117,8 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return screen->info.feats.features.robustBufferAccess;
 
    case PIPE_CAP_MULTI_DRAW_INDIRECT:
+      return screen->info.feats.features.multiDrawIndirect;
+
    case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS:
       return screen->vk_CmdDrawIndirectCount &&
              screen->vk_CmdDrawIndexedIndirectCount;



More information about the mesa-commit mailing list