Revert "Fix potential sync hazards (#49)"

This reverts commit 20636ec951.
2024-01-15 21:38:37 -08:00 · 2024-01-15 21:38:37 -08:00 · 55c77def69
parent 2634359b48
commit 55c77def69
1 changed files with 59 additions and 141 deletions
--- a/src/Refresh_Driver_Vulkan.c
+++ b/src/Refresh_Driver_Vulkan.c
@ -561,8 +561,8 @@ static const VulkanResourceAccessInfo AccessMap[RESOURCE_ACCESS_TYPES_COUNT] =

 	/* RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE */
 	{
-		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_PIPELINE_STAGE_ALL_COMMANDS_BIT,
+		VK_ACCESS_SHADER_READ_BIT,
 		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
 	},

@ -998,7 +998,6 @@ typedef struct RenderPassColorTargetDescription
 	Refresh_Vec4 clearColor;
 	Refresh_LoadOp loadOp;
 	Refresh_StoreOp storeOp;
-	VkImageLayout finalLayout;
 } RenderPassColorTargetDescription;

 typedef struct RenderPassDepthStencilTargetDescription
@ -1008,7 +1007,6 @@ typedef struct RenderPassDepthStencilTargetDescription
 	Refresh_StoreOp storeOp;
 	Refresh_LoadOp stencilLoadOp;
 	Refresh_StoreOp stencilStoreOp;
-	VkImageLayout finalLayout;
 } RenderPassDepthStencilTargetDescription;

 typedef struct RenderPassHash
@ -1072,11 +1070,6 @@ static inline uint8_t RenderPassHash_Compare(
 		{
 			return 0;
 		}
-
-		if (a->colorTargetDescriptions[i].finalLayout != b->colorTargetDescriptions[i].finalLayout)
-		{
-			return 0;
-		}
 	}

 	if (a->depthStencilTargetDescription.format != b->depthStencilTargetDescription.format)
@ -1104,11 +1097,6 @@ static inline uint8_t RenderPassHash_Compare(
 		return 0;
 	}

-	if (a->depthStencilTargetDescription.finalLayout != b->depthStencilTargetDescription.finalLayout)
-	{
-		return 0;
-	}
-
 	return 1;
 }

