On Sat, Mar 21, 2015 at 5:49 AM, Timothy Arceri wrote:
> ---
> src/glsl/lower_named_interface_blocks.cpp | 51
> ++-
> 1 file changed, 37 insertions(+), 14 deletions(-)
>
> diff --git a/src/glsl/lower_named_interface_blocks.cpp
> b/src/glsl/lower_named_interface_blocks.cpp
> index 7304c51..8321bc1 100644
> --- a/src/glsl/lower_named_interface_blocks.cpp
> +++ b/src/glsl/lower_named_interface_blocks.cpp
> @@ -65,6 +65,38 @@
> #include "ir_rvalue_visitor.h"
> #include "program/hash_table.h"
>
The functions below should go inside the anonymous namespace so
they're not exported. Or mark them static.
> +const glsl_type *
> +process_array_type(const glsl_type *type, unsigned idx)
> +{
> + const glsl_type *element_type = type->fields.array;
> + if (element_type->is_array()) {
> + const glsl_type *new_array_type = process_array_type(element_type,
> idx);
> + return glsl_type::get_array_instance(new_array_type, type->length);
> + } else {
> + return glsl_type::get_array_instance(
> +element_type->fields.structure[idx].type, type->length);
> + }
> +}
> +
> +ir_rvalue *
> +process_array_ir(void * const mem_ctx,
> + ir_dereference_array *deref_array_prev,
> + ir_rvalue *deref_var)
> +{
> + ir_dereference_array *deref_array =
> + deref_array_prev->array->as_dereference_array();
> +
> + if (deref_array == NULL) {
> + return new(mem_ctx) ir_dereference_array(deref_var,
> +
> deref_array_prev->array_index);
> + } else {
> + deref_array = (ir_dereference_array *)
> + process_array_ir(mem_ctx, deref_array, deref_var);
> + return new(mem_ctx) ir_dereference_array(deref_array,
> +
> deref_array_prev->array_index);
> + }
> +}
> +
> namespace {
>
> class flatten_named_interface_blocks_declarations : public ir_rvalue_visitor
> @@ -111,15 +143,9 @@
> flatten_named_interface_blocks_declarations::run(exec_list *instructions)
>if (var->data.mode == ir_var_uniform)
> continue;
>
> - const glsl_type * iface_t = var->type;
> - const glsl_type * array_t = NULL;
> + const glsl_type * iface_t = var->type->without_array();
>exec_node *insert_pos = var;
>
> - if (iface_t->is_array()) {
> - array_t = iface_t;
> - iface_t = array_t->fields.array;
> - }
> -
>assert (iface_t->is_interface());
>
>for (unsigned i = 0; i < iface_t->length; i++) {
> @@ -135,7 +161,7 @@
> flatten_named_interface_blocks_declarations::run(exec_list *instructions)
> ir_variable *new_var;
> char *var_name =
> ralloc_strdup(mem_ctx, iface_t->fields.structure[i].name);
> -if (array_t == NULL) {
> +if (!var->type->is_array()) {
> new_var =
>new(mem_ctx) ir_variable(iface_t->fields.structure[i].type,
> var_name,
> @@ -143,9 +169,7 @@
> flatten_named_interface_blocks_declarations::run(exec_list *instructions)
> new_var->data.from_named_ifc_block_nonarray = 1;
> } else {
> const glsl_type *new_array_type =
> - glsl_type::get_array_instance(
> - iface_t->fields.structure[i].type,
> - array_t->length);
> + process_array_type(var->type, i);
> new_var =
>new(mem_ctx) ir_variable(new_array_type,
> var_name,
> @@ -231,9 +255,8 @@
> flatten_named_interface_blocks_declarations::handle_rvalue(ir_rvalue **rvalue)
>ir_dereference_array *deref_array =
> ir->record->as_dereference_array();
>if (deref_array != NULL) {
> - *rvalue =
> -new(mem_ctx) ir_dereference_array(deref_var,
> - deref_array->array_index);
> + *rvalue = process_array_ir(mem_ctx, deref_array,
> +(ir_rvalue *)deref_var);
>} else {
> *rvalue = deref_var;
>}
> --
> 2.1.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
