OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/genxml/icl: Generate packing headers

Browse Source 
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>
This commit is contained in:
Anuj Phogat
2017-05-10 10:50:15 -07:00
parent 7ed27d8cbf
commit 165a68b05a
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/Android.genxml.mk
View File

@@ -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 $(intermediates)/genxml/gen10_pack.h: $(LOCAL_PATH)/genxml/gen10.xml $(LOCAL_PATH)/genxml/gen_pack_header.py
$(call header-gen) $(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 $(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 $@) @mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"

6
src/intel/Makefile.sources
View File

@@ -132,7 +132,8 @@ GENXML_XML_FILES = \
genxml/gen75.xml \ genxml/gen75.xml \
genxml/gen8.xml \ genxml/gen8.xml \
genxml/gen9.xml \ genxml/gen9.xml \
genxml/gen10.xml genxml/gen10.xml \
genxml/gen11.xml
GENXML_GENERATED_PACK_FILES = \ GENXML_GENERATED_PACK_FILES = \
genxml/gen4_pack.h \ genxml/gen4_pack.h \
@@ -143,7 +144,8 @@ GENXML_GENERATED_PACK_FILES = \
genxml/gen75_pack.h \ genxml/gen75_pack.h \
genxml/gen8_pack.h \ genxml/gen8_pack.h \
genxml/gen9_pack.h \ genxml/gen9_pack.h \
genxml/gen10_pack.h genxml/gen10_pack.h \
genxml/gen11_pack.h
GENXML_GENERATED_FILES = \ GENXML_GENERATED_FILES = \
$(GENXML_GENERATED_PACK_FILES) \ $(GENXML_GENERATED_PACK_FILES) \

2
src/intel/genxml/genX_pack.h
View File

@@ -46,6 +46,8 @@
# include "genxml/gen9_pack.h" # include "genxml/gen9_pack.h"
#elif (GEN_VERSIONx10 == 100) #elif (GEN_VERSIONx10 == 100)
# include "genxml/gen10_pack.h" # include "genxml/gen10_pack.h"
#elif (GEN_VERSIONx10 == 110)
# include "genxml/gen11_pack.h"
#else #else
# error "Need to add a pack header include for this gen" # error "Need to add a pack header include for this gen"
#endif #endif

3
src/intel/genxml/gen_macros.h
View File

@@ -88,6 +88,9 @@
#elif (GEN_VERSIONx10 == 100) #elif (GEN_VERSIONx10 == 100)
# define GENX(X) GEN10_##X # define GENX(X) GEN10_##X
# 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 #else
# error "Need to add prefixing macros for this gen" # error "Need to add prefixing macros for this gen"
#endif #endif

1
src/intel/genxml/meson.build
View File

@@ -28,6 +28,7 @@ gen_xml_files = [
'gen8.xml', 'gen8.xml',
'gen9.xml', 'gen9.xml',
'gen10.xml', 'gen10.xml',
'gen11.xml',
] ]
genX_xml_h = custom_target( genX_xml_h = custom_target(