[Mesa-dev] [PATCH 05/11] i965: Remove some of the remnants of meta

[Samuel Iglesias Gonsálvez]

El Lunes, 12 de junio de 2017 07:57:23 Jason Ekstrand escribió:
> On Mon, Jun 12, 2017 at 4:54 AM, Samuel Iglesias Gonsálvez <
> 
> siglesias at igalia.com> wrote:
> > On Tue, 2017-06-06 at 22:00 -0700, Jason Ekstrand wrote:
> > > ---
> > > 
> > >  src/mesa/drivers/dri/i965/brw_context.h       | 1 -
> > >  src/mesa/drivers/dri/i965/brw_wm.c            | 2 +-
> > >  src/mesa/drivers/dri/i965/genX_state_upload.c | 2 +-
> > >  3 files changed, 2 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/brw_context.h
> > > b/src/mesa/drivers/dri/i965/brw_context.h
> > > index 4c5bc3b..3f4b86a 100644
> > > --- a/src/mesa/drivers/dri/i965/brw_context.h
> > > +++ b/src/mesa/drivers/dri/i965/brw_context.h
> > > @@ -750,7 +750,6 @@ struct brw_context
> > > 
> > >     bool has_negative_rhw_bug;
> > >     bool has_pln;
> > >     bool no_simd8;
> > > 
> > > -   bool use_rep_send;
> > > 
> > >     /**
> > >     
> > >      * Some versions of Gen hardware don't do centroid interpolation
> > > 
> > > correctly
> > > diff --git a/src/mesa/drivers/dri/i965/brw_wm.c
> > > b/src/mesa/drivers/dri/i965/brw_wm.c
> > > index 6fac3c4..7f688e2 100644
> > > --- a/src/mesa/drivers/dri/i965/brw_wm.c
> > > +++ b/src/mesa/drivers/dri/i965/brw_wm.c
> > > @@ -188,7 +188,7 @@ brw_codegen_wm_prog(struct brw_context *brw,
> > > 
> > >     program = brw_compile_fs(brw->screen->compiler, brw, mem_ctx,
> > >     
> > >                              key, &prog_data, fp->program.nir,
> > >                              &fp->program, st_index8, st_index16,
> > > 
> > > -                            true, brw->use_rep_send, vue_map,
> > > +                            true, false, vue_map,
> > > 
> > >                              &program_size, &error_str);
> > >     
> > >     if (program == NULL) {
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c
> > > b/src/mesa/drivers/dri/i965/genX_state_upload.c
> > > index 23358c4..f6b2f17 100644
> > > --- a/src/mesa/drivers/dri/i965/genX_state_upload.c
> > > +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
> > > @@ -1316,7 +1316,7 @@ genX(upload_clip_state)(struct brw_context
> > > *brw)
> > > 
> > >           clip.ClipMode = CLIPMODE_NORMAL;
> > >        
> > >        }
> > > 
> > > -      clip.ClipEnable = brw->primitive != _3DPRIM_RECTLIST;
> > > +      clip.ClipEnable = true;
> > 
> > Is this patch fine? Look like both changes are completely unrelated :-/
> 
> They're related in the sense that the old meta clear code was the only
> thing using either RECTLIST primitives or use_rep_send.  We still use
> RECTLIST primitives but it all happens in BLORP now so the regular state
> upload code will never see them.
> 

Thanks for the explanation! Then this patch is:

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

Sam

> --Jason
> 
> > Sam
> > 
> > >        /* _NEW_POLYGON,
> > >        
> > >         * BRW_NEW_GEOMETRY_PROGRAM | BRW_NEW_TES_PROG_DATA |
> > > 
> > > BRW_NEW_PRIMITIVE