intel/genxml/icl: Generate packing headers

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

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

diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk
index e4d8dd8b94555fed075aaaed40a82aa6b206dc57..8b867920c32fbb04ec48d29d490d3aae3742431b 100644 (file)
--- 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 9595bf4258242e15259d9c96723ee09f81e7038e..4c0240bdf174a909767ab60b7071c29aa170d775 100644 (file)
--- 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 187e75c59872dc66081ceed1f7ac3fd1079cb6bb..cf39973db1405fcbf27eab9e67264340875ecdac 100644 (file)
--- 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 a85c08250c884dbbccda4c623d49e6d84a06ba76..43449a41a461061ca0c2881d6add79f91ef9d256 100644 (file)
--- 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 371f85307c85b2428bb608c4ad2ca146415b3da8..970d5654713da5b23f273d5ca7d9a697171d7730 100644 (file)
--- 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(