From b1619109ca91f5b9b4f29d75479241ec82c31549 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Tue, 6 Oct 2020 17:08:33 +0100
Subject: [PATCH] nir/lower_non_uniform: remove non_uniform flags after
 lowering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5201>
---
 src/compiler/nir/nir_lower_non_uniform_access.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/compiler/nir/nir_lower_non_uniform_access.c b/src/compiler/nir/nir_lower_non_uniform_access.c
index a5b1bce4d4e..08dcaaae497 100644
--- a/src/compiler/nir/nir_lower_non_uniform_access.c
+++ b/src/compiler/nir/nir_lower_non_uniform_access.c
@@ -142,6 +142,9 @@ lower_non_uniform_tex_access(nir_builder *b, nir_tex_instr *tex)
    nir_builder_instr_insert(b, &tex->instr);
    nir_jump(b, nir_jump_break);
 
+   tex->texture_non_uniform = false;
+   tex->sampler_non_uniform = false;
+
    return true;
 }
 
@@ -170,6 +173,8 @@ lower_non_uniform_access_intrin(nir_builder *b, nir_intrinsic_instr *intrin,
    nir_builder_instr_insert(b, &intrin->instr);
    nir_jump(b, nir_jump_break);
 
+   nir_intrinsic_set_access(intrin, nir_intrinsic_access(intrin) & ~ACCESS_NON_UNIFORM);
+
    return true;
 }