fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pvr: refactor image initialization with helper functions

Browse source 
Extract image initialization & cleanup logic into reusable helper functions.

- Create pvr_image_init() and pvr_image_fini() for refactoring
- Refactor pvr_CreateImage(), pvr_CreateBuffer()

Signed-off-by: Leon Perianu <leon.perianu@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39776>
This commit is contained in:
Leon Perianu 2026-01-27 14:33:42 +02:00 • committed by Marge Bot
parent bf3b011919
commit f0b7e2c1ea
2 changed files with 38 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/imagination/vulkan/pvr_image.c
View file

@ -270,10 +270,6 @@ VkResult pvr_CreateImage(VkDevice _device,
{ {
VK_FROM_HANDLE(pvr_device, device, _device); VK_FROM_HANDLE(pvr_device, device, _device);
struct pvr_image *image; struct pvr_image *image;
uint64_t modifier = DRM_FORMAT_MOD_INVALID;
VkResult res;
unsigned pbe_stride_align = get_pbe_stride_align(&device->pdevice->dev_info);
if (wsi_common_is_swapchain_image(pCreateInfo)) { if (wsi_common_is_swapchain_image(pCreateInfo)) {
return wsi_common_create_swapchain_image(&device->pdevice->wsi_device, return wsi_common_create_swapchain_image(&device->pdevice->wsi_device,
@ -281,32 +277,12 @@ VkResult pvr_CreateImage(VkDevice _device,
pImage); pImage);
} }
if (pCreateInfo->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
res = pvr_pick_modifier(pCreateInfo, pbe_stride_align,
&modifier);
if (res != VK_SUCCESS)
return vk_error(device, res);
assert(modifier == DRM_FORMAT_MOD_LINEAR);
}
image = image =
vk_image_create(&device->vk, pCreateInfo, pAllocator, sizeof(*image)); vk_image_create(&device->vk, pCreateInfo, pAllocator, sizeof(*image));
if (!image) if (!image)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) { pvr_image_init(device, pCreateInfo, image);
image->vk.drm_format_mod = modifier;
}
image->alignment = device->pdevice->ws->page_size;
image->plane_count = vk_format_get_plane_count(image->vk.format);
/* Initialize the image using the saved information from pCreateInfo */
pvr_image_init_memlayout(image);
pvr_image_init_physical_extent(image, pCreateInfo, pbe_stride_align);
pvr_image_setup_mip_levels(image);
*pImage = pvr_image_to_handle(image); *pImage = pvr_image_to_handle(image);
@ -323,10 +299,38 @@ void pvr_DestroyImage(VkDevice _device,
if (!image) if (!image)
return; return;
pvr_image_fini(device, image);
vk_image_destroy(&device->vk, pAllocator, &image->vk);
}
void pvr_image_init(struct pvr_device *device,
const VkImageCreateInfo *pCreateInfo,
struct pvr_image *image)
{
unsigned pbe_stride_align = get_pbe_stride_align(&device->pdevice->dev_info);
image->plane_count = vk_format_get_plane_count(image->vk.format);
image->alignment = device->pdevice->ws->page_size;
if (pCreateInfo->tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) {
VkResult res = pvr_pick_modifier(pCreateInfo,
pbe_stride_align,
&image->vk.drm_format_mod);
if (res != VK_SUCCESS)
assert(res == VK_SUCCESS);
assert(image->vk.drm_format_mod == DRM_FORMAT_MOD_LINEAR);
}
pvr_image_init_memlayout(image);
pvr_image_init_physical_extent(image, pCreateInfo, pbe_stride_align);
pvr_image_setup_mip_levels(image);
}
void pvr_image_fini(struct pvr_device *device, struct pvr_image *image)
{
if (image->vma) if (image->vma)
pvr_unbind_memory(device, image->vma); pvr_unbind_memory(device, image->vma);
vk_image_destroy(&device->vk, pAllocator, &image->vk);
} }
/* clang-format off */ /* clang-format off */

7
src/imagination/vulkan/pvr_image.h
View file

@ -23,6 +23,8 @@
#define PVR_MAX_PLANE_COUNT 3 #define PVR_MAX_PLANE_COUNT 3
struct pvr_device;
struct pvr_mip_level { struct pvr_mip_level {
/* Offset of the mip level in bytes */ /* Offset of the mip level in bytes */
uint32_t offset; uint32_t offset;
@ -167,4 +169,9 @@ void pvr_get_image_subresource_layout(const struct pvr_image *image,
const VkImageSubresource *subresource, const VkImageSubresource *subresource,
VkSubresourceLayout *layout); VkSubresourceLayout *layout);
void pvr_image_init(struct pvr_device *device,
const VkImageCreateInfo *pCreateInfo,
struct pvr_image *image);
void pvr_image_fini(struct pvr_device *device, struct pvr_image *image);
#endif /* PVR_IMAGE_H */ #endif /* PVR_IMAGE_H */