Mesa (master): zink: enable PIPE_CAP_START_INSTANCE

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Aug  3 15:37:35 2020 -0400

zink: enable PIPE_CAP_START_INSTANCE

and add feature

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8313>

---

 docs/features.txt                      | 2 +-
 src/gallium/drivers/zink/zink_screen.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/features.txt b/docs/features.txt
index bac7d094d25..1172bb59bfa 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -157,7 +157,7 @@ GL 4.2, GLSL 4.20 -- all DONE: i965/gen7+, nvc0, r600, radeonsi, llvmpipe, virgl
   GL_ARB_shader_atomic_counters                         DONE (freedreno/a5xx+, i965, softpipe, v3d)
   GL_ARB_texture_storage                                DONE (all drivers)
   GL_ARB_transform_feedback_instanced                   DONE (freedreno, i965, nv50, softpipe, swr, v3d, zink)
-  GL_ARB_base_instance                                  DONE (freedreno, i965, nv50, softpipe, swr, v3d)
+  GL_ARB_base_instance                                  DONE (freedreno, i965, nv50, softpipe, swr, v3d, zink)
   GL_ARB_shader_image_load_store                        DONE (freedreno/a5xx+, i965, softpipe, v3d)
   GL_ARB_conservative_depth                             DONE (all drivers that support GLSL 1.30)
   GL_ARB_shading_language_420pack                       DONE (all drivers that support GLSL 1.30)
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 0a5fdb8271d..879e8e2490d 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -110,6 +110,10 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
       return screen->vk_CmdDrawIndirectCount &&
              screen->vk_CmdDrawIndexedIndirectCount;
 
+   case PIPE_CAP_START_INSTANCE:
+      return screen->loader_version >= VK_MAKE_VERSION(1,1,0) &&
+             screen->info.feats11.shaderDrawParameters;
+
    case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
       return screen->info.have_EXT_vertex_attribute_divisor;