@ -4307,18 +4295,22 @@ static uint8_t VULKAN_INTERNAL_CreateUniformBuffer(
 	VulkanRenderer *renderer,
 	VulkanUniformBufferPool *bufferPool
 ) {
+	VulkanResourceAccessType resourceAccessType;
 	VkDescriptorSetLayout descriptorSetLayout;

 	if (bufferPool->type == UNIFORM_BUFFER_VERTEX)
 	{
+		resourceAccessType = RESOURCE_ACCESS_VERTEX_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->vertexUniformDescriptorSetLayout;
 	}
 	else if (bufferPool->type == UNIFORM_BUFFER_FRAGMENT)
 	{
+		resourceAccessType = RESOURCE_ACCESS_FRAGMENT_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->fragmentUniformDescriptorSetLayout;
 	}
 	else if (bufferPool->type == UNIFORM_BUFFER_COMPUTE)
 	{
+		resourceAccessType = RESOURCE_ACCESS_COMPUTE_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->computeUniformDescriptorSetLayout;
 	}
 	else
@ -4388,20 +4380,24 @@ static VulkanUniformBuffer* VULKAN_INTERNAL_CreateDummyUniformBuffer(
 	VulkanRenderer *renderer,
 	VulkanUniformBufferType uniformBufferType
 ) {
+	VulkanResourceAccessType resourceAccessType;
 	VkDescriptorSetLayout descriptorSetLayout;
 	VkWriteDescriptorSet writeDescriptorSet;
 	VkDescriptorBufferInfo descriptorBufferInfo;

 	if (uniformBufferType == UNIFORM_BUFFER_VERTEX)
 	{
+		resourceAccessType = RESOURCE_ACCESS_VERTEX_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->vertexUniformDescriptorSetLayout;
 	}
 	else if (uniformBufferType == UNIFORM_BUFFER_FRAGMENT)
 	{
+		resourceAccessType = RESOURCE_ACCESS_FRAGMENT_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->fragmentUniformDescriptorSetLayout;
 	}
 	else if (uniformBufferType == UNIFORM_BUFFER_COMPUTE)
 	{
+		resourceAccessType = RESOURCE_ACCESS_COMPUTE_SHADER_READ_UNIFORM_BUFFER;
 		descriptorSetLayout = renderer->computeUniformDescriptorSetLayout;
 	}
 	else
@ -5946,41 +5942,6 @@ 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,
@ -5995,7 +5956,6 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
 	VkAttachmentReference depthStencilAttachmentReference;
 	VkRenderPassCreateInfo renderPassCreateInfo;
 	VkSubpassDescription subpass;
-	VkSubpassDependency dep[2];
 	VkRenderPass renderPass;
 	uint32_t i;

@ -6048,7 +6008,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
 			attachmentDescriptions[attachmentDescriptionCount].initialLayout =
 				VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 			attachmentDescriptions[attachmentDescriptionCount].finalLayout =
-				VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
+				VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;

 			resolveReferences[resolveReferenceCount].attachment =
 				attachmentDescriptionCount;
@ -6104,7 +6064,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
 			attachmentDescriptions[attachmentDescriptionCount].initialLayout =
 				VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 			attachmentDescriptions[attachmentDescriptionCount].finalLayout =
-				VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
+				VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+

 			colorAttachmentReferences[colorAttachmentReferenceCount].attachment = attachmentDescriptionCount;
 			colorAttachmentReferences[colorAttachmentReferenceCount].layout =
@ -6152,7 +6113,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
 		attachmentDescriptions[attachmentDescriptionCount].initialLayout =
 			VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 		attachmentDescriptions[attachmentDescriptionCount].finalLayout =
-			VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
+			VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;

 		depthStencilAttachmentReference.attachment =
 			attachmentDescriptionCount;
@ -6174,37 +6135,6 @@ 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;
@ -6212,8 +6142,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
 	renderPassCreateInfo.attachmentCount = attachmentDescriptionCount;
 	renderPassCreateInfo.subpassCount = 1;
 	renderPassCreateInfo.pSubpasses = &subpass;
-	renderPassCreateInfo.dependencyCount = 2;
-	renderPassCreateInfo.pDependencies = dep;
+	renderPassCreateInfo.dependencyCount = 0;
+	renderPassCreateInfo.pDependencies = NULL;

 	vulkanResult = renderer->vkCreateRenderPass(
 		renderer->logicalDevice,
@ -6242,7 +6172,6 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
 	VkAttachmentReference depthStencilAttachmentReference;
 	Refresh_ColorAttachmentDescription attachmentDescription;
 	VkSubpassDescription subpass;
-	VkSubpassDependency dep[2];
 	VkRenderPassCreateInfo renderPassCreateInfo;
 	VkRenderPass renderPass;
 	VkResult result;
@ -6253,7 +6182,6 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
 	uint32_t resolveReferenceCount = 0;
 	uint32_t i;

-	/* Note: Render pass compatibility does not care about layout */
 	for (i = 0; i < attachmentInfo.colorAttachmentCount; i += 1)
 	{
 		attachmentDescription = attachmentInfo.colorAttachmentDescriptions[i];
@ -6387,37 +6315,6 @@ 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;
@ -6425,8 +6322,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
 	renderPassCreateInfo.attachmentCount = attachmentDescriptionCount;
 	renderPassCreateInfo.subpassCount = 1;
 	renderPassCreateInfo.pSubpasses = &subpass;
-	renderPassCreateInfo.dependencyCount = 2;
-	renderPassCreateInfo.pDependencies = dep;
+	renderPassCreateInfo.dependencyCount = 0;
+	renderPassCreateInfo.pDependencies = NULL;

 	result = renderer->vkCreateRenderPass(
 		renderer->logicalDevice,
@ -7867,14 +7764,6 @@ static void VULKAN_SetBufferData(
 		vulkanBuffer
 	);

-	// this janky call will wait for transfer writes to finish!
-	VULKAN_INTERNAL_BufferMemoryBarrier(
-		renderer,
-		vulkanCommandBuffer->commandBuffer,
-		RESOURCE_ACCESS_TRANSFER_WRITE,
-		vulkanBuffer
-	);
-
 	bufferCopy.srcOffset = transferBuffer->offset;
 	bufferCopy.dstOffset = offsetInBytes;
 	bufferCopy.size = (VkDeviceSize) dataLength;
@ -8544,13 +8433,10 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(

 	for (i = 0; i < colorAttachmentCount; i += 1)
 	{
-		texture = ((VulkanTextureContainer*) colorAttachmentInfos[i].texture)->vulkanTexture;
-
-		hash.colorTargetDescriptions[i].format = texture->format;
+		hash.colorTargetDescriptions[i].format = ((VulkanTextureContainer*) colorAttachmentInfos[i].texture)->vulkanTexture->format;
 		hash.colorTargetDescriptions[i].clearColor = colorAttachmentInfos[i].clearColor;
 		hash.colorTargetDescriptions[i].loadOp = colorAttachmentInfos[i].loadOp;
 		hash.colorTargetDescriptions[i].storeOp = colorAttachmentInfos[i].storeOp;
-		hash.colorTargetDescriptions[i].finalLayout = VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
 	}

 	hash.colorAttachmentSampleCount = REFRESH_SAMPLECOUNT_1;
@ -8572,18 +8458,14 @@ static VkRenderPass VULKAN_INTERNAL_FetchRenderPass(
 		hash.depthStencilTargetDescription.storeOp = REFRESH_STOREOP_DONT_CARE;
 		hash.depthStencilTargetDescription.stencilLoadOp = REFRESH_LOADOP_DONT_CARE;
 		hash.depthStencilTargetDescription.stencilStoreOp = REFRESH_STOREOP_DONT_CARE;
-		hash.depthStencilTargetDescription.finalLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 	}
 	else
 	{
-		texture = ((VulkanTextureContainer*) depthStencilAttachmentInfo->texture)->vulkanTexture;
-
-		hash.depthStencilTargetDescription.format = texture->format;
+		hash.depthStencilTargetDescription.format = ((VulkanTextureContainer*) depthStencilAttachmentInfo->texture)->vulkanTexture->format;
 		hash.depthStencilTargetDescription.loadOp = depthStencilAttachmentInfo->loadOp;
 		hash.depthStencilTargetDescription.storeOp = depthStencilAttachmentInfo->storeOp;
 		hash.depthStencilTargetDescription.stencilLoadOp = depthStencilAttachmentInfo->stencilLoadOp;
 		hash.depthStencilTargetDescription.stencilStoreOp = depthStencilAttachmentInfo->stencilStoreOp;
-		hash.depthStencilTargetDescription.finalLayout = VULKAN_INTERNAL_GetRenderPassFinalLayout(texture);
 	}

 	renderPass = RenderPassHashArray_Fetch(
@ -9144,11 +9026,35 @@ static void VULKAN_EndRenderPass(

 		if (currentTexture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
 		{
-			currentTexture->resourceAccessType = RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE;
+			VULKAN_INTERNAL_ImageMemoryBarrier(
+				renderer,
+				vulkanCommandBuffer->commandBuffer,
+				RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE,
+				currentTexture->aspectFlags,
+				0,
+				currentTexture->layerCount,
+				0,
+				currentTexture->levelCount,
+				0,
+				currentTexture->image,
+				&currentTexture->resourceAccessType
+			);
 		}
 		else if (currentTexture->usageFlags & VK_IMAGE_USAGE_STORAGE_BIT)
 		{
-			currentTexture->resourceAccessType = RESOURCE_ACCESS_COMPUTE_SHADER_STORAGE_IMAGE_READ_WRITE;
+			VULKAN_INTERNAL_ImageMemoryBarrier(
+				renderer,
+				vulkanCommandBuffer->commandBuffer,
+				RESOURCE_ACCESS_COMPUTE_SHADER_STORAGE_IMAGE_READ_WRITE,
+				currentTexture->aspectFlags,
+				0,
+				currentTexture->layerCount,
+				0,
+				currentTexture->levelCount,
+				0,
+				currentTexture->image,
+				&currentTexture->resourceAccessType
+			);
 		}
 	}
 	vulkanCommandBuffer->renderPassColorTargetCount = 0;
@ -9159,7 +9065,19 @@ static void VULKAN_EndRenderPass(

 		if (currentTexture->usageFlags & VK_IMAGE_USAGE_SAMPLED_BIT)
 		{
-			currentTexture->resourceAccessType = RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE;
+			VULKAN_INTERNAL_ImageMemoryBarrier(
+				renderer,
+				vulkanCommandBuffer->commandBuffer,
+				RESOURCE_ACCESS_ANY_SHADER_READ_SAMPLED_IMAGE,
+				currentTexture->aspectFlags,
+				0,
+				currentTexture->layerCount,
+				0,
+				currentTexture->levelCount,
+				0,
+				currentTexture->image,
+				&currentTexture->resourceAccessType
+			);
 		}
 	}
 	vulkanCommandBuffer->renderPassDepthTexture = NULL;