Mesa (main): nir: Drop our attempt at typed-based image mode validation

[GitLab Mirror]

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

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Fri Oct 15 12:46:58 2021 -0500

nir: Drop our attempt at typed-based image mode validation

This is broken for bindless images declared as local variables.  It
turns out nir_variable::data::bindless is only used for uniforms and we
already assume anything in nir_var_function_temp or similar is bindless.
We could try to make a tricky assert but now that we have everything
else passing but now that we've got everyone converted the extra
validation probably isn't necessary.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13384>

---

 src/compiler/nir/nir_validate.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index c5283d57af7..d75fe957ce4 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -1518,9 +1518,6 @@ validate_var_decl(nir_variable *var, nir_variable_mode valid_modes,
    if (var->constant_initializer)
       validate_constant(var->constant_initializer, var->type, state);
 
-   if (glsl_type_contains_image(var->type) && !var->data.bindless)
-      validate_assert(state, var->data.mode == nir_var_mem_image);
-
    if (var->data.mode == nir_var_mem_image) {
       validate_assert(state, !var->data.bindless);
       validate_assert(state, glsl_type_is_image(glsl_without_array(var->type)));