vulkan: rename vk_image::ahardware_buffer_format

Rename it to ahb_format.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22619>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index c856462..7f33f55 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -1997,8 +1997,7 @@ radv_image_create(VkDevice _device, const struct radv_image_create_info *create_
    if (image->vk.external_handle_types &
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
 #ifdef ANDROID
-      image->vk.ahardware_buffer_format =
-         radv_ahb_format_for_vk_format(image->vk.format);
+      image->vk.ahb_format = radv_ahb_format_for_vk_format(image->vk.format);
 #endif
 
       *pImage = radv_image_to_handle(image);

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 477fb08..66a6d58 100644 (file)
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -1364,8 +1364,7 @@ anv_image_init(struct anv_device *device, struct anv_image *image,
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
       image->from_ahb = true;
 #ifdef ANDROID
-      image->vk.ahardware_buffer_format =
-         anv_ahb_format_for_vk_format(image->vk.format);
+      image->vk.ahb_format = anv_ahb_format_for_vk_format(image->vk.format);
 #endif
       return VK_SUCCESS;
    }

diff --git a/src/intel/vulkan_hasvk/anv_image.c b/src/intel/vulkan_hasvk/anv_image.c
index c14d34d..780e2e7 100644 (file)
--- a/src/intel/vulkan_hasvk/anv_image.c
+++ b/src/intel/vulkan_hasvk/anv_image.c
@@ -1282,8 +1282,7 @@ anv_image_init(struct anv_device *device, struct anv_image *image,
        VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
       image->from_ahb = true;
 #ifdef ANDROID
-      image->vk.ahardware_buffer_format =
-         anv_ahb_format_for_vk_format(image->vk.format);
+      image->vk.ahb_format = anv_ahb_format_for_vk_format(image->vk.format);
 #endif
       return VK_SUCCESS;
    }

diff --git a/src/vulkan/runtime/vk_android.c b/src/vulkan/runtime/vk_android.c
index eb54b1d..ec01de3 100644 (file)
--- a/src/vulkan/runtime/vk_android.c
+++ b/src/vulkan/runtime/vk_android.c
@@ -115,11 +115,11 @@ vk_alloc_ahardware_buffer(const VkMemoryAllocateInfo *pAllocateInfo)
       w = image->extent.width;
       h = image->extent.height;
       layers = image->array_layers;
-      assert(image->ahardware_buffer_format != 0);
+      assert(image->ahb_format != 0);
       /* TODO: This feels a bit sketchy.  We should probably be taking the
        * external format into account somehow.
        */
-      format = image->ahardware_buffer_format;
+      format = image->ahb_format;
       usage = vk_image_usage_to_ahb_usage(image->create_flags,
                                           image->usage);
    } else if (dedicated_info && dedicated_info->buffer) {

diff --git a/src/vulkan/runtime/vk_image.c b/src/vulkan/runtime/vk_image.c
index e8af0e8..ee6ef7e 100644 (file)
--- a/src/vulkan/runtime/vk_image.c
+++ b/src/vulkan/runtime/vk_image.c
@@ -100,7 +100,7 @@ vk_image_init(struct vk_device *device,
 #endif
 
 #ifdef ANDROID
-   image->ahardware_buffer_format = 0;
+   image->ahb_format = 0;
 
    const VkExternalFormatANDROID *ext_format =
       vk_find_struct_const(pCreateInfo->pNext, EXTERNAL_FORMAT_ANDROID);

diff --git a/src/vulkan/runtime/vk_image.h b/src/vulkan/runtime/vk_image.h
index 79541fb..594cae6 100644 (file)
--- a/src/vulkan/runtime/vk_image.h
+++ b/src/vulkan/runtime/vk_image.h
@@ -81,7 +81,7 @@ struct vk_image {
     * A default is provided by the Vulkan runtime code based on the VkFormat
     * but it may be overridden by the driver as needed.
     */
-   unsigned ahardware_buffer_format;
+   uint32_t ahb_format;
 #endif
 };
 VK_DEFINE_NONDISP_HANDLE_CASTS(vk_image, base, VkImage,