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