Mesa (master): android: fix vulkan build issues with anv_entrypoints

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: bcae4eb502615cc9e5dff5d071c96e6e975a0576
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bcae4eb502615cc9e5dff5d071c96e6e975a0576

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Mar 23 12:48:34 2017 +0200

android: fix vulkan build issues with anv_entrypoints

Patch fixes entrypoint generation for libmesa_anv_entrypoints that
still used old style of calling generator script.

Also small fixes to libmesa_vulkan_common where there was a typo
in target name (vulknan) and files were generated to wrong folder.

Fixes: 8211e3e6 ("anv: Generate anv_entrypoints header and code in one command")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Acked-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/Android.vulkan.mk | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 0649a2e9ef..cc0b5dff04 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -58,9 +58,10 @@ $(intermediates)/vulkan/dummy.c:
 	@echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
 	$(hide) touch $@
 
-$(intermediates)/vulkan/anv_entrypoints.h:
-	$(VK_ENTRYPOINTS_SCRIPT) header $@ --xml $(MESA_TOP)/src/vulkan/registry/vk.xml
-
+$(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/dummy.c
+	$(VK_ENTRYPOINTS_SCRIPT) \
+		--outdir $(dir $@) \
+		--xml $(MESA_TOP)/src/vulkan/registry/vk.xml
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
         $(intermediates)
@@ -177,13 +178,18 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 	libmesa_genxml \
 	libmesa_vulkan_util
 
+# The rule generates both C and H files, but due to some strange
+# reason generating the files once leads to link-time issues.
+# Work around create them here as well - we're safe from race
+# conditions since they are stored in another location.
+
 LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.c
 
-$(intermediates)/vulknan/anv_entrypoints.c:
+$(intermediates)/vulkan/anv_entrypoints.c:
+	@mkdir -p $(dir $@)
 	$(VK_ENTRYPOINTS_SCRIPT) \
 		--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
-		--outdir $(intermediates)/vulkan
-$(intermediates)/vulkan/anv_entrypoints.h: $(intermediates)/vulkan/anv_entrypoints.c
+		--outdir $(dir $@)
 
 LOCAL_SHARED_LIBRARIES := libdrm_intel