summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2021-01-22 12:23:10 +0100
committerErik Faye-Lund <erik.faye-lund@collabora.com>2021-01-22 18:43:54 +0100
commitc767383b23a7ea6b0f770d789dbb89e6259c2182 (patch)
treeb4bd1c0061c0a5a531156fd7108429934be6d080
parentc849e15c44d1d3f5b327060b5c9f4c055998db84 (diff)
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@gmail.com> Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8655>
-rw-r--r--src/gallium/drivers/zink/zink_screen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 6ce7a30e107..83276f47760 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -409,7 +409,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 ||
VK_MAKE_VERSION(1,1,0) <= screen->loader_version))
return INT_MAX;