android: radv: fix vk_format_table.c generated source build
authorMauro Rossi <issor.oruam@gmail.com>
Sun, 8 Dec 2019 08:40:36 +0000 (09:40 +0100)
committerMauro Rossi <issor.oruam@gmail.com>
Fri, 27 Dec 2019 08:20:44 +0000 (09:20 +0100)
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 <issor.oruam@gmail.com>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
src/amd/vulkan/Android.mk

index f01e10f90035bc9007263984640c80fcadafd382..31e4b307fdf504c51f2edb5a4212ec078f20f699 100644 (file)
@@ -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 \