Mesa (main): zink: always use vk mem model for shaders if available

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 5a2acfeffb084a2c875c78a3eaa6ad47dec1a430
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a2acfeffb084a2c875c78a3eaa6ad47dec1a430

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Apr 15 09:58:48 2022 -0400

zink: always use vk mem model for shaders if available

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15959>

---

 src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 08ea553a1c3..caf538de330 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -3994,8 +3994,9 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
       spirv_builder_emit_mem_model(&ctx.builder, model,
                                    SpvMemoryModelGLSL450);
    } else {
-      if (ctx.stage == MESA_SHADER_TESS_CTRL && ctx.sinfo->have_vulkan_memory_model) {
+      if (ctx.sinfo->have_vulkan_memory_model) {
          spirv_builder_emit_cap(&ctx.builder, SpvCapabilityVulkanMemoryModel);
+         spirv_builder_emit_cap(&ctx.builder, SpvCapabilityVulkanMemoryModelDeviceScope);
          spirv_builder_emit_mem_model(&ctx.builder, SpvAddressingModelLogical,
                                       SpvMemoryModelVulkan);
       } else {