Mesa (master): zink: remove excessive checks for loader version

[GitLab Mirror]

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

Author: Hoe Hao Cheng <haochengho12907 at gmail.com>
Date:   Sat Jan 16 02:24:20 2021 +0800

zink: remove excessive checks for loader version

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8521>

---

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

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 2e4735923cb..9809ffbe869 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -113,8 +113,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
              screen->vk_CmdDrawIndexedIndirectCount;
 
    case PIPE_CAP_START_INSTANCE:
-      return screen->loader_version >= VK_MAKE_VERSION(1,1,0) &&
-             screen->info.feats11.shaderDrawParameters;
+      return screen->info.feats11.shaderDrawParameters;
 
    case PIPE_CAP_VERTEX_ELEMENT_INSTANCE_DIVISOR:
       return screen->info.have_EXT_vertex_attribute_divisor;
@@ -407,8 +406,7 @@ zink_get_shader_param(struct pipe_screen *pscreen,
       case PIPE_SHADER_TESS_CTRL:
       case PIPE_SHADER_TESS_EVAL:
          if (screen->info.feats.features.tessellationShader &&
-             (screen->instance_info.have_KHR_maintenance2 ||
-              VK_MAKE_VERSION(1,1,0) <= screen->loader_version))
+             screen->instance_info.have_KHR_maintenance2)
             return INT_MAX;
          break;