[Mesa-dev] [PATCH 3/9] genxml: New generated header genX_bits.h (v2)

[Emil Velikov]

On 23 March 2017 at 01:03, Chad Versace <chadversary at chromium.org> wrote:

> ---
>  src/intel/Makefile.genxml.am        |   6 +-
>  src/intel/Makefile.sources          |   6 +-
>  src/intel/genxml/.gitignore         |   1 +
>  src/intel/genxml/gen_bits_header.py | 259 ++++++++++++++++++++++++++++++++++++
>  4 files changed, 270 insertions(+), 2 deletions(-)
>  create mode 100644 src/intel/genxml/gen_bits_header.py
>
> diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
> index 01a02b63b44..4e59a918618 100644
> --- a/src/intel/Makefile.genxml.am
> +++ b/src/intel/Makefile.genxml.am
> @@ -30,7 +30,7 @@ EXTRA_DIST += \
>
>  SUFFIXES = _pack.h _xml.h .xml
>
> -$(GENXML_GENERATED_FILES): genxml/gen_pack_header.py
> +$(GENXML_GENERATED_PACK_FILES): genxml/gen_pack_header.py
>
>  .xml_pack.h:
>         $(MKDIR_GEN)
> @@ -42,6 +42,10 @@ $(AUBINATOR_GENERATED_FILES): genxml/gen_zipped_file.py
>         $(MKDIR_GEN)
>         $(AM_V_GEN) $(PYTHON2) $(srcdir)/genxml/gen_zipped_file.py $< > $@ || ($(RM) $@; false)
>
> +genxml/genX_bits.h: genxml/gen_bits_header.py $(GENXML_XML_FILES)
> +       $(MKDIR_GEN)
> +       $(PYTHON_GEN) $< -o $@ $(GENXML_XML_FILES)
> +
>  EXTRA_DIST += \
>         genxml/genX_pack.h \
>         genxml/gen_macros.h \
> diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
> index 801797d2768..ec43f06a495 100644
> --- a/src/intel/Makefile.sources
> +++ b/src/intel/Makefile.sources
> @@ -117,7 +117,7 @@ GENXML_XML_FILES = \
>         genxml/gen8.xml \
>         genxml/gen9.xml
>
> -GENXML_GENERATED_FILES = \
> +GENXML_GENERATED_PACK_FILES = \
>         genxml/gen4_pack.h \
>         genxml/gen45_pack.h \
>         genxml/gen5_pack.h \
> @@ -127,6 +127,10 @@ GENXML_GENERATED_FILES = \
>         genxml/gen8_pack.h \
>         genxml/gen9_pack.h
>
> +GENXML_GENERATED_FILES = \
> +       $(GENXML_GENERATED_PACK_FILES) \
> +       genxml/genX_bits.h
> +
Chad, this patch will need a fix on Android side.

Tapani, RobH, please let use know how you would like that sorted -
provide a fix to squash or address as follow-up.

Thanks
Emil