mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/util: Re-order functions in comp_swapchain.c [NFC]

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-11-16 14:36:32 +00:00 committed by Rylie Pavlik
parent ab3c7e99ff
commit 580ff4ceb8
1 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/xrt/compositor/util/comp_swapchain.c
View file

@ -244,6 +244,49 @@ set_common_fields(struct comp_swapchain *sc,
return sc; return sc;
} }
static void
image_view_array_cleanup(struct vk_bundle *vk, size_t array_size, VkImageView **views_ptr)
{
VkImageView *views = *views_ptr;
if (views == NULL) {
return;
}
for (uint32_t i = 0; i < array_size; ++i) {
if (views[i] == VK_NULL_HANDLE) {
continue;
}
D(ImageView, views[i]);
}
free(views);
array_size = 0;
*views_ptr = NULL;
}
/*!
* Free and destroy any initialized fields on the given image, safe to pass in
* images that has one or all fields set to NULL.
*/
static void
image_cleanup(struct vk_bundle *vk, struct comp_swapchain_image *image)
{
/*
* This makes sure that any pending command buffer has completed and all
* resources referred by it can now be manipulated. This make sure that
* validation doesn't complain. This is done during image destruction so
* isn't time critical.
*/
os_mutex_lock(&vk->queue_mutex);
vk->vkDeviceWaitIdle(vk->device);
os_mutex_unlock(&vk->queue_mutex);
image_view_array_cleanup(vk, image->array_size, &image->views.alpha);
image_view_array_cleanup(vk, image->array_size, &image->views.no_alpha);
}
static void static void
do_post_create_vulkan_setup(struct vk_bundle *vk, do_post_create_vulkan_setup(struct vk_bundle *vk,
const struct xrt_swapchain_create_info *info, const struct xrt_swapchain_create_info *info,
@ -384,49 +427,6 @@ do_post_create_vulkan_setup(struct vk_bundle *vk,
} }
} }
static void
clean_image_views(struct vk_bundle *vk, size_t array_size, VkImageView **views_ptr)
{
VkImageView *views = *views_ptr;
if (views == NULL) {
return;
}
for (uint32_t i = 0; i < array_size; ++i) {
if (views[i] == VK_NULL_HANDLE) {
continue;
}
D(ImageView, views[i]);
}
free(views);
array_size = 0;
*views_ptr = NULL;
}
/*!
* Free and destroy any initialized fields on the given image, safe to pass in
* images that has one or all fields set to NULL.
*/
static void
image_cleanup(struct vk_bundle *vk, struct comp_swapchain_image *image)
{
/*
* This makes sure that any pending command buffer has completed and all
* resources referred by it can now be manipulated. This make sure that
* validation doesn't complain. This is done during image destruction so
* isn't time critical.
*/
os_mutex_lock(&vk->queue_mutex);
vk->vkDeviceWaitIdle(vk->device);
os_mutex_unlock(&vk->queue_mutex);
clean_image_views(vk, image->array_size, &image->views.alpha);
clean_image_views(vk, image->array_size, &image->views.no_alpha);
}
/*! /*!
* Swapchain destruct is delayed until it is safe to destroy them, this function * Swapchain destruct is delayed until it is safe to destroy them, this function
* does the actual destruction and is called from @ref * does the actual destruction and is called from @ref