diff options
| author | Chad Versace <[email protected]> | 2017-08-22 16:26:03 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2017-09-18 14:26:54 -0700 |
| commit | 39c9d435364a30a97b64c2b6388081cdcefbf683 (patch) | |
| tree | f4fbd7f4364421df0b31d3d909ee864f4c1b39e7 /src/intel/Android.vulkan.mk | |
| parent | 6a5ff18039d0c35e79ac24ceae2479d5c7c85bd3 (diff) | |
anv: Feed vk_android_native_buffer.xml to generators (v2)
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 <[email protected]> (v1)
Diffstat (limited to 'src/intel/Android.vulkan.mk')
| -rw-r--r-- | src/intel/Android.vulkan.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk index 17ae4b071b3..a15d9169425 100644 --- a/src/intel/Android.vulkan.mk +++ b/src/intel/Android.vulkan.mk @@ -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 |