diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index fb0bb678ef4..48f2da96a10 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -34,7 +34,6 @@ #include #include "anv_private.h" -#include "vk_format_info.h" #include "vk_util.h" static int anv_hal_open(const struct hw_module_t* mod, const char* id, struct hw_device_t** dev); @@ -113,7 +112,7 @@ enum { AHARDWAREBUFFER_USAGE_CAMERA_MASK = 0x00060000U, }; -static inline VkFormat +inline VkFormat vk_format_from_android(unsigned android_format, unsigned android_usage) { switch (android_format) { diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 4e0abf0f57e..0bfe1523aa3 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -3605,6 +3605,9 @@ bool anv_formats_ccs_e_compatible(const struct gen_device_info *devinfo, VkImageTiling vk_tiling, const VkImageFormatListCreateInfoKHR *fmt_list); +extern VkFormat +vk_format_from_android(unsigned android_format, unsigned android_usage); + static inline struct isl_swizzle anv_swizzle_for_render(struct isl_swizzle swizzle) {