From ad1c65e32299a540a66a72bb601c1170d9907bf7 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 8 Dec 2019 09:40:36 +0100 Subject: [PATCH] android: radv: fix vk_format_table.c generated source build RADV Android build rules are now getting the wrong vk_format.h from src/vulkan/util include, the simplest way to fix is to add src/amd/vulkan include prior to src/vulkan/util include Fixes the following building errors: out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_radv_common_intermediates/vk_format_table.c:39:4: error: use of undeclared identifier 'VK_FORMAT_LAYOUT_PLAIN' ... out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_radv_common_intermediates/vk_format_table.c:131:8: error: use of undeclared identifier 'VK_FORMAT_TYPE_UNSIGNED'; did you mean 'UTIL_FORMAT_TYPE_UNSIGNED'? {VK_FORMAT_TYPE_UNSIGNED, true, false, false, 4, 0}, /* x = a */ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. Fixes: 3a28281 ("util: Add a mapping from VkFormat to PIPE_FORMAT.") Signed-off-by: Mauro Rossi Acked-by: Samuel Pitoiset --- src/amd/vulkan/Android.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/amd/vulkan/Android.mk b/src/amd/vulkan/Android.mk index f01e10f9003..31e4b307fdf 100644 --- a/src/amd/vulkan/Android.mk +++ b/src/amd/vulkan/Android.mk @@ -30,6 +30,7 @@ include $(LOCAL_PATH)/Makefile.sources RADV_COMMON_INCLUDES := \ $(MESA_TOP)/include \ $(MESA_TOP)/src/ \ + $(MESA_TOP)/src/amd/vulkan \ $(MESA_TOP)/src/vulkan/wsi \ $(MESA_TOP)/src/vulkan/util \ $(MESA_TOP)/src/amd \ -- 2.30.2