projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: add capability to lower mediump array types
[mesa.git]
/
src
/
compiler
/
glsl
/
gl_nir_link_uniform_initializers.c
diff --git
a/src/compiler/glsl/gl_nir_link_uniform_initializers.c
b/src/compiler/glsl/gl_nir_link_uniform_initializers.c
index 752eedb63aa066020dccbac501218c22b122309c..fe01b5cb26853e6bcc03a8cad019c9893a130c04 100644
(file)
--- 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) {
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);
const struct glsl_type *without_array =
glsl_without_array(var->type);