On 02/04/2018 11:57 PM, Mauro Rossi wrote:
Building rules are aligned to automake ones
The correct script to build anv_extensions.{c,h} is anv_extensions_gen.py
Generation rules for anv_extensions.c requires --out-c option
Generation rules for anv_extensions.h were missing
Necessary include paths are added to avoid following build errors:
cp: cannot stat
'.../gen/STATIC_LIBRARIES/libmesa_vulkan_common_intermediates/vulkan/anv_extensions.c':
No such file or directory
#### failed to build some targets (01:24 (mm:ss)) ####
In file included from external/mesa/src/intel/vulkan/anv_gem.c:32:
external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error:
'anv_extensions.h' file not found
#include "anv_extensions.h"
^~~~~~~~~~~~~~~~~~
1 error generated.
In file included from external/mesa/src/intel/vulkan/anv_batch_chain.c:30:
external/mesa/src/intel/vulkan/anv_private.h:75:10: fatal error:
'anv_extensions.h' file not found
#include "anv_extensions.h"
^~~~~~~~~~~~~~~~~~
1 error generated.
Fixes: ca6237e ("android: anv_extensions.c is generated to
libmesa_vulkan_common")
It does not fix this commit because back then '--out-c' or
anv_extensions.h did not exist. Those were introduced later by commit
dd088d4bec which this commit is fixing.
With that changed;
Reviewed-by: Tapani Pälli <tapani.pa...@intel.com>
Cc: "18.0" <mesa-sta...@lists.freedesktop.org>
---
src/intel/Android.vulkan.mk | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 32b4892e17..5c8c947136 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -25,7 +25,7 @@ include $(LOCAL_PATH)/Makefile.sources
VK_ENTRYPOINTS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_entrypoints_gen.py
-VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/vulkan/anv_extensions.py
+VK_EXTENSIONS_SCRIPT := $(MESA_PYTHON2)
$(LOCAL_PATH)/vulkan/anv_extensions_gen.py
VULKAN_COMMON_INCLUDES := \
$(MESA_TOP)/include \
@@ -82,6 +82,7 @@ ANV_INCLUDES := \
$(VULKAN_COMMON_INCLUDES) \
$(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \
+ $(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan \
$(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util
#
@@ -212,6 +213,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_entrypoints.c
LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.c
+LOCAL_GENERATED_SOURCES += $(intermediates)/vulkan/anv_extensions.h
$(intermediates)/vulkan/anv_entrypoints.c:
@mkdir -p $(dir $@)
@@ -225,7 +227,14 @@ $(intermediates)/vulkan/anv_extensions.c:
$(VK_EXTENSIONS_SCRIPT) \
--xml $(MESA_TOP)/src/vulkan/registry/vk.xml \
--xml
$(MESA_TOP)/src/vulkan/registry/vk_android_native_buffer.xml \
- --out $@
+ --out-c $@
+
+$(intermediates)/vulkan/anv_extensions.h:
+ @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-h $@
LOCAL_SHARED_LIBRARIES := libdrm
@@ -252,7 +261,8 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := \
$(VULKAN_COMMON_INCLUDES) \
- $(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan
+ $(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,)/vulkan \
+ $(call
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_common,,)/vulkan
LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel/vulkan
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
