glsl: fix crash compiling bindless samplers inside unnamed UBOs
The check to see if we were dealing with a buffer block was
too late and only worked for named UBOs.
Fixes: f32b01ca43
"glsl/linker: remove ubo explicit binding handling"
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/1900
This commit is contained in:
parent
cece947a8d
commit
1294f01e06
|
@ -283,15 +283,15 @@ link_set_uniform_initializers(struct gl_shader_program *prog,
|
|||
if (var->data.explicit_binding) {
|
||||
const glsl_type *const type = var->type;
|
||||
|
||||
if (type->without_array()->is_sampler() ||
|
||||
if (var->is_in_buffer_block()) {
|
||||
/* This case is handled by link_uniform_blocks (at
|
||||
* process_block_array_leaf)
|
||||
*/
|
||||
} else if (type->without_array()->is_sampler() ||
|
||||
type->without_array()->is_image()) {
|
||||
int binding = var->data.binding;
|
||||
linker::set_opaque_binding(mem_ctx, prog, var, var->type,
|
||||
var->name, &binding);
|
||||
} else if (var->is_in_buffer_block()) {
|
||||
/* This case is handled by link_uniform_blocks (at
|
||||
* process_block_array_leaf)
|
||||
*/
|
||||
} else if (type->contains_atomic()) {
|
||||
/* we don't actually need to do anything. */
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue