[Mesa-dev] [PATCH 6/6] i965: Move TES input VUE map calculation out a layer.

[Timothy Arceri]

On Sat, 2017-01-07 at 02:56 -0800, Kenneth Graunke wrote:
> On Saturday, January 7, 2017 8:51:06 PM PST Timothy Arceri wrote:
> > On Sat, 2017-01-07 at 00:02 -0800, Kenneth Graunke wrote:
> > > In Vulkan, we'll compile the TCS and TES at the same time, so I
> > > can
> > > just
> > > pass the TCS output VUE map to brw_compile_tes as the TES input
> > > VUE
> > > map.
> > > 
> > > So, we only need to do this in GL.  Move it to the GL-specific
> > > layer.
> > > 
> > > Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> > > ---
> > >  src/mesa/drivers/dri/i965/brw_compiler.h |  1 +
> > >  src/mesa/drivers/dri/i965/brw_shader.cpp | 12 ++++--------
> > >  src/mesa/drivers/dri/i965/brw_tes.c      |  8 ++++++--
> > >  3 files changed, 11 insertions(+), 10 deletions(-)
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/brw_compiler.h
> > > b/src/mesa/drivers/dri/i965/brw_compiler.h
> > > index db8f39ce776..c378e9325cb 100644
> > > --- a/src/mesa/drivers/dri/i965/brw_compiler.h
> > > +++ b/src/mesa/drivers/dri/i965/brw_compiler.h
> > > @@ -801,6 +801,7 @@ const unsigned *
> > >  brw_compile_tes(const struct brw_compiler *compiler, void
> > > *log_data,
> > >                  void *mem_ctx,
> > >                  const struct brw_tes_prog_key *key,
> > > +                const struct brw_vue_map *input_vue_map,
> > >                  struct brw_tes_prog_data *prog_data,
> > >                  const struct nir_shader *shader,
> > >                  struct gl_program *prog,
> > > diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
> > > b/src/mesa/drivers/dri/i965/brw_shader.cpp
> > > index daa0c2408a8..f9d55f3adb1 100644
> > > --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
> > > +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
> > > @@ -1301,6 +1301,7 @@ brw_compile_tes(const struct brw_compiler
> > > *compiler,
> > >                  void *log_data,
> > >                  void *mem_ctx,
> > >                  const struct brw_tes_prog_key *key,
> > > +                const struct brw_vue_map *input_vue_map,
> > >                  struct brw_tes_prog_data *prog_data,
> > >                  const nir_shader *src_shader,
> > >                  struct gl_program *prog,
> > > @@ -1315,12 +1316,7 @@ brw_compile_tes(const struct brw_compiler
> > > *compiler,
> > >     nir->info->inputs_read = key->inputs_read;
> > >     nir->info->patch_inputs_read = key->patch_inputs_read;
> > >  
> > > -   struct brw_vue_map input_vue_map;
> > > -   brw_compute_tess_vue_map(&input_vue_map, nir->info-
> > > >inputs_read,
> > > -                            nir->info->patch_inputs_read);
> > > -
> > > -   nir = brw_nir_apply_sampler_key(nir, compiler, &key->tex,
> > > is_scalar);
> > 
> > This looks like it was deleted by mistake?
> 
> Yep, botched rebase.  I've put it back.  Thanks for catching that!

With that fixed this is also:

Reviewed-by: Timothy Arceri <timothy.arceri at collabora.com>

> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev