On Nov 23, 2015 20:50, "Matt Turner" <matts...@gmail.com> wrote: > > On Mon, Nov 23, 2015 at 6:11 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote: > > This matches what we're already doing for inputs and outputs > > --- > > src/mesa/drivers/dri/i965/brw_nir.c | 9 +++++++++ > > 1 file changed, 9 insertions(+) > > > > diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c > > index 91358d8..e602df7 100644 > > --- a/src/mesa/drivers/dri/i965/brw_nir.c > > +++ b/src/mesa/drivers/dri/i965/brw_nir.c > > @@ -171,6 +171,14 @@ brw_nir_lower_outputs(nir_shader *nir, bool is_scalar) > > } > > } > > > > +static void > > +brw_nir_lower_uniforms(nir_shader *nir, bool is_scalar) > > +{ > > + nir_assign_var_locations(&nir->uniforms, > > + &nir->num_uniforms, > > + is_scalar ? type_size_scalar : type_size_vec4); > > +} > > + > > static bool > > should_clone_nir() > > { > > @@ -298,6 +306,7 @@ brw_lower_nir(nir_shader *nir, > > > > OPT_V(brw_nir_lower_inputs, devinfo, is_scalar); > > OPT_V(brw_nir_lower_outputs, is_scalar); > > + OPT_V(brw_nir_lower_uniforms, is_scalar); > > nir_assign_var_locations(&nir->uniforms, > > &nir->num_uniforms, > > is_scalar ? type_size_scalar : type_size_vec4); > > Did you mean to delete this?
Yes, yes I did. I'll get that fixed.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev