From 1ba4bc2ada119e4e6bb3cdebd868afb4288effc9 Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Fri, 2 Aug 2024 09:28:40 -0500
Subject: [PATCH] nvk: Don't force sample shading when gl_SampleMaskIn[] is
 read

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29194>
---
 src/nouveau/vulkan/nvk_shader.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c
index fd76da5ce00..073feec98da 100644
--- a/src/nouveau/vulkan/nvk_shader.c
+++ b/src/nouveau/vulkan/nvk_shader.c
@@ -735,8 +735,7 @@ nvk_compile_shader(struct nvk_device *dev,
    }
 
    if (info->stage == MESA_SHADER_FRAGMENT) {
-      if (shader->info.fs.reads_sample_mask ||
-          shader->info.fs.uses_sample_shading) {
+      if (shader->info.fs.uses_sample_shading) {
          shader->min_sample_shading = 1;
       } else if (state != NULL && state->ms != NULL &&
                  state->ms->sample_shading_enable) {