diff options
-rw-r--r-- | src/compiler/glsl/gl_nir_link_uniform_initializers.c | 6 |
1 files changed, 6 insertions, 0 deletions
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); |