diff options
| author | Paul Berry <[email protected]> | 2013-07-22 11:44:24 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-08-01 20:24:27 -0700 |
| commit | c1f1d8522c4650f55fac3a57466c9788f80f82f6 (patch) | |
| tree | 55ffe81c2216b6d7762ec367e6ab616eaee0a7b3 | |
| parent | 6065a87bce0c3fb0d9694c381c5a31b63e1f0300 (diff) | |
glsl: Permit non-ubo input interface arrays to use non-const indexing.
From the GLSL ES 3.00 spec:
"All indexes used to index a uniform block array must be constant
integral expressions."
Similar text exists in GLSL specs since 1.50.
When we implemented this, the only type of interface block supported
by Mesa was uniform blocks, so we required all indexes used to index
any interface block to be constant integral expressions.
Now that we are adding interface block support for GLSL 1.50, we need
a more specific check.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/glsl/ast_array_index.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp index 4baeb6f9dc6..51f6b10f365 100644 --- a/src/glsl/ast_array_index.cpp +++ b/src/glsl/ast_array_index.cpp @@ -117,7 +117,8 @@ _mesa_ast_array_index_to_hir(void *mem_ctx, } else if (const_index == NULL && array->type->is_array()) { if (array->type->array_size() == 0) { _mesa_glsl_error(&loc, state, "unsized array index must be constant"); - } else if (array->type->fields.array->is_interface()) { + } else if (array->type->fields.array->is_interface() + && array->variable_referenced()->mode == ir_var_uniform) { /* Page 46 in section 4.3.7 of the OpenGL ES 3.00 spec says: * * "All indexes used to index a uniform block array must be |