Module: Mesa
Branch: staging/21.0
Commit: c767383b23a7ea6b0f770d789dbb89e6259c2182
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c767383b23a7ea6b0f770d789dbb89e6259c2182
Author: Erik Faye-Lund <erik.faye-l...@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 <haochengho12...@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkra...@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8655>
---
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 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;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
