From 13ef793770e5c1ca6038e943da350125558fba5d Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sun, 8 Dec 2019 09:40:36 +0100 Subject: [PATCH] android: util: Add a mapping from VkFormat to PIPE_FORMAT. Updates Makefile.sources and fixes the following building error: In file included from external/mesa/src/vulkan/util/vk_format.c:24: In file included from external/mesa/src/vulkan/util/vk_format.h:28: external/mesa/src/util/format/u_format.h:33:10: fatal error: 'pipe/p_format.h' file not found #include "pipe/p_format.h" ^~~~~~~~~~~~~~~~~ 1 error generated. Fixes: 3a28281 ("util: Add a mapping from VkFormat to PIPE_FORMAT.") Signed-off-by: Mauro Rossi Reviewed-by: Lionel Landwerlin --- src/vulkan/Android.mk | 3 ++- src/vulkan/Makefile.sources | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk index 71aa5e5f0bd..4b1695abc65 100644 --- a/src/vulkan/Android.mk +++ b/src/vulkan/Android.mk @@ -37,7 +37,8 @@ intermediates := $(call local-generated-sources-dir) LOCAL_C_INCLUDES := \ $(MESA_TOP)/include/vulkan \ - $(MESA_TOP)/src/vulkan/util + $(MESA_TOP)/src/vulkan/util \ + $(MESA_TOP)/src/gallium/include ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) LOCAL_C_INCLUDES += \ diff --git a/src/vulkan/Makefile.sources b/src/vulkan/Makefile.sources index f0f6bcd4fd8..16a6037a447 100644 --- a/src/vulkan/Makefile.sources +++ b/src/vulkan/Makefile.sources @@ -27,6 +27,7 @@ VULKAN_UTIL_FILES := \ util/vk_alloc.h \ util/vk_debug_report.c \ util/vk_debug_report.h \ + util/vk_format.c \ util/vk_util.c \ util/vk_util.h -- 2.30.2