diff --git a/src/amd/vulkan/radv_android.c b/src/amd/vulkan/radv_android.c index f9aa3189df6..c89719bb0b8 100644 --- a/src/amd/vulkan/radv_android.c +++ b/src/amd/vulkan/radv_android.c @@ -507,7 +507,7 @@ radv_QueueSignalReleaseImageANDROID(VkQueue _queue, uint32_t waitSemaphoreCount, enum { /* Usage bit equal to GRALLOC_USAGE_HW_CAMERA_MASK */ - AHARDWAREBUFFER_USAGE_CAMERA_MASK = 0x00060000U, + BUFFER_USAGE_CAMERA_MASK = 0x00060000U, }; static inline VkFormat @@ -528,7 +528,7 @@ vk_format_from_android(unsigned android_format, unsigned android_usage) case AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420: return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM; case AHARDWAREBUFFER_FORMAT_IMPLEMENTATION_DEFINED: - if (android_usage & AHARDWAREBUFFER_USAGE_CAMERA_MASK) + if (android_usage & BUFFER_USAGE_CAMERA_MASK) return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM; else return VK_FORMAT_R8G8B8_UNORM; diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index df624abca31..d974ffcd3e1 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -110,7 +110,7 @@ anv_hal_close(struct hw_device_t *dev) enum { /* Usage bit equal to GRALLOC_USAGE_HW_CAMERA_MASK */ - AHARDWAREBUFFER_USAGE_CAMERA_MASK = 0x00060000U, + BUFFER_USAGE_CAMERA_MASK = 0x00060000U, }; inline VkFormat @@ -132,7 +132,7 @@ vk_format_from_android(unsigned android_format, unsigned android_usage) case HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL: return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM; case AHARDWAREBUFFER_FORMAT_IMPLEMENTATION_DEFINED: - if (android_usage & AHARDWAREBUFFER_USAGE_CAMERA_MASK) + if (android_usage & BUFFER_USAGE_CAMERA_MASK) return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM; else return VK_FORMAT_R8G8B8_UNORM;