Re: [Mesa-dev] [PATCH] nir: fix copy-paste error in nir_lower_constant_initializers

2019-01-10 Thread Jason Ekstrand 
Pushed.

On Thu, Jan 10, 2019 at 10:35 AM Jason Ekstrand 
wrote:

> Reviewed-by: Jason Ekstrand 
>
> On Thu, Jan 10, 2019 at 5:57 AM Erik Faye-Lund <
> erik.faye-l...@collabora.com> wrote:
>
>> Reviewed-by: Erik Faye-Lund 
>>
>> On Thu, 2019-01-10 at 11:23 +, Rhys Perry wrote:
>> > Fixes: 393b59e0772e7bf0426bdf61c740752c4e09dde1
>> > ('nir: Rework nir_lower_constant_initializers() to handle
>> > functions')
>> > ---
>> >  src/compiler/nir/nir_lower_constant_initializers.c | 4 ++--
>> >  1 file changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/src/compiler/nir/nir_lower_constant_initializers.c
>> > b/src/compiler/nir/nir_lower_constant_initializers.c
>> > index cbee59b1f30..959d1eabfca 100644
>> > --- a/src/compiler/nir/nir_lower_constant_initializers.c
>> > +++ b/src/compiler/nir/nir_lower_constant_initializers.c
>> > @@ -104,10 +104,10 @@ nir_lower_constant_initializers(nir_shader
>> > *shader, nir_variable_mode modes)
>> >   impl_progress |= lower_const_initializer(&builder, &shader-
>> > >outputs);
>> >
>> >if ((modes & nir_var_private) && function->is_entrypoint)
>> > - impl_progress |= lower_const_initializer(&builder, &shader-
>> > >outputs);
>> > + impl_progress |= lower_const_initializer(&builder, &shader-
>> > >globals);
>> >
>> >if ((modes & nir_var_system_value) && function->is_entrypoint)
>> > - impl_progress |= lower_const_initializer(&builder, &shader-
>> > >outputs);
>> > + impl_progress |= lower_const_initializer(&builder, &shader-
>> > >system_values);
>> >
>> >if (modes & nir_var_function)
>> >   impl_progress |= lower_const_initializer(&builder,
>> > &function->impl->locals);
>>
>> ___
>> mesa-dev mailing list
>> mesa-dev@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] nir: fix copy-paste error in nir_lower_constant_initializers

2019-01-10 Thread Jason Ekstrand 
Reviewed-by: Jason Ekstrand 

On Thu, Jan 10, 2019 at 5:57 AM Erik Faye-Lund 
wrote:

> Reviewed-by: Erik Faye-Lund 
>
> On Thu, 2019-01-10 at 11:23 +, Rhys Perry wrote:
> > Fixes: 393b59e0772e7bf0426bdf61c740752c4e09dde1
> > ('nir: Rework nir_lower_constant_initializers() to handle
> > functions')
> > ---
> >  src/compiler/nir/nir_lower_constant_initializers.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/compiler/nir/nir_lower_constant_initializers.c
> > b/src/compiler/nir/nir_lower_constant_initializers.c
> > index cbee59b1f30..959d1eabfca 100644
> > --- a/src/compiler/nir/nir_lower_constant_initializers.c
> > +++ b/src/compiler/nir/nir_lower_constant_initializers.c
> > @@ -104,10 +104,10 @@ nir_lower_constant_initializers(nir_shader
> > *shader, nir_variable_mode modes)
> >   impl_progress |= lower_const_initializer(&builder, &shader-
> > >outputs);
> >
> >if ((modes & nir_var_private) && function->is_entrypoint)
> > - impl_progress |= lower_const_initializer(&builder, &shader-
> > >outputs);
> > + impl_progress |= lower_const_initializer(&builder, &shader-
> > >globals);
> >
> >if ((modes & nir_var_system_value) && function->is_entrypoint)
> > - impl_progress |= lower_const_initializer(&builder, &shader-
> > >outputs);
> > + impl_progress |= lower_const_initializer(&builder, &shader-
> > >system_values);
> >
> >if (modes & nir_var_function)
> >   impl_progress |= lower_const_initializer(&builder,
> > &function->impl->locals);
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] nir: fix copy-paste error in nir_lower_constant_initializers

2019-01-10 Thread Erik Faye-Lund 
Reviewed-by: Erik Faye-Lund 

On Thu, 2019-01-10 at 11:23 +, Rhys Perry wrote:
> Fixes: 393b59e0772e7bf0426bdf61c740752c4e09dde1
> ('nir: Rework nir_lower_constant_initializers() to handle
> functions')
> ---
>  src/compiler/nir/nir_lower_constant_initializers.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/compiler/nir/nir_lower_constant_initializers.c
> b/src/compiler/nir/nir_lower_constant_initializers.c
> index cbee59b1f30..959d1eabfca 100644
> --- a/src/compiler/nir/nir_lower_constant_initializers.c
> +++ b/src/compiler/nir/nir_lower_constant_initializers.c
> @@ -104,10 +104,10 @@ nir_lower_constant_initializers(nir_shader
> *shader, nir_variable_mode modes)
>   impl_progress |= lower_const_initializer(&builder, &shader-
> >outputs);
>  
>if ((modes & nir_var_private) && function->is_entrypoint)
> - impl_progress |= lower_const_initializer(&builder, &shader-
> >outputs);
> + impl_progress |= lower_const_initializer(&builder, &shader-
> >globals);
>  
>if ((modes & nir_var_system_value) && function->is_entrypoint)
> - impl_progress |= lower_const_initializer(&builder, &shader-
> >outputs);
> + impl_progress |= lower_const_initializer(&builder, &shader-
> >system_values);
>  
>if (modes & nir_var_function)
>   impl_progress |= lower_const_initializer(&builder,
> &function->impl->locals);

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] nir: fix copy-paste error in nir_lower_constant_initializers

2019-01-10 Thread Tapani Pälli 

Wrote the same patch and it fixes issues for me;
Reviewed-by: Tapani Pälli 

On 1/10/19 1:23 PM, Rhys Perry wrote:

Fixes: 393b59e0772e7bf0426bdf61c740752c4e09dde1
 ('nir: Rework nir_lower_constant_initializers() to handle functions')
---
  src/compiler/nir/nir_lower_constant_initializers.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_constant_initializers.c 
b/src/compiler/nir/nir_lower_constant_initializers.c
index cbee59b1f30..959d1eabfca 100644
--- a/src/compiler/nir/nir_lower_constant_initializers.c
+++ b/src/compiler/nir/nir_lower_constant_initializers.c
@@ -104,10 +104,10 @@ nir_lower_constant_initializers(nir_shader *shader, 
nir_variable_mode modes)
   impl_progress |= lower_const_initializer(&builder, &shader->outputs);
  
if ((modes & nir_var_private) && function->is_entrypoint)

- impl_progress |= lower_const_initializer(&builder, &shader->outputs);
+ impl_progress |= lower_const_initializer(&builder, &shader->globals);
  
if ((modes & nir_var_system_value) && function->is_entrypoint)

- impl_progress |= lower_const_initializer(&builder, &shader->outputs);
+ impl_progress |= lower_const_initializer(&builder, 
&shader->system_values);
  
if (modes & nir_var_function)

   impl_progress |= lower_const_initializer(&builder, 
&function->impl->locals);


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] nir: fix copy-paste error in nir_lower_constant_initializers

2019-01-10 Thread Rhys Perry 
Fixes: 393b59e0772e7bf0426bdf61c740752c4e09dde1
('nir: Rework nir_lower_constant_initializers() to handle functions')
---
 src/compiler/nir/nir_lower_constant_initializers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/nir/nir_lower_constant_initializers.c 
b/src/compiler/nir/nir_lower_constant_initializers.c
index cbee59b1f30..959d1eabfca 100644
--- a/src/compiler/nir/nir_lower_constant_initializers.c
+++ b/src/compiler/nir/nir_lower_constant_initializers.c
@@ -104,10 +104,10 @@ nir_lower_constant_initializers(nir_shader *shader, 
nir_variable_mode modes)
  impl_progress |= lower_const_initializer(&builder, &shader->outputs);
 
   if ((modes & nir_var_private) && function->is_entrypoint)
- impl_progress |= lower_const_initializer(&builder, &shader->outputs);
+ impl_progress |= lower_const_initializer(&builder, &shader->globals);
 
   if ((modes & nir_var_system_value) && function->is_entrypoint)
- impl_progress |= lower_const_initializer(&builder, &shader->outputs);
+ impl_progress |= lower_const_initializer(&builder, 
&shader->system_values);
 
   if (modes & nir_var_function)
  impl_progress |= lower_const_initializer(&builder, 
&function->impl->locals);
-- 
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev