Mesa (master): zink: require vulkan memory model for tesselation

[GitLab Mirror]

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

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

zink: require vulkan memory model for tesselation

We enable the KHR_vulkan_memory_model extension whenever we use
tesselation, so right now this is a defacto requirement. So let's make
this requirement explicit.

Fixes: f815b87e188 ("zink: export tess shader pipe 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 4820949596b..421473abcbf 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -418,7 +418,8 @@ zink_get_shader_param(struct pipe_screen *pscreen,
          return INT_MAX;
       case PIPE_SHADER_TESS_CTRL:
       case PIPE_SHADER_TESS_EVAL:
-         if (screen->info.feats.features.tessellationShader &&
+         if (screen->info.have_KHR_vulkan_memory_model &&
+             screen->info.feats.features.tessellationShader &&
              screen->instance_info.have_KHR_maintenance2)
             return INT_MAX;
          break;