KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv/anv android: rename buffer usage camera mask 

AHARDWAREBUFFER_USAGE_CAMERA_MASK enum is defined later and gets
included in the stub headers.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13255>
This commit is contained in:
Yiwei Zhang 2021-10-07 19:23:31 +00:00 committed by Marge Bot
parent 878d8d96c7
commit 8ebf0d1105
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_android.c
View File

@ -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;

4
src/intel/vulkan/anv_android.c
View File

@ -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;