Re: [Mesa-dev] [PATCH 02/16] intel/genxml/icl: Generate packing headers
On Thu, Feb 15, 2018 at 9:49 AM, Emil Velikov wrote: > On 13 February 2018 at 19:15, Anuj Phogat wrote: >> Signed-off-by: Anuj Phogat >> --- >> src/intel/Android.genxml.mk | 5 + >> src/intel/Makefile.sources| 3 ++- >> src/intel/genxml/genX_pack.h | 2 ++ >> src/intel/genxml/gen_macros.h | 3 +++ >> 4 files changed, 12 insertions(+), 1 deletion(-) >> >> 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) >> + > ... and here it is. > > I second Kenneth - please keep the build bits in one patch. > Be that squashing 1+2 or keeping git add gen10.xml in patch 01 and the > build in 02. > > Thanks > Emil I'll move the build changes in patch 2. Thanks. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 02/16] intel/genxml/icl: Generate packing headers
On 13 February 2018 at 19:15, Anuj Phogat wrote: > Signed-off-by: Anuj Phogat > --- > src/intel/Android.genxml.mk | 5 + > src/intel/Makefile.sources| 3 ++- > src/intel/genxml/genX_pack.h | 2 ++ > src/intel/genxml/gen_macros.h | 3 +++ > 4 files changed, 12 insertions(+), 1 deletion(-) > > 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) > + ... and here it is. I second Kenneth - please keep the build bits in one patch. Be that squashing 1+2 or keeping git add gen10.xml in patch 01 and the build in 02. Thanks Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH 02/16] intel/genxml/icl: Generate packing headers
On Tuesday, February 13, 2018 11:15:02 AM PST Anuj Phogat wrote: > Signed-off-by: Anuj Phogat > --- > src/intel/Android.genxml.mk | 5 + > src/intel/Makefile.sources| 3 ++- > src/intel/genxml/genX_pack.h | 2 ++ > src/intel/genxml/gen_macros.h | 3 +++ > 4 files changed, 12 insertions(+), 1 deletion(-) No Meson changes in this patch. It looks like the addition in the previous patch may have been sufficient. It's kind of weird to have the build systems in different patches. I might squash this, but it's up to you. Either way, Reviewed-by: Kenneth Graunke signature.asc Description: This is a digitally signed message part. ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 02/16] intel/genxml/icl: Generate packing headers
Signed-off-by: Anuj Phogat --- src/intel/Android.genxml.mk | 5 + src/intel/Makefile.sources| 3 ++- src/intel/genxml/genX_pack.h | 2 ++ src/intel/genxml/gen_macros.h | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) 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 2d76c93e56..4c0240bdf1 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -144,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 -- 2.13.6 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev