diff options
| author | Mauro Rossi <[email protected]> | 2017-02-28 01:24:41 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-28 01:24:41 +0100 |
| commit | 3f2cb699cfe0481f214c709b5a1375caf0a9c7fe (patch) | |
| tree | 77f1c429036d86140bc59a12a071fa5b0d0a19ae /src/intel/vulkan | |
| parent | 3bbbb63801c9c30440398563d6090029f9c7b51c (diff) | |
android: vulkan: add support for libmesa_vulkan_util
The following changes are implemented:
Add src/vulkan/Android.mk to build libmesa_vulkan_util
Android.mk: add src/vulkan to SUBDIR to build new module
intel/vulkan: fix libmesa_vulkan_util,vk_enum_to_str.h dependencies
Add -o OUTPUT_PATH option in src/vulkan/util/gen_enum_to_str.py script
Use -o OUTPUT_PATH option in automake generation rules for vk_enum_to_str.{c,h}
Fixes: e9dcb17 "vulkan/util: Add generator for enum_to_str functions"
Fixes: 8e03250 "vulkan: Combine wsi and util makefiles"
Reviewed-by: Dylan Baker <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
[Emil Velikov]
- Move parser within main()
- Use --outdir instead of -o
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel/vulkan')
| -rw-r--r-- | src/intel/vulkan/Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/intel/vulkan/Android.mk b/src/intel/vulkan/Android.mk index 1e5397019a0..a6a7d263f6d 100644 --- a/src/intel/vulkan/Android.mk +++ b/src/intel/vulkan/Android.mk @@ -74,7 +74,8 @@ include $(BUILD_STATIC_LIBRARY) ANV_INCLUDES := \ $(VULKAN_COMMON_INCLUDES) \ $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_anv_entrypoints,,) \ - $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_nir,,)/nir \ + $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_vulkan_util,,)/util # # libanv for gen7 @@ -172,7 +173,10 @@ LOCAL_C_INCLUDES := \ $(ANV_INCLUDES) \ $(MESA_TOP)/src/compiler -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_anv_entrypoints libmesa_genxml +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_anv_entrypoints \ + libmesa_genxml \ + libmesa_vulkan_util LOCAL_GENERATED_SOURCES += $(intermediates)/anv_entrypoints.c |