diff options
| author | Jason Ekstrand <[email protected]> | 2016-06-02 18:31:47 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-07-15 15:53:48 -0700 |
| commit | 27883f8cbc13140bf965eb7dd3ab759fb1b532ad (patch) | |
| tree | 19e1ec078ab1963143ed5b629408b2b22c1e5779 | |
| parent | ba798ac6b1f996f16d8f2bc65614d18d76a0b1f6 (diff) | |
genxml: Add macros and #includes for gens 4-6
Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/intel/genxml/genX_pack.h | 10 | ||||
| -rw-r--r-- | 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 7967c292645..0c25c4e94f4 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 868bc2203c8..1d591fa8066 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) /* Prefixing macros */ -#if (GEN_VERSIONx10 == 70) +#if (GEN_VERSIONx10 == 40) +# define GENX(X) GEN4_##X +# define genX(x) gen4_##x +#elif (GEN_VERSIONx10 == 45) +# define GENX(X) GEN45_##X +# define genX(x) gen45_##x +#elif (GEN_VERSIONx10 == 50) +# define GENX(X) GEN5_##X +# define genX(x) gen5_##x +#elif (GEN_VERSIONx10 == 60) +# define GENX(X) GEN6_##X +# define genX(x) gen6_##x +#elif (GEN_VERSIONx10 == 70) # define GENX(X) GEN7_##X # define genX(x) gen7_##x #elif (GEN_VERSIONx10 == 75) |