OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: rename vk_image::ahardware_buffer_format

Browse Source 
Rename it to ahb_format.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22619>
This commit is contained in:
Chia-I Wu
2023-04-20 18:02:23 -07:00
committed by Marge Bot
parent 5561abcb2c
commit f81dce9bcc
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/amd/vulkan/radv_image.c
View File

@@ -1997,8 +1997,7 @@ radv_image_create(VkDevice _device, const struct radv_image_create_info *create_
if (image->vk.external_handle_types & if (image->vk.external_handle_types &
VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) { VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
#ifdef ANDROID #ifdef ANDROID
image->vk.ahardware_buffer_format = image->vk.ahb_format = radv_ahb_format_for_vk_format(image->vk.format);
radv_ahb_format_for_vk_format(image->vk.format);
#endif #endif
*pImage = radv_image_to_handle(image); *pImage = radv_image_to_handle(image);

3
src/intel/vulkan/anv_image.c
View File

@@ -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) { VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
image->from_ahb = true; image->from_ahb = true;
#ifdef ANDROID #ifdef ANDROID
image->vk.ahardware_buffer_format = image->vk.ahb_format = anv_ahb_format_for_vk_format(image->vk.format);
anv_ahb_format_for_vk_format(image->vk.format);
#endif #endif
return VK_SUCCESS; return VK_SUCCESS;
} }

3
src/intel/vulkan_hasvk/anv_image.c
View File

@@ -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) { VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) {
image->from_ahb = true; image->from_ahb = true;
#ifdef ANDROID #ifdef ANDROID
image->vk.ahardware_buffer_format = image->vk.ahb_format = anv_ahb_format_for_vk_format(image->vk.format);
anv_ahb_format_for_vk_format(image->vk.format);
#endif #endif
return VK_SUCCESS; return VK_SUCCESS;
} }

4
src/vulkan/runtime/vk_android.c
View File

@@ -115,11 +115,11 @@ vk_alloc_ahardware_buffer(const VkMemoryAllocateInfo *pAllocateInfo)
w = image->extent.width; w = image->extent.width;
h = image->extent.height; h = image->extent.height;
layers = image->array_layers; 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 /* TODO: This feels a bit sketchy. We should probably be taking the
* external format into account somehow. * external format into account somehow.
*/ */
format = image->ahardware_buffer_format; format = image->ahb_format;
usage = vk_image_usage_to_ahb_usage(image->create_flags, usage = vk_image_usage_to_ahb_usage(image->create_flags,
image->usage); image->usage);
} else if (dedicated_info && dedicated_info->buffer) { } else if (dedicated_info && dedicated_info->buffer) {

2
src/vulkan/runtime/vk_image.c
View File

@@ -100,7 +100,7 @@ vk_image_init(struct vk_device *device,
#endif #endif
#ifdef ANDROID #ifdef ANDROID
image->ahardware_buffer_format = 0; image->ahb_format = 0;
const VkExternalFormatANDROID *ext_format = const VkExternalFormatANDROID *ext_format =
vk_find_struct_const(pCreateInfo->pNext, EXTERNAL_FORMAT_ANDROID); vk_find_struct_const(pCreateInfo->pNext, EXTERNAL_FORMAT_ANDROID);

2
src/vulkan/runtime/vk_image.h
View File

@@ -81,7 +81,7 @@ struct vk_image {
* A default is provided by the Vulkan runtime code based on the VkFormat * A default is provided by the Vulkan runtime code based on the VkFormat
* but it may be overridden by the driver as needed. * but it may be overridden by the driver as needed.
*/ */
unsigned ahardware_buffer_format; uint32_t ahb_format;
#endif #endif
}; };
VK_DEFINE_NONDISP_HANDLE_CASTS(vk_image, base, VkImage, VK_DEFINE_NONDISP_HANDLE_CASTS(vk_image, base, VkImage,