Mesa (master): intel/genxml/icl: Generate packing headers

[Anuj Phogat]

Module: Mesa
Branch: master
Commit: 165a68b05aab6e4c75c83ec664be33c4e97f7f67
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=165a68b05aab6e4c75c83ec664be33c4e97f7f67

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed May 10 10:50:15 2017 -0700

intel/genxml/icl: Generate packing headers

Move build system changes in to one patch (Ken, Emil)

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 src/intel/Android.genxml.mk   | 5 +++++
 src/intel/Makefile.sources    | 6 ++++--
 src/intel/genxml/genX_pack.h  | 2 ++
 src/intel/genxml/gen_macros.h | 3 +++
 src/intel/genxml/meson.build  | 1 +
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk
index e4d8dd8b94..8b867920c3 100644
--- a/src/intel/Android.genxml.mk
+++ b/src/intel/Android.genxml.mk
@@ -101,6 +101,11 @@ $(intermediates)/genxml/gen10_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen10.
 $(intermediates)/genxml/gen10_pack.h: $(LOCAL_PATH)/genxml/gen10.xml $(LOCAL_PATH)/genxml/gen_pack_header.py
 	$(call header-gen)
 
+$(intermediates)/genxml/gen11_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
+$(intermediates)/genxml/gen11_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen11.xml
+$(intermediates)/genxml/gen11_pack.h: $(LOCAL_PATH)/genxml/gen11.xml $(LOCAL_PATH)/genxml/gen_pack_header.py
+	$(call header-gen)
+
 $(intermediates)/genxml/genX_xml.h: $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py
 	@mkdir -p $(dir $@)
 	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 9595bf4258..4c0240bdf1 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -132,7 +132,8 @@ GENXML_XML_FILES = \
 	genxml/gen75.xml \
 	genxml/gen8.xml \
 	genxml/gen9.xml \
-	genxml/gen10.xml
+	genxml/gen10.xml \
+	genxml/gen11.xml
 
 GENXML_GENERATED_PACK_FILES = \
 	genxml/gen4_pack.h \
@@ -143,7 +144,8 @@ GENXML_GENERATED_PACK_FILES = \
 	genxml/gen75_pack.h \
 	genxml/gen8_pack.h \
 	genxml/gen9_pack.h \
-	genxml/gen10_pack.h
+	genxml/gen10_pack.h \
+	genxml/gen11_pack.h
 
 GENXML_GENERATED_FILES = \
 	$(GENXML_GENERATED_PACK_FILES) \
diff --git a/src/intel/genxml/genX_pack.h b/src/intel/genxml/genX_pack.h
index 187e75c598..cf39973db1 100644
--- a/src/intel/genxml/genX_pack.h
+++ b/src/intel/genxml/genX_pack.h
@@ -46,6 +46,8 @@
 #  include "genxml/gen9_pack.h"
 #elif (GEN_VERSIONx10 == 100)
 #  include "genxml/gen10_pack.h"
+#elif (GEN_VERSIONx10 == 110)
+#  include "genxml/gen11_pack.h"
 #else
 #  error "Need to add a pack header include for this gen"
 #endif
diff --git a/src/intel/genxml/gen_macros.h b/src/intel/genxml/gen_macros.h
index a85c08250c..43449a41a4 100644
--- a/src/intel/genxml/gen_macros.h
+++ b/src/intel/genxml/gen_macros.h
@@ -88,6 +88,9 @@
 #elif (GEN_VERSIONx10 == 100)
 #  define GENX(X) GEN10_##X
 #  define genX(x) gen10_##x
+#elif (GEN_VERSIONx10 == 110)
+#  define GENX(X) GEN11_##X
+#  define genX(x) gen11_##x
 #else
 #  error "Need to add prefixing macros for this gen"
 #endif
diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build
index 371f85307c..970d565471 100644
--- a/src/intel/genxml/meson.build
+++ b/src/intel/genxml/meson.build
@@ -28,6 +28,7 @@ gen_xml_files = [
   'gen8.xml',
   'gen9.xml',
   'gen10.xml',
+  'gen11.xml',
 ]
 
 genX_xml_h = custom_target(