[Mesa-dev] [PATCH 34/64] genxml: Add macros and #includes for gens 4-6

[Chad Versace]

On Mon 20 Jun 2016, Chad Versace wrote:
> On Sat 11 Jun 2016, Jason Ekstrand wrote:
> > ---
> >  src/intel/genxml/genX_pack.h  | 10 +++++++++-
> >  src/intel/genxml/gen_macros.h | 15 ++++++++++++++-
> >  2 files changed, 23 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h
> > index 7967c29..0c25c4e 100644
> > --- a/src/intel/genxml/genX_pack.h
> > +++ b/src/intel/genxml/genX_pack.h
> > @@ -27,7 +27,15 @@
> >  #  error "The GEN_VERSIONx10 macro must be defined"
> >  #endif
> >  
> > -#if (GEN_VERSIONx10 == 70)
> > +#if (GEN_VERSIONx10 == 40)
> > +#  include "genxml/gen4_pack.h"
> > +#elif (GEN_VERSIONx10 == 45)
> > +#  include "genxml/gen45_pack.h"
> > +#elif (GEN_VERSIONx10 == 50)
> > +#  include "genxml/gen5_pack.h"
> > +#elif (GEN_VERSIONx10 == 60)
> > +#  include "genxml/gen6_pack.h"
> > +#elif (GEN_VERSIONx10 == 70)
> >  #  include "genxml/gen7_pack.h"
> >  #elif (GEN_VERSIONx10 == 75)
> >  #  include "genxml/gen75_pack.h"
> > diff --git a/src/intel/genxml/gen_macros.h b/src/intel/genxml/gen_macros.h
> > index 868bc22..1d591fa 100644
> > --- a/src/intel/genxml/gen_macros.h
> > +++ b/src/intel/genxml/gen_macros.h
> > @@ -57,9 +57,22 @@
> >  
> >  #define GEN_GEN ((GEN_VERSIONx10) / 10)
> >  #define GEN_IS_HASWELL ((GEN_VERSIONx10) == 75)
> > +#define GEN_IS_G4X ((GEN_VERSIONx10) == 45)
> 
> I expected the new macro name to be GEN_IS_G45. Why is it G4X?

I answered my own question. Because chipsets G41, G45, G43---and even
G54, Q43, and Q45---are all covered by this macro.

Reviewed-by: Chad Versace <chad.versace at intel.com>