Mesa (master): glsl: fix gl_nir_set_uniform_initializers() for bindless textures

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 0f79e0f7c62d4ac34e6a4a827b5433402cf7c223
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f79e0f7c62d4ac34e6a4a827b5433402cf7c223

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue Mar 24 14:17:35 2020 +1100

glsl: fix gl_nir_set_uniform_initializers() for bindless textures

We need to skip opaque variables inside blocks, this is handled
elsewhere and will cause a crash here.

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4395>

---

 src/compiler/glsl/gl_nir_link_uniform_initializers.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/compiler/glsl/gl_nir_link_uniform_initializers.c b/src/compiler/glsl/gl_nir_link_uniform_initializers.c
index 752eedb63aa..fe01b5cb268 100644
--- a/src/compiler/glsl/gl_nir_link_uniform_initializers.c
+++ b/src/compiler/glsl/gl_nir_link_uniform_initializers.c
@@ -278,6 +278,12 @@ gl_nir_set_uniform_initializers(struct gl_context *ctx,
                                     var->type,
                                     var->constant_initializer);
          } else if (var->data.explicit_binding) {
+
+            if (nir_variable_is_in_block(var)) {
+               /* This case is handled by link_uniform_blocks */
+               continue;
+            }
+
             const struct glsl_type *without_array =
                glsl_without_array(var->type);