[Mesa-dev] [RFC 3/6] anv/android: add GetAndroidHardwareBufferPropertiesANDROID WIP

[Tapani Pälli]

On 05/29/2018 10:08 AM, Tapani Pälli wrote:
> TODO - need to figure out implementation-defined external format identifier
>       - YUV support
> 
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>   src/intel/vulkan/anv_android.c | 91 ++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 91 insertions(+)
> 
> diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
> index 7e07dbaaa4..6c0c8cc793 100644
> --- a/src/intel/vulkan/anv_android.c
> +++ b/src/intel/vulkan/anv_android.c
> @@ -29,6 +29,8 @@
>   #include <sync/sync.h>
>   
>   #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);
>   static int anv_hal_close(struct hw_device_t *dev);
> @@ -96,6 +98,95 @@ anv_hal_close(struct hw_device_t *dev)
>      return -1;
>   }
>   
> +static VkResult
> +get_ahw_buffer_format_properties(
> +   VkDevice device_h,
> +   const struct AHardwareBuffer *buffer,
> +   VkAndroidHardwareBufferFormatPropertiesANDROID *pProperties)
> +{
> +   ANV_FROM_HANDLE(anv_device, device, device_h);
> +
> +   /* Get a description of buffer contents . */
> +   AHardwareBuffer_Desc desc;
> +   AHardwareBuffer_describe(buffer, &desc);
> +
> +   /* Verify description. */
> +   uint64_t gpu_usage =
> +      AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE |
> +      AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT |
> +      AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER;
> +
> +   /* "Buffer must be a valid Android hardware buffer object with at least
> +    * one of the AHARDWAREBUFFER_USAGE_GPU_* usage flags."
> +    */
> +   if (!(desc.usage & (gpu_usage)))
> +      return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR;
> +
> +   /* Fill properties fields based on description. */
> +   VkAndroidHardwareBufferFormatPropertiesANDROID *p = pProperties;
> +
> +   p->pNext = NULL;
> +   p->format = vk_format_from_android(desc.format);
> +   p->externalFormat = 1; /* XXX */
> +
> +   const struct anv_format *anv_format = anv_get_format(p->format);
> +   struct anv_physical_device *physical_device =
> +      &device->instance->physicalDevice;
> +   const struct gen_device_info *devinfo = &physical_device->info;
> +
> +   p->formatFeatures =
> +      anv_get_image_format_features(devinfo, p->format,
> +                                    anv_format, VK_IMAGE_TILING_OPTIMAL);
> +
> +   p->samplerYcbcrConversionComponents.r = VK_COMPONENT_SWIZZLE_IDENTITY;
> +   p->samplerYcbcrConversionComponents.g = VK_COMPONENT_SWIZZLE_IDENTITY;
> +   p->samplerYcbcrConversionComponents.b = VK_COMPONENT_SWIZZLE_IDENTITY;
> +   p->samplerYcbcrConversionComponents.a = VK_COMPONENT_SWIZZLE_IDENTITY;
> +
> +   p->suggestedYcbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY;
> +   p->suggestedYcbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_FULL;
> +   p->suggestedXChromaOffset = VK_CHROMA_LOCATION_COSITED_EVEN;
> +   p->suggestedYChromaOffset = VK_CHROMA_LOCATION_COSITED_EVEN;
> +
> +   return VK_SUCCESS;
> +}
> +
> +VkResult
> +anv_GetAndroidHardwareBufferPropertiesANDROID(
> +   VkDevice device_h,
> +   const struct AHardwareBuffer *buffer,
> +   VkAndroidHardwareBufferPropertiesANDROID *pProperties)
> +{
> +   ANV_FROM_HANDLE(anv_device, dev, device_h);
> +   struct anv_physical_device *pdevice = &dev->instance->physicalDevice;
> +
> +   const VkExternalFormatANDROID *format_prop =
> +      vk_find_struct_const(pProperties->pNext,
> +                           ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID);

oops this was wrong structure and should rather be:

VkAndroidHardwareBufferFormatPropertiesANDROID *format_prop =
vk_find_struct((pProperties->pNext, 
ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID);

I've corrected this, rebased the patches and done some testing locally.

> +
> +   /* Fill format properties of an Android hardware buffer. */
> +   if (format_prop)
> +      get_ahw_buffer_format_properties(device_h, buffer, format_prop);
> +
> +   /* Get a description of buffer contents . */
> +   AHardwareBuffer_Desc desc;
> +   AHardwareBuffer_describe(buffer, &desc);
> +
> +   const native_handle_t *handle =
> +      AHardwareBuffer_getNativeHandle(buffer);
> +   int dma_buf = (handle && handle->numFds) ? handle->data[0] : -1;
> +   if (dma_buf < 0)
> +      return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR;
> +
> +   /* All memory types. */
> +   uint32_t memory_types = (1ull << pdevice->memory.type_count) - 1;
> +
> +   pProperties->allocationSize = lseek(dma_buf, 0, SEEK_END);
> +   pProperties->memoryTypeBits = memory_types;
> +
> +   return VK_SUCCESS;
> +}
> +
>   VkResult
>   anv_image_from_gralloc(VkDevice device_h,
>                          const VkImageCreateInfo *base_info,
>