[Mesa-dev] [PATCH] autotools, meson: add tileset.h

[Juan A. Suarez Romero]

On Mon, 2018-05-14 at 15:37 +0100, Eric Engestrom wrote:
> On Monday, 2018-05-14 16:02:02 +0200, Juan A. Suarez Romero wrote:
> > On Mon, 2018-05-14 at 14:09 +0100, Eric Engestrom wrote:
> > > On Monday, 2018-05-14 13:53:37 +0200, Juan A. Suarez Romero wrote:
> > > > Fixes: 4e52cb51b5 ("swr/rast: Thread locked tiles improvement")
> > > > ---
> > > >  src/gallium/drivers/swr/Makefile.sources | 1 +
> > > >  src/gallium/drivers/swr/meson.build      | 3 ++-
> > > >  2 files changed, 3 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/src/gallium/drivers/swr/Makefile.sources b/src/gallium/drivers/swr/Makefile.sources
> > > > index a06d1d7b929..6753d501a0d 100644
> > > > --- a/src/gallium/drivers/swr/Makefile.sources
> > > > +++ b/src/gallium/drivers/swr/Makefile.sources
> > > > @@ -132,6 +132,7 @@ CORE_CXX_SOURCES := \
> > > >  	rasterizer/core/threads.h \
> > > >  	rasterizer/core/tilemgr.cpp \
> > > >  	rasterizer/core/tilemgr.h \
> > > > +	rasterizer/core/tileset.h \
> > > >  	rasterizer/core/utils.h
> > > >  
> > > >  JITTER_CXX_SOURCES := \
> > > > diff --git a/src/gallium/drivers/swr/meson.build b/src/gallium/drivers/swr/meson.build
> > > > index 575133def56..5b3b53d0acf 100644
> > > > --- a/src/gallium/drivers/swr/meson.build
> > > > +++ b/src/gallium/drivers/swr/meson.build
> > > > @@ -1,4 +1,4 @@
> > > > -# Copyright © 2017-2018 Intel Corporation
> > > > +# Copyright © 2017-2018 Intel Corporation
> > > 
> > > You should probably revert that before pushing your commit :)
> > > 
> > > >  
> > > >  # Permission is hereby granted, free of charge, to any person obtaining a copy
> > > >  # of this software and associated documentation files (the "Software"), to deal
> > > > @@ -131,6 +131,7 @@ files_swr_arch = files(
> > > >    'rasterizer/core/threads.h',
> > > >    'rasterizer/core/tilemgr.cpp',
> > > >    'rasterizer/core/tilemgr.h',
> > > > +  'rasterizer/core/tileset.h',
> > > 
> > > Meson tracks #includes, so adding this is actually a noop, but for
> > > consistency let's add it in for now.
> > > 
> > 
> > Ah, nice! That explains why it wasn't failing with Meson.
> > 
> > 
> > > Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
> > > 
> > > Dylan, what do you think? Do we want to remove all the unnecessary
> > > files() from meson, or keep them to mirror what was needed by autotools?
> > > I'd vote 'remove', but the "let's do the same thing everywhere" argument
> > > is valid; what do people think?
> > 
> > I would also remove them. I don't see any reason to mirror what autotools do.
> > The simpler it is, the better. After all, IIUC scons doesn't mirror autotools
> > neither.
> 
> I think scons imports the file lists from autotools' Makefile.sources ?
> 

Ah, you're right. In any case, my vote would be 'remove', as yours.


	J.A.



> > 
> > 
> > 	J.A.
> > 
> > > 
> > > >    'rasterizer/core/utils.h',
> > > >    'rasterizer/memory/ClearTile.cpp',
> > > >    'rasterizer/memory/Convert.h',
> > > > -- 
> > > > 2.17.0
> > > > 
> > > 
> > > 
> 
>