fix some sync hazards
parent
b5dcddea49
commit
39b97dec27
|
|
@ -1,4 +1,4 @@
|
|||
/* Refresh - XNA-inspired 3D Graphics Library with modern capabilities
|
||||
/* Refresh - XNA-inspired 3D Graphics Library with modern capabilities
|
||||
*
|
||||
* Copyright (c) 2020 Evan Hemsley
|
||||
*
|
||||
|
|
@ -561,8 +561,8 @@ static const VulkanResourceAccessInfo AccessMap[RESOURCE_ACCESS_TYPES_COUNT] =
|
|||
|
||||
/* RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE */
|
||||
{
|
||||
VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
|
||||
VK_ACCESS_SHADER_READ_BIT,
|
||||
VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
|
||||
VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
|
||||
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
|
||||
},
|
||||
|
||||
|
|
@ -1015,6 +1015,7 @@ typedef struct RenderPassHash
|
|||
uint32_t colorAttachmentCount;
|
||||
RenderPassDepthStencilTargetDescription depthStencilTargetDescription;
|
||||
Refresh_SampleCount colorAttachmentSampleCount;
|
||||
VkImageLayout finalLayout;
|
||||
} RenderPassHash;
|
||||
|
||||
typedef struct RenderPassHashMap
|
||||
|
|
@ -1046,6 +1047,11 @@ static inline uint8_t RenderPassHash_Compare(
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (a->finalLayout != b->finalLayout)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < a->colorAttachmentCount; i += 1)
|
||||
{
|
||||
if (a->colorTargetDescriptions[i].format != b->colorTargetDescriptions[i].format)
|
||||
|
|
@ -5955,6 +5961,41 @@ static VulkanRenderTarget* VULKAN_INTERNAL_FetchRenderTarget(
|
|||
return renderTarget;
|
||||
}
|
||||
|
||||
static VkImageLayout VULKAN_INTERNAL_GetRenderPassFinalLayout(
|
||||
VulkanTexture *texture
|
||||
) {
|
||||
VkImageLayout finalLayout;
|
||||
|
||||
if (IsDepthFormat(texture->format))
|
||||
{
|
||||
if (texture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||
}
|
||||
else
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (texture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||
}
|
||||
else if (texture->usageFlags & VK_IMAGE_USAGE_STORAGE_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_GENERAL;
|
||||
}
|
||||
else
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
|
||||
}
|
||||
}
|
||||
|
||||
return finalLayout;
|
||||
}
|
||||
|
||||
static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
||||
VulkanRenderer *renderer,
|
||||
VulkanCommandBuffer *commandBuffer,
|
||||
|
|
@ -5969,7 +6010,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
VkAttachmentReference depthStencilAttachmentReference;
|
||||
VkRenderPassCreateInfo renderPassCreateInfo;
|
||||
VkSubpassDescription subpass;
|
||||
VkImageLayout finalLayout;
|
||||
VkSubpassDependency dep[2];
|
||||
VkRenderPass renderPass;
|
||||
uint32_t i;
|
||||
|
||||
|
|
@ -5984,19 +6025,6 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
{
|
||||
texture = ((VulkanTextureContainer*) colorAttachmentInfos[i].texture)->vulkanTexture;
|
||||
|
||||
if (texture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||
}
|
||||
else if (texture->usageFlags & VK_IMAGE_USAGE_STORAGE_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_GENERAL;
|
||||
}
|
||||
else
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
|
||||
}
|
||||
|
||||
if (texture->msaaTex != NULL)
|
||||
{
|
||||
msaaTexture = texture->msaaTex;
|
||||
|
|
@ -6035,7 +6063,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
attachmentDescriptions[attachmentDescriptionCount].initialLayout =
|
||||
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
|
||||
attachmentDescriptions[attachmentDescriptionCount].finalLayout =
|
||||
finalLayout;
|
||||
VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
|
||||
|
||||
resolveReferences[resolveReferenceCount].attachment =
|
||||
attachmentDescriptionCount;
|
||||
|
|
@ -6091,8 +6119,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
attachmentDescriptions[attachmentDescriptionCount].initialLayout =
|
||||
VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
|
||||
attachmentDescriptions[attachmentDescriptionCount].finalLayout =
|
||||
finalLayout;
|
||||
|
||||
VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
|
||||
|
||||
colorAttachmentReferences[colorAttachmentReferenceCount].attachment = attachmentDescriptionCount;
|
||||
colorAttachmentReferences[colorAttachmentReferenceCount].layout =
|
||||
|
|
@ -6120,15 +6147,6 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
{
|
||||
texture = ((VulkanTextureContainer*) depthStencilAttachmentInfo->texture)->vulkanTexture;
|
||||
|
||||
if (texture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||
}
|
||||
else
|
||||
{
|
||||
finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
|
||||
}
|
||||
|
||||
attachmentDescriptions[attachmentDescriptionCount].flags = 0;
|
||||
attachmentDescriptions[attachmentDescriptionCount].format = texture->format;
|
||||
attachmentDescriptions[attachmentDescriptionCount].samples = RefreshToVK_SampleCount[
|
||||
|
|
@ -6149,7 +6167,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
attachmentDescriptions[attachmentDescriptionCount].initialLayout =
|
||||
VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
|
||||
attachmentDescriptions[attachmentDescriptionCount].finalLayout =
|
||||
finalLayout;
|
||||
VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
|
||||
|
||||
depthStencilAttachmentReference.attachment =
|
||||
attachmentDescriptionCount;
|
||||
|
|
@ -6171,6 +6189,37 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
subpass.pResolveAttachments = NULL;
|
||||
}
|
||||
|
||||
const VkPipelineStageFlags graphicsStages = 0
|
||||
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
|
||||
| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
|
||||
| VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
|
||||
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT
|
||||
| VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT
|
||||
;
|
||||
const VkPipelineStageFlags outsideStages = 0
|
||||
| graphicsStages
|
||||
| VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_TRANSFER_BIT
|
||||
;
|
||||
|
||||
dep[0].srcSubpass = VK_SUBPASS_EXTERNAL;
|
||||
dep[0].dstSubpass = 0;
|
||||
dep[0].srcStageMask = outsideStages;
|
||||
dep[0].dstStageMask = graphicsStages;
|
||||
dep[0].srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[0].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[0].dependencyFlags = 0;
|
||||
|
||||
dep[1].srcSubpass = 0;
|
||||
dep[1].dstSubpass = VK_SUBPASS_EXTERNAL;
|
||||
dep[1].srcStageMask = graphicsStages;
|
||||
dep[1].dstStageMask = outsideStages;
|
||||
dep[1].srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[1].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[1].dependencyFlags = 0;
|
||||
|
||||
renderPassCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
||||
renderPassCreateInfo.pNext = NULL;
|
||||
renderPassCreateInfo.flags = 0;
|
||||
|
|
@ -6178,8 +6227,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
|
|||
renderPassCreateInfo.attachmentCount = attachmentDescriptionCount;
|
||||
renderPassCreateInfo.subpassCount = 1;
|
||||
renderPassCreateInfo.pSubpasses = &subpass;
|
||||
renderPassCreateInfo.dependencyCount = 0;
|
||||
renderPassCreateInfo.pDependencies = NULL;
|
||||
renderPassCreateInfo.dependencyCount = 2;
|
||||
renderPassCreateInfo.pDependencies = dep;
|
||||
|
||||
vulkanResult = renderer->vkCreateRenderPass(
|
||||
renderer->logicalDevice,
|
||||
|
|
@ -6208,6 +6257,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
|
|||
VkAttachmentReference depthStencilAttachmentReference;
|
||||
Refresh_ColorAttachmentDescription attachmentDescription;
|
||||
VkSubpassDescription subpass;
|
||||
VkSubpassDependency dep[2];
|
||||
VkRenderPassCreateInfo renderPassCreateInfo;
|
||||
VkRenderPass renderPass;
|
||||
VkResult result;
|
||||
|
|
@ -6218,7 +6268,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
|
|||
uint32_t resolveReferenceCount = 0;
|
||||
uint32_t i;
|
||||
|
||||
/* Note: Render pass compatibility does not compare about layout */
|
||||
/* Note: Render pass compatibility does not care about layout */
|
||||
for (i = 0; i < attachmentInfo.colorAttachmentCount; i += 1)
|
||||
{
|
||||
attachmentDescription = attachmentInfo.colorAttachmentDescriptions[i];
|
||||
|
|
@ -6352,6 +6402,37 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
|
|||
subpass.pResolveAttachments = NULL;
|
||||
}
|
||||
|
||||
const VkPipelineStageFlags graphicsStages = 0
|
||||
| VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT
|
||||
| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT
|
||||
| VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT
|
||||
| VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT
|
||||
| VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT
|
||||
;
|
||||
const VkPipelineStageFlags outsideStages = 0
|
||||
| graphicsStages
|
||||
| VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT
|
||||
| VK_PIPELINE_STAGE_TRANSFER_BIT
|
||||
;
|
||||
|
||||
dep[0].srcSubpass = VK_SUBPASS_EXTERNAL;
|
||||
dep[0].dstSubpass = 0;
|
||||
dep[0].srcStageMask = outsideStages;
|
||||
dep[0].dstStageMask = graphicsStages;
|
||||
dep[0].srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[0].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[0].dependencyFlags = 0;
|
||||
|
||||
dep[1].srcSubpass = 0;
|
||||
dep[1].dstSubpass = VK_SUBPASS_EXTERNAL;
|
||||
dep[1].srcStageMask = graphicsStages;
|
||||
dep[1].dstStageMask = outsideStages;
|
||||
dep[1].srcAccessMask = VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[1].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT;
|
||||
dep[1].dependencyFlags = 0;
|
||||
|
||||
renderPassCreateInfo.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
||||
renderPassCreateInfo.pNext = NULL;
|
||||
renderPassCreateInfo.flags = 0;
|
||||
|
|
@ -6359,8 +6440,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
|
|||
renderPassCreateInfo.attachmentCount = attachmentDescriptionCount;
|
||||
renderPassCreateInfo.subpassCount = 1;
|
||||
renderPassCreateInfo.pSubpasses = &subpass;
|
||||
renderPassCreateInfo.dependencyCount = 0;
|
||||
renderPassCreateInfo.pDependencies = NULL;
|
||||
renderPassCreateInfo.dependencyCount = 2;
|
||||
renderPassCreateInfo.pDependencies = dep;
|
||||
|
||||
result = renderer->vkCreateRenderPass(
|
||||
renderer->logicalDevice,
|
||||
|
|
@ -8505,6 +8586,8 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(
|
|||
hash.depthStencilTargetDescription.stencilStoreOp = depthStencilAttachmentInfo->stencilStoreOp;
|
||||
}
|
||||
|
||||
hash.finalLayout = VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
|
||||
|
||||
renderPass = RenderPassHashArray_Fetch(
|
||||
&renderer->renderPassHashArray,
|
||||
&hash
|
||||
|
|
|
|||
Loading…
Reference in New Issue