From c0d8dc13e0974a45d1211fb4525ade3a4836fffd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 15 Sep 2021 14:29:15 -0500 Subject: [PATCH] glsl/nir_linker: nir_var_mem_image is also a GL uniform Reviewed-by: Caio Marcelo de Oliveira Filho Part-of: --- src/compiler/glsl/gl_nir_link_uniforms.c | 3 ++- src/compiler/glsl/gl_nir_linker.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c index 4670b8520a9..52e85ae8fae 100644 --- a/src/compiler/glsl/gl_nir_link_uniforms.c +++ b/src/compiler/glsl/gl_nir_link_uniforms.c @@ -394,7 +394,8 @@ add_var_use_deref(nir_deref_instr *deref, struct hash_table *live, if (deref->deref_type != nir_deref_type_var || !nir_deref_mode_is_one_of(deref, nir_var_uniform | nir_var_mem_ubo | - nir_var_mem_ssbo)) { + nir_var_mem_ssbo | + nir_var_mem_image)) { nir_deref_path_finish(&path); return; } diff --git a/src/compiler/glsl/gl_nir_linker.h b/src/compiler/glsl/gl_nir_linker.h index 5171a2c68a0..7d506bb97df 100644 --- a/src/compiler/glsl/gl_nir_linker.h +++ b/src/compiler/glsl/gl_nir_linker.h @@ -38,7 +38,8 @@ struct gl_nir_linker_options { #define nir_foreach_gl_uniform_variable(var, shader) \ nir_foreach_variable_with_modes(var, shader, nir_var_uniform | \ nir_var_mem_ubo | \ - nir_var_mem_ssbo) + nir_var_mem_ssbo | \ + nir_var_mem_image) bool gl_nir_link_spirv(struct gl_context *ctx, struct gl_shader_program *prog,