[Mesa-dev] [PATCH 17.5/18] nir/spirv: Stop trying to convert pointers to SSA in glsl450

[Jason Ekstrand]

On Mon, Jul 3, 2017 at 3:10 PM, Connor Abbott <cwabbott0 at gmail.com> wrote:

> This, and patch 18 updated to delete the case in vtn_ssa_value() are:
>
> Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
>

Thanks!  Pushed.

The one tiny change I made was to add a vtn_pointer_for_variable helper to
ensure that things are always initialized correctly.

--Jason


> ..On Fri, Jun 30, 2017 at 10:30 PM, Jason Ekstrand <jason at jlekstrand.net>
> wrote:
> > Cc: Connor Abbott <cwabbott0 at gmail.com>
> >
> > ---
> >  src/compiler/spirv/vtn_glsl450.c | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/compiler/spirv/vtn_glsl450.c b/src/compiler/spirv/vtn_
> glsl450.c
> > index 5d38431..cf49465 100644
> > --- a/src/compiler/spirv/vtn_glsl450.c
> > +++ b/src/compiler/spirv/vtn_glsl450.c
> > @@ -479,8 +479,13 @@ handle_glsl450_alu(struct vtn_builder *b, enum
> GLSLstd450 entrypoint,
> >     /* Collect the various SSA sources */
> >     unsigned num_inputs = count - 5;
> >     nir_ssa_def *src[3] = { NULL, };
> > -   for (unsigned i = 0; i < num_inputs; i++)
> > +   for (unsigned i = 0; i < num_inputs; i++) {
> > +      /* These are handled specially below */
> > +      if (vtn_untyped_value(b, w[i + 5])->value_type ==
> vtn_value_type_pointer)
> > +         continue;
> > +
> >        src[i] = vtn_ssa_value(b, w[i + 5])->def;
> > +   }
> >
> >     switch (entrypoint) {
> >     case GLSLstd450Radians:
> > --
> > 2.5.0.400.gff86faf
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20170705/4fbb0e6d/attachment.html>