TheSpydog
/
Refresh
forked from MoonsideGames/Refresh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc fixes

submit_rewrite
cosmonaut 2020-12-21 18:34:57 -08:00
parent bab86149c9
commit 8752ed4391
1 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Refresh_Driver_Vulkan.c
View File

@ -2202,6 +2202,24 @@ static void VULKAN_INTERNAL_BeginCommandBuffer(VulkanRenderer *renderer)
} }
} }
static void VULKAN_INTERNAL_EndCommandBuffer(
VulkanRenderer* renderer
) {
VkResult result;
result = renderer->vkEndCommandBuffer(
renderer->currentCommandBuffer
);
if (result != VK_SUCCESS)
{
LogVulkanResult("vkEndCommandBuffer", result);
}
renderer->currentCommandBuffer = NULL;
renderer->numActiveCommands = 0;
}
/* Public API */ /* Public API */
static void VULKAN_DestroyDevice( static void VULKAN_DestroyDevice(
@ -2353,6 +2371,7 @@ static REFRESH_RenderPass* VULKAN_CreateRenderPass(
VkSubpassDescription subpass; VkSubpassDescription subpass;
VkRenderPass renderPass; VkRenderPass renderPass;
uint32_t i; uint32_t i;
uint8_t multisampling = 0;
uint32_t attachmentDescriptionCount = 0; uint32_t attachmentDescriptionCount = 0;
uint32_t colorAttachmentReferenceCount = 0; uint32_t colorAttachmentReferenceCount = 0;
@ -2362,6 +2381,8 @@ static REFRESH_RenderPass* VULKAN_CreateRenderPass(
{ {
if (renderPassCreateInfo->colorTargetDescriptions[attachmentDescriptionCount].multisampleCount > REFRESH_SAMPLECOUNT_1) if (renderPassCreateInfo->colorTargetDescriptions[attachmentDescriptionCount].multisampleCount > REFRESH_SAMPLECOUNT_1)
{ {
multisampling = 1;
/* Resolve attachment and multisample attachment */ /* Resolve attachment and multisample attachment */
attachmentDescriptions[attachmentDescriptionCount].flags = 0; attachmentDescriptions[attachmentDescriptionCount].flags = 0;
@ -2505,6 +2526,15 @@ static REFRESH_RenderPass* VULKAN_CreateRenderPass(
attachmentDescriptionCount += 1; attachmentDescriptionCount += 1;
} }
if (multisampling)
{
subpass.pResolveAttachments = resolveReferences;
}
else
{
subpass.pResolveAttachments = NULL;
}
vkRenderPassCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; vkRenderPassCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
vkRenderPassCreateInfo.pNext = NULL; vkRenderPassCreateInfo.pNext = NULL;
vkRenderPassCreateInfo.flags = 0; vkRenderPassCreateInfo.flags = 0;
@ -4592,10 +4622,10 @@ static void VULKAN_BeginRenderPass(
for (i = 0; i < colorClearCount; i += 1) for (i = 0; i < colorClearCount; i += 1)
{ {
clearValues[i].color.uint32[0] = pColorClearValues[i].r; clearValues[i].color.float32[0] = pColorClearValues[i].r / 256.0f;
clearValues[i].color.uint32[1] = pColorClearValues[i].g; clearValues[i].color.float32[1] = pColorClearValues[i].g / 256.0f;
clearValues[i].color.uint32[2] = pColorClearValues[i].b; clearValues[i].color.float32[2] = pColorClearValues[i].b / 256.0f;
clearValues[i].color.uint32[3] = pColorClearValues[i].a; clearValues[i].color.float32[3] = pColorClearValues[i].a / 256.0f;
} }
if (depthStencilClearValue != NULL) if (depthStencilClearValue != NULL)
@ -4896,6 +4926,17 @@ static void VULKAN_Submit(
present = !renderer->headless && renderer->shouldPresent; present = !renderer->headless && renderer->shouldPresent;
if (renderer->activeCommandBufferCount <= 1 && renderer->numActiveCommands == 0)
{
/* No commands recorded, bailing out */
return;
}
if (renderer->currentCommandBuffer != NULL)
{
VULKAN_INTERNAL_EndCommandBuffer(renderer);
}
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submitInfo.pNext = NULL; submitInfo.pNext = NULL;
submitInfo.commandBufferCount = renderer->activeCommandBufferCount; submitInfo.commandBufferCount = renderer->activeCommandBufferCount;