[Mesa-dev] [PATCH v03 14/38] i965: Move MOCS macros to brw_context.h.

[Rafael Antognolli]

On Wed, May 03, 2017 at 11:36:29PM -0700, Kenneth Graunke wrote:
> On Wednesday, May 3, 2017 7:52:01 PM PDT Pohjolainen, Topi wrote:
> > On Wed, May 03, 2017 at 05:11:45PM -0700, Rafael Antognolli wrote:
> > > On Wed, May 03, 2017 at 08:28:24PM +0300, Pohjolainen, Topi wrote:
> > > > On Mon, May 01, 2017 at 06:43:02PM -0700, Rafael Antognolli wrote:
> > > > > These macros are defined in brw_defines.h, which contains a lot of
> > > > > macros that conflict with autogenerated code from genxml. But we need to
> > > > > use them (the MOCS macros) in some of that same genxml code.
> > > > > 
> > > > > Moving them to brw_context.h solves that problem and we don't have to
> > > > > include brw_defines.h.
> > > > 
> > > > I've been hoping to remove things from brw_context.h - it starts to
> > > > resemble a dump yard for all sort of things. I think in this case we
> > > > could put these into brw_state.h instead? Or did you already try that?
> > > 
> > > I just tried this and it works fine too. I'm OK with either place to put
> > > these macros.
> > 
> > That would get my:
> > 
> > Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> 
> I do like that better.  Since I already landed this patch...Rafael,
> would you mind sending a patch to move them from brw_context.h to
> brw_state.h, and applying Topi's R-b?  I can push it.

Just sent it. I added them to the end of the header, as I couldn't
figure out a place that would make more sense. But feel free to move
them around if you prefer.