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

anv: Feed vk_android_native_buffer.xml to generators (v2)

Browse Source 
Feed the XML to anv_extensions.py and anv_entrypoints_gen.py.
Do it on all platforms, not just Android. Tested on Android and Fedora.

We always parse the Android XML, regardless of target platform, to
help reduce the chance that people working on non-Android break the
Android build.

v2:
  - Squash in Tapani's changes to Android.*.mk.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com> (v1)
This commit is contained in:
Chad Versace
2017-08-22 16:26:03 -07:00
parent 6a5ff18039
commit 39c9d43536
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,8 @@ $(intermediates)/vulkan/dummy.c:
$(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c
$(VK_ENTRYPOINTS_SCRIPT) \
--outdir $(dir $@) \
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml
LOCAL_EXPORT_C_INCLUDE_DIRS := \
$(intermediates)
@@ -214,12 +215,14 @@ $(intermediates)/vulkan/anv_entrypoints.c:
@mkdir -p $(dir $@)
$(VK_ENTRYPOINTS_SCRIPT) \
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
--outdir $(dir $@)
$(intermediates)/vulkan/anv_extensions.c:
@mkdir -p $(dir $@)
$(VK_EXTENSIONS_SCRIPT) \
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
--xml $(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
--out $@
LOCAL_SHARED_LIBRARIES := libdrm

17
src/intel/Makefile.vulkan.am
View File

@@ -23,18 +23,27 @@
# rules must be outside of any AM_CONDITIONALs. Otherwise they will be commented
# out and we'll fail at `make dist'
vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
vk_android_native_buffer_xml = $(top_srcdir)/src/vulkan/registry/vk_android_native_buffer.xml
vulkan/anv_entrypoints.c: vulkan/anv_entrypoints_gen.py \
vulkan/anv_extensions.py $(vulkan_api_xml)
vulkan/anv_extensions.py \
$(vulkan_api_xml) \
$(vk_android_native_buffer_xml)
$(MKDIR_GEN)
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_entrypoints_gen.py \
--xml $(vulkan_api_xml) --outdir $(builddir)/vulkan
--xml $(vulkan_api_xml) \
--xml $(vk_android_native_buffer_xml) \
--outdir $(builddir)/vulkan
vulkan/anv_entrypoints.h: vulkan/anv_entrypoints.c
vulkan/anv_extensions.c: vulkan/anv_extensions.py $(vulkan_api_xml)
vulkan/anv_extensions.c: vulkan/anv_extensions.py \
$(vulkan_api_xml) \
$(vk_android_native_buffer_xml)
$(MKDIR_GEN)
$(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_extensions.py \
--xml $(vulkan_api_xml) --out $@
--xml $(vulkan_api_xml) \
--xml $(vk_android_native_buffer_xml) \
--out $@
BUILT_SOURCES += $(VULKAN_GENERATED_FILES)
CLEANFILES += \

12
src/intel/vulkan/anv_extensions.py
View File

@@ -136,8 +136,18 @@ def _init_exts_from_xml(xml):
ext_name = ext_elem.attrib['name']
if ext_name not in ext_name_map:
continue
ext = ext_name_map[ext_name]
# Workaround for VK_ANDROID_native_buffer. Its <extension> element in
# vk.xml lists it as supported="disabled" and provides only a stub
# definition. Its <extension> element in Mesa's custom
# vk_android_native_buffer.xml, though, lists it as
# supported='android-vendor' and fully defines the extension. We want
# to skip the <extension> element in vk.xml.
if ext_elem.attrib['supported'] == 'disabled':
assert ext_name == 'VK_ANDROID_native_buffer'
continue
ext = ext_name_map[ext_name]
ext.type = ext_elem.attrib['type']
_TEMPLATE = Template(COPYRIGHT + """