mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-03 21:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comp: Use VK_NULL_HANDLE

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-10-07 23:27:09 +01:00
parent 1d9009a461
commit 0108207b3d
2 changed files with 13 additions and 10 deletions
src/xrt/compositor
common
comp_vk_swapchain.c
main
comp_swapchain.c

2
src/xrt/compositor/common/comp_vk_swapchain.c
View file

@ -433,7 +433,7 @@ void
vk_swapchain_cleanup(struct vk_swapchain *sc)
{
for (uint32_t i = 0; i < sc->image_count; i++) {
if (sc->buffers[i].view) {
if (sc->buffers[i].view != VK_NULL_HANDLE) {
sc->vk->vkDestroyImageView(sc->vk->device,
sc->buffers[i].view, NULL);
sc->buffers[i].view = VK_NULL_HANDLE;

21
src/xrt/compositor/main/comp_swapchain.c
View file

@ -311,27 +311,30 @@ comp_swapchain_image_cleanup(struct vk_bundle *vk,
{
if (image->views != NULL) {
for (uint32_t i = 0; i < array_size; ++i) {
if (image->views[i] != NULL) {
vk->vkDestroyImageView(vk->device,
image->views[i], NULL);
if (image->views[i] == VK_NULL_HANDLE) {
continue;
}
vk->vkDestroyImageView(vk->device, image->views[i],
NULL);
image->views[i] = VK_NULL_HANDLE;
}
free(image->views);
image->views = NULL;
}
if (image->sampler != NULL) {
if (image->sampler != VK_NULL_HANDLE) {
vk->vkDestroySampler(vk->device, image->sampler, NULL);
image->sampler = NULL;
image->sampler = VK_NULL_HANDLE;
}
if (image->image != NULL) {
if (image->image != VK_NULL_HANDLE) {
vk->vkDestroyImage(vk->device, image->image, NULL);
image->image = NULL;
image->image = VK_NULL_HANDLE;
}
if (image->memory != NULL) {
if (image->memory != VK_NULL_HANDLE) {
vk->vkFreeMemory(vk->device, image->memory, NULL);
image->memory = NULL;
image->memory = VK_NULL_HANDLE;
}
}