[Mesa-dev] [PATCH] spirv: split constant initializers on in/out structs

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

On Tue, Jan 23, 2018 at 5:11 AM, Iago Toral Quiroga <itoral at igalia.com>
wrote:

> The SPIR-V parser splits in/out struct variables and creates
> a separate variable for each first-level member of the struct.
> When the struct variable has an initializer this means that we also
> need to split the initializer.
> ---
>  src/compiler/spirv/vtn_variables.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_
> variables.c
> index eb306d0c4a..ead68b4784 100644
> --- a/src/compiler/spirv/vtn_variables.c
> +++ b/src/compiler/spirv/vtn_variables.c
> @@ -1837,7 +1837,15 @@ vtn_create_variable(struct vtn_builder *b, struct
> vtn_value *val,
>                 interface_type->members[i]->type;
>              var->members[i]->data.mode = nir_mode;
>              var->members[i]->data.patch = var->patch;
> +
> +            if (initializer) {
> +               assert(i < initializer->num_elements);
> +               var->members[i]->constant_initializer =
> +                  nir_constant_clone(initializer->elements[i],
> var->members[i]);
> +            }
>           }
> +
>

Mind adding a comment?

/* We dealt with any initializers during the splitting above. */


> +         initializer = NULL;
>        } else {
>           var->var = rzalloc(b->shader, nir_variable);
>           var->var->name = ralloc_strdup(var->var, val->name);
> --
> 2.14.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180205/552bc91f/attachment.html>