From 26d603da0710b67d93b8d163cc37f109af7416b8 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason@jlekstrand.net>
Date: Wed, 15 Sep 2021 14:24:37 -0500
Subject: [PATCH] nir/gl_nir_lower_images: Require nir_var_mem_image

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4743>
---
 src/compiler/glsl/gl_nir_lower_images.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/compiler/glsl/gl_nir_lower_images.c b/src/compiler/glsl/gl_nir_lower_images.c
index 34c51dcff8e..018b45cf7f0 100644
--- a/src/compiler/glsl/gl_nir_lower_images.c
+++ b/src/compiler/glsl/gl_nir_lower_images.c
@@ -87,9 +87,7 @@ lower_impl(nir_builder *b, nir_instr *instr, bool bindless_only)
       return false;
    }
 
-   bool bindless = (var->data.mode != nir_var_uniform &&
-                    var->data.mode != nir_var_mem_image) ||
-                   var->data.bindless;
+   bool bindless = var->data.mode != nir_var_mem_image || var->data.bindless;
    if (bindless_only && !bindless)
       return false;