yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-02-17 01:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

ref_vk: Fix shutdown code

Browse source
This commit is contained in:
Denis Pauk 2020-01-18 16:09:28 +02:00 committed by Yamagi
parent a71eae8b88
commit eefcec35e9
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/client/refresh/vk/vk_common.c
View file

@ -1458,11 +1458,14 @@ void QVk_Shutdown( void )
vk_swapchain.images = NULL;
vk_swapchain.imageCount = 0;
}
for (int i = 0; i < NUM_CMDBUFFERS; ++i)
if (vk_device.logical != VK_NULL_HANDLE)
{
vkDestroySemaphore(vk_device.logical, vk_imageAvailableSemaphores[i], NULL);
vkDestroySemaphore(vk_device.logical, vk_renderFinishedSemaphores[i], NULL);
vkDestroyFence(vk_device.logical, vk_fences[i], NULL);
for (int i = 0; i < NUM_CMDBUFFERS; ++i)
{
vkDestroySemaphore(vk_device.logical, vk_imageAvailableSemaphores[i], NULL);
vkDestroySemaphore(vk_device.logical, vk_renderFinishedSemaphores[i], NULL);
vkDestroyFence(vk_device.logical, vk_fences[i], NULL);
}
}
if (vk_malloc != VK_NULL_HANDLE)
vmaDestroyAllocator(vk_malloc);
@ -1626,7 +1629,10 @@ qboolean QVk_Init()
R_Printf(PRINT_ALL, "...created Vulkan surface\n");
// create Vulkan device - see if the user prefers any specific device if there's more than one GPU in the system
QVk_CreateDevice((int)vk_device_idx->value);
if (!QVk_CreateDevice((int)vk_device_idx->value))
{
return false;
}
QVk_DebugSetObjectName((uint64_t)vk_device.physical, VK_OBJECT_TYPE_PHYSICAL_DEVICE, va("Physical Device: %s", vk_config.vendor_name));
// create memory allocator

5
src/client/refresh/vk/vk_image.c
View file

@ -447,7 +447,10 @@ void QVk_UpdateTextureData(qvktexture_t *texture, const unsigned char *data, uin
void QVk_ReleaseTexture(qvktexture_t *texture)
{
QVk_SubmitStagingBuffers();
vkDeviceWaitIdle(vk_device.logical);
if (vk_device.logical != VK_NULL_HANDLE)
{
vkDeviceWaitIdle(vk_device.logical);
}
if (texture->image != VK_NULL_HANDLE)
vmaDestroyImage(vk_malloc, texture->image, texture->allocation);

5
src/client/refresh/vk/vk_rmain.c
View file

@ -1245,7 +1245,10 @@ void R_Shutdown (void)
ri.Cmd_RemoveCommand("imagelist");
ri.Cmd_RemoveCommand("screenshot");
vkDeviceWaitIdle(vk_device.logical);
if (vk_device.logical != VK_NULL_HANDLE)
{
vkDeviceWaitIdle(vk_device.logical);
}
Mod_FreeAll();
Vk_ShutdownImages();