diff options
| -rw-r--r-- | src/compiler/glsl/ast_to_hir.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp index d73d74a5cfe..7ae83dfd83f 100644 --- a/src/compiler/glsl/ast_to_hir.cpp +++ b/src/compiler/glsl/ast_to_hir.cpp @@ -4333,11 +4333,22 @@ process_initializer(ir_variable *var, ast_declaration *decl, * "Opaque variables [...] are initialized only through the * OpenGL API; they cannot be declared with an initializer in a * shader." + * + * From section 4.1.7 of the ARB_bindless_texture spec: + * + * "Samplers may be declared as shader inputs and outputs, as uniform + * variables, as temporary variables, and as function parameters." + * + * From section 4.1.X of the ARB_bindless_texture spec: + * + * "Images may be declared as shader inputs and outputs, as uniform + * variables, as temporary variables, and as function parameters." */ - if (var->type->contains_opaque()) { + if (var->type->contains_atomic() || + (!state->has_bindless() && var->type->contains_opaque())) { _mesa_glsl_error(&initializer_loc, state, - "cannot initialize opaque variable %s", - var->name); + "cannot initialize %s variable %s", + var->name, state->has_bindless() ? "atomic" : "opaque"); } if ((var->data.mode == ir_var_shader_in) && (state->current_function == NULL)) { |