diff --git a/src/Refresh_Driver_Vulkan.c b/src/Refresh_Driver_Vulkan.c index f7a6022..0e2d247 100644 --- a/src/Refresh_Driver_Vulkan.c +++ b/src/Refresh_Driver_Vulkan.c @@ -751,6 +751,12 @@ typedef struct VulkanRenderTarget VkSampleCountFlags multisampleCount; } VulkanRenderTarget; +typedef struct VulkanFramebuffer +{ + VkFramebuffer framebuffer; + SDL_atomic_t referenceCount; +} VulkanFramebuffer; + typedef struct VulkanSwapchainData { /* Window surface */ @@ -769,9 +775,6 @@ typedef struct VulkanSwapchainData VulkanTexture *textures; uint32_t imageCount; - /* Recreate flag */ - uint8_t needsRecreate; - /* Synchronization primitives */ VkSemaphore imageAvailableSemaphore; VkSemaphore renderFinishedSemaphore; @@ -1051,7 +1054,7 @@ typedef struct FramebufferHash typedef struct FramebufferHashMap { FramebufferHash key; - VkFramebuffer value; + VulkanFramebuffer *value; } FramebufferHashMap; typedef struct FramebufferHashArray @@ -1103,7 +1106,7 @@ static inline uint8_t FramebufferHash_Compare( return 1; } -static inline VkFramebuffer FramebufferHashArray_Fetch( +static inline VulkanFramebuffer* FramebufferHashArray_Fetch( FramebufferHashArray *arr, FramebufferHash *key ) { @@ -1124,7 +1127,7 @@ static inline VkFramebuffer FramebufferHashArray_Fetch( static inline void FramebufferHashArray_Insert( FramebufferHashArray *arr, FramebufferHash key, - VkFramebuffer value + VulkanFramebuffer *value ) { FramebufferHashMap map; map.key = key; @@ -1520,6 +1523,10 @@ typedef struct VulkanCommandBuffer uint32_t usedComputePipelineCount; uint32_t usedComputePipelineCapacity; + VulkanFramebuffer **usedFramebuffers; + uint32_t usedFramebufferCount; + uint32_t usedFramebufferCapacity; + /* Shader modules have references tracked by pipelines */ VkFence inFlightFence; @@ -1697,6 +1704,10 @@ typedef struct VulkanRenderer uint32_t shaderModulesToDestroyCount; uint32_t shaderModulesToDestroyCapacity; + VulkanFramebuffer **framebuffersToDestroy; + uint32_t framebuffersToDestroyCount; + uint32_t framebuffersToDestroyCapacity; + SDL_mutex *allocatorLock; SDL_mutex *disposeLock; SDL_mutex *submitLock; @@ -2719,10 +2730,57 @@ static void VULKAN_INTERNAL_TrackComputePipeline( ) } +static void VULKAN_INTERNAL_TrackFramebuffer( + VulkanRenderer *renderer, + VulkanCommandBuffer *commandBuffer, + VulkanFramebuffer *framebuffer +) { + TRACK_RESOURCE( + framebuffer, + VulkanFramebuffer*, + usedFramebuffers, + usedFramebufferCount, + usedFramebufferCapacity + ); +} + #undef TRACK_RESOURCE /* Resource Disposal */ +static void VULKAN_INTERNAL_QueueDestroyFramebuffer( + VulkanRenderer *renderer, + VulkanFramebuffer *framebuffer +) { + SDL_LockMutex(renderer->disposeLock); + + EXPAND_ARRAY_IF_NEEDED( + renderer->framebuffersToDestroy, + VulkanFramebuffer*, + renderer->framebuffersToDestroyCount + 1, + renderer->framebuffersToDestroyCapacity, + renderer->framebuffersToDestroyCapacity * 2 + ) + + renderer->framebuffersToDestroy[renderer->framebuffersToDestroyCount] = framebuffer; + renderer->framebuffersToDestroyCount += 1; + + SDL_UnlockMutex(renderer->disposeLock); +} + +static void VULKAN_INTERNAL_DestroyFramebuffer( + VulkanRenderer *renderer, + VulkanFramebuffer *framebuffer +) { + renderer->vkDestroyFramebuffer( + renderer->logicalDevice, + framebuffer->framebuffer, + NULL + ); + + SDL_free(framebuffer); +} + static void VULKAN_INTERNAL_RemoveFramebuffersContainingView( VulkanRenderer *renderer, VkImageView view @@ -2740,10 +2798,9 @@ static void VULKAN_INTERNAL_RemoveFramebuffersContainingView( { if (hash->colorAttachmentViews[i] == view) { - renderer->vkDestroyFramebuffer( - renderer->logicalDevice, - renderer->framebufferHashArray.elements[i].value, - NULL + VULKAN_INTERNAL_QueueDestroyFramebuffer( + renderer, + renderer->framebufferHashArray.elements[i].value ); FramebufferHashArray_Remove( @@ -2945,6 +3002,7 @@ static void VULKAN_INTERNAL_DestroyCommandPool( SDL_free(commandBuffer->usedSamplers); SDL_free(commandBuffer->usedGraphicsPipelines); SDL_free(commandBuffer->usedComputePipelines); + SDL_free(commandBuffer->usedFramebuffers); SDL_free(commandBuffer); } @@ -4408,8 +4466,6 @@ static CreateSwapchainResult VULKAN_INTERNAL_CreateSwapchain( &swapchainData->renderFinishedSemaphore ); - swapchainData->needsRecreate = 0; - SDL_SetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA, swapchainData); if (renderer->swapchainDataCount >= renderer->swapchainDataCapacity) @@ -4684,10 +4740,9 @@ static void VULKAN_DestroyDevice( for (i = 0; i < renderer->framebufferHashArray.count; i += 1) { - renderer->vkDestroyFramebuffer( - renderer->logicalDevice, - renderer->framebufferHashArray.elements[i].value, - NULL + VULKAN_INTERNAL_DestroyFramebuffer( + renderer, + renderer->framebufferHashArray.elements[i].value ); } @@ -7779,7 +7834,7 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass( return renderPass; } -static VkFramebuffer VULKAN_INTERNAL_FetchFramebuffer( +static VulkanFramebuffer* VULKAN_INTERNAL_FetchFramebuffer( VulkanRenderer *renderer, VkRenderPass renderPass, Refresh_ColorAttachmentInfo *colorAttachmentInfos, @@ -7788,7 +7843,7 @@ static VkFramebuffer VULKAN_INTERNAL_FetchFramebuffer( uint32_t width, uint32_t height ) { - VkFramebuffer framebuffer; + VulkanFramebuffer *vulkanFramebuffer; VkFramebufferCreateInfo framebufferInfo; VkResult result; VkImageView imageViewAttachments[2 * MAX_COLOR_TARGET_BINDINGS + 1]; @@ -7850,17 +7905,21 @@ static VkFramebuffer VULKAN_INTERNAL_FetchFramebuffer( hash.width = width; hash.height = height; - framebuffer = FramebufferHashArray_Fetch( + vulkanFramebuffer = FramebufferHashArray_Fetch( &renderer->framebufferHashArray, &hash ); - if (framebuffer != VK_NULL_HANDLE) + if (vulkanFramebuffer != NULL) { SDL_UnlockMutex(renderer->framebufferFetchLock); - return framebuffer; + return vulkanFramebuffer; } + vulkanFramebuffer = SDL_malloc(sizeof(VulkanFramebuffer)); + + SDL_AtomicSet(&vulkanFramebuffer->referenceCount, 0); + /* Create a new framebuffer */ for (i = 0; i < colorAttachmentCount; i += 1) @@ -7918,7 +7977,7 @@ static VkFramebuffer VULKAN_INTERNAL_FetchFramebuffer( renderer->logicalDevice, &framebufferInfo, NULL, - &framebuffer + &vulkanFramebuffer->framebuffer ); if (result == VK_SUCCESS) @@ -7926,17 +7985,18 @@ static VkFramebuffer VULKAN_INTERNAL_FetchFramebuffer( FramebufferHashArray_Insert( &renderer->framebufferHashArray, hash, - framebuffer + vulkanFramebuffer ); } else { LogVulkanResultAsError("vkCreateFramebuffer", result); - framebuffer = VK_NULL_HANDLE; + SDL_free(vulkanFramebuffer); + vulkanFramebuffer = NULL; } SDL_UnlockMutex(renderer->framebufferFetchLock); - return framebuffer; + return vulkanFramebuffer; } static void VULKAN_INTERNAL_SetCurrentViewport( @@ -8028,7 +8088,7 @@ static void VULKAN_BeginRenderPass( VulkanRenderer* renderer = (VulkanRenderer*) driverData; VulkanCommandBuffer *vulkanCommandBuffer = (VulkanCommandBuffer*) commandBuffer; VkRenderPass renderPass; - VkFramebuffer framebuffer; + VulkanFramebuffer *framebuffer; VulkanTexture *texture; VkClearValue *clearValues; @@ -8095,6 +8155,8 @@ static void VULKAN_BeginRenderPass( framebufferHeight ); + VULKAN_INTERNAL_TrackFramebuffer(renderer, vulkanCommandBuffer, framebuffer); + /* Layout transitions */ for (i = 0; i < colorAttachmentCount; i += 1) @@ -8169,8 +8231,8 @@ static void VULKAN_BeginRenderPass( VkRenderPassBeginInfo renderPassBeginInfo; renderPassBeginInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; renderPassBeginInfo.pNext = NULL; - renderPassBeginInfo.renderPass = (VkRenderPass) renderPass; - renderPassBeginInfo.framebuffer = framebuffer; + renderPassBeginInfo.renderPass = renderPass; + renderPassBeginInfo.framebuffer = framebuffer->framebuffer; renderPassBeginInfo.renderArea.extent.width = renderArea->w; renderPassBeginInfo.renderArea.extent.height = renderArea->h; renderPassBeginInfo.renderArea.offset.x = renderArea->x; @@ -8715,6 +8777,12 @@ static void VULKAN_INTERNAL_AllocateCommandBuffers( commandBuffer->usedComputePipelineCapacity * sizeof(VulkanComputePipeline*) ); + commandBuffer->usedFramebufferCapacity = 4; + commandBuffer->usedFramebufferCount = 0; + commandBuffer->usedFramebuffers = SDL_malloc( + commandBuffer->usedFramebufferCapacity * sizeof(VulkanFramebuffer*) + ); + vulkanCommandPool->inactiveCommandBuffers[ vulkanCommandPool->inactiveCommandBufferCount ] = commandBuffer; @@ -8913,7 +8981,22 @@ static Refresh_Texture* VULKAN_AcquireSwapchainTexture( &swapchainImageIndex ); - if (acquireResult == VK_SUCCESS || acquireResult == VK_SUBOPTIMAL_KHR) + /* Swapchain is suboptimal, let's try to recreate */ + if (acquireResult == VK_SUBOPTIMAL_KHR) + { + VULKAN_INTERNAL_RecreateSwapchain(renderer, windowHandle); + + acquireResult = renderer->vkAcquireNextImageKHR( + renderer->logicalDevice, + swapchainData->swapchain, + UINT64_MAX, + swapchainData->imageAvailableSemaphore, + VK_NULL_HANDLE, + &swapchainImageIndex + ); + } + + if (acquireResult == VK_SUCCESS) { swapchainTexture = &swapchainData->textures[swapchainImageIndex]; @@ -8973,11 +9056,6 @@ static Refresh_Texture* VULKAN_AcquireSwapchainTexture( vulkanCommandBuffer->signalSemaphores[vulkanCommandBuffer->signalSemaphoreCount] = swapchainData->renderFinishedSemaphore; vulkanCommandBuffer->signalSemaphoreCount += 1; - - if (acquireResult == VK_SUBOPTIMAL_KHR) - { - swapchainData->needsRecreate = 1; - } } } @@ -9104,6 +9182,20 @@ static void VULKAN_INTERNAL_PerformPendingDestroys( } } + for (i = renderer->framebuffersToDestroyCount - 1; i >= 0; i -= 1) + { + if (SDL_AtomicGet(&renderer->framebuffersToDestroy[i]->referenceCount) == 0) + { + VULKAN_INTERNAL_DestroyFramebuffer( + renderer, + renderer->framebuffersToDestroy[i] + ); + + renderer->framebuffersToDestroy[i] = renderer->framebuffersToDestroy[renderer->framebuffersToDestroyCount - 1]; + renderer->framebuffersToDestroyCount -= 1; + } + } + SDL_UnlockMutex(renderer->disposeLock); } @@ -9217,6 +9309,12 @@ static void VULKAN_INTERNAL_CleanCommandBuffer( } commandBuffer->usedComputePipelineCount = 0; + for (i = 0; i < commandBuffer->usedFramebufferCount; i += 1) + { + SDL_AtomicDecRef(&commandBuffer->usedFramebuffers[i]->referenceCount); + } + commandBuffer->usedFramebufferCount = 0; + /* Return command buffer to pool */ SDL_LockMutex(renderer->acquireCommandBufferLock); @@ -9378,7 +9476,7 @@ static void VULKAN_Submit( &presentInfo ); - if (presentResult != VK_SUCCESS || presentData->swapchainData->needsRecreate) + if (presentResult != VK_SUCCESS) { VULKAN_INTERNAL_RecreateSwapchain(renderer, presentData->swapchainData->windowHandle); } @@ -10624,6 +10722,13 @@ static Refresh_Device* VULKAN_CreateDevice( renderer->shaderModulesToDestroyCapacity ); + renderer->framebuffersToDestroyCapacity = 16; + renderer->framebuffersToDestroyCount = 0; + renderer->framebuffersToDestroy = SDL_malloc( + sizeof(VulkanFramebuffer*) * + renderer->framebuffersToDestroyCapacity + ); + return result; }