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@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4395>
This commit is contained in:
Timothy Arceri 2020-03-24 14:17:35 +11:00 committed by Marge Bot
parent 9546440227
commit 0f79e0f7c6
1 changed files with 6 additions and 0 deletions

View File

@ -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);