This patch is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 09/28/2015 07:42 PM, Timothy Arceri wrote:
> Add support for setting the max access of an unsized member
> of an interface array of arrays.
>
> For example ifc[j][k].foo[i] where foo is unsized.
> ---
> src/glsl/ast_array_index.cpp | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp
> index 906024f..9585408 100644
> --- a/src/glsl/ast_array_index.cpp
> +++ b/src/glsl/ast_array_index.cpp
> @@ -61,21 +61,29 @@ update_max_array_access(ir_rvalue *ir, int idx, YYLTYPE
> *loc,
> }
> } else if (ir_dereference_record *deref_record =
> ir->as_dereference_record()) {
> - /* There are two possibilities we need to consider:
> + /* There are three possibilities we need to consider:
> *
> * - Accessing an element of an array that is a member of a named
> * interface block (e.g. ifc.foo[i])
> *
> * - Accessing an element of an array that is a member of a named
> * interface block array (e.g. ifc[j].foo[i]).
> + *
> + * - Accessing an element of an array that is a member of a named
> + * interface block array of arrays (e.g. ifc[j][k].foo[i]).
> */
> ir_dereference_variable *deref_var =
> deref_record->record->as_dereference_variable();
> if (deref_var == NULL) {
> - if (ir_dereference_array *deref_array =
> - deref_record->record->as_dereference_array()) {
> - deref_var = deref_array->array->as_dereference_variable();
> + ir_dereference_array *deref_array =
> + deref_record->record->as_dereference_array();
> + ir_dereference_array *deref_array_prev = NULL;
> + while (deref_array != NULL) {
> + deref_array_prev = deref_array;
> + deref_array = deref_array->array->as_dereference_array();
> }
> + if (deref_array_prev != NULL)
> + deref_var = deref_array_prev->array->as_dereference_variable();
> }
>
> if (deref_var != NULL) {
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
