diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index 5a232f2fa9..b87bee1065 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -965,6 +965,24 @@ void TransitionImageLayout2(VkCommandBuffer cmd, VkImage image, int baseMip, int VkImageLayout oldImageLayout, VkImageLayout newImageLayout, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask) { +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + if (aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) { + // Hack to disable transaction elimination on ARM Mali. + if (oldImageLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || oldImageLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + oldImageLayout = VK_IMAGE_LAYOUT_GENERAL; + if (newImageLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || newImageLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + newImageLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + if (aspectMask != VK_IMAGE_ASPECT_COLOR_BIT) { + // Hack to disable transaction elimination on ARM Mali. + if (oldImageLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || oldImageLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + oldImageLayout = VK_IMAGE_LAYOUT_GENERAL; + if (newImageLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || newImageLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + newImageLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif VkImageMemoryBarrier image_memory_barrier{ VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER }; image_memory_barrier.srcAccessMask = srcAccessMask; image_memory_barrier.dstAccessMask = dstAccessMask; diff --git a/Common/Vulkan/VulkanContext.h b/Common/Vulkan/VulkanContext.h index 6e03b92caf..e452ac38b9 100644 --- a/Common/Vulkan/VulkanContext.h +++ b/Common/Vulkan/VulkanContext.h @@ -109,6 +109,12 @@ struct VulkanDeviceExtensions { bool DEDICATED_ALLOCATION; }; +// Useful for debugging on ARM Mali. This eliminates transaction elimination +// which can cause artifacts if you get barriers wrong (or if there are driver bugs). +// Cost is reduced performance on some GPU architectures. +// #define VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR +// #define VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + // VulkanContext manages the device and swapchain, and deferred deletion of objects. class VulkanContext { public: diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp index 9cb39484de..71ab2fae78 100644 --- a/GPU/Vulkan/DrawEngineVulkan.cpp +++ b/GPU/Vulkan/DrawEngineVulkan.cpp @@ -432,8 +432,11 @@ VkDescriptorSet DrawEngineVulkan::GetOrCreateDescriptorSet(VkImageView imageView int n = 0; VkDescriptorImageInfo tex[2]{}; if (imageView) { - // TODO: Also support LAYOUT_GENERAL to be able to texture from framebuffers without transitioning them? +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + tex[0].imageLayout = VK_IMAGE_LAYOUT_GENERAL; +#else tex[0].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +#endif tex[0].imageView = imageView; tex[0].sampler = sampler; writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; @@ -447,8 +450,11 @@ VkDescriptorSet DrawEngineVulkan::GetOrCreateDescriptorSet(VkImageView imageView } if (boundSecondary_) { - // TODO: Also support LAYOUT_GENERAL to be able to texture from framebuffers without transitioning them? +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + tex[0].imageLayout = VK_IMAGE_LAYOUT_GENERAL; +#else tex[1].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +#endif tex[1].imageView = boundSecondary_; tex[1].sampler = samplerSecondary_; writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; diff --git a/GPU/Vulkan/VulkanUtil.cpp b/GPU/Vulkan/VulkanUtil.cpp index fa41eb4bfc..f262c40479 100644 --- a/GPU/Vulkan/VulkanUtil.cpp +++ b/GPU/Vulkan/VulkanUtil.cpp @@ -164,8 +164,11 @@ VkDescriptorSet Vulkan2D::GetDescriptorSet(VkImageView tex1, VkSampler sampler1, VkDescriptorImageInfo image1 = {}; VkDescriptorImageInfo image2 = {}; if (tex1) { - // TODO: Also support LAYOUT_GENERAL to be able to texture from framebuffers without transitioning them? +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + image1.imageLayout = VK_IMAGE_LAYOUT_GENERAL; +#else image1.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +#endif image1.imageView = tex1; image1.sampler = sampler1; writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; @@ -178,7 +181,11 @@ VkDescriptorSet Vulkan2D::GetDescriptorSet(VkImageView tex1, VkSampler sampler1, } if (tex2) { // TODO: Also support LAYOUT_GENERAL to be able to texture from framebuffers without transitioning them? +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + image2.imageLayout = VK_IMAGE_LAYOUT_GENERAL; +#else image2.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +#endif image2.imageView = tex2; image2.sampler = sampler2; writes[n].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; diff --git a/ext/native/thin3d/VulkanQueueRunner.cpp b/ext/native/thin3d/VulkanQueueRunner.cpp index 6c04fd3d30..235000821f 100644 --- a/ext/native/thin3d/VulkanQueueRunner.cpp +++ b/ext/native/thin3d/VulkanQueueRunner.cpp @@ -95,17 +95,26 @@ void VulkanQueueRunner::InitBackbufferRenderPass() { attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; // Don't care about storing backbuffer Z - we clear it anyway. attachments[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; attachments[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + attachments[1].initialLayout = VK_IMAGE_LAYOUT_GENERAL; + attachments[1].finalLayout = VK_IMAGE_LAYOUT_GENERAL; +#else attachments[1].initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachments[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; +#endif attachments[1].flags = 0; VkAttachmentReference color_reference{}; color_reference.attachment = 0; +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + color_reference.layout = VK_IMAGE_LAYOUT_GENERAL; +#else color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; +#endif VkAttachmentReference depth_reference{}; depth_reference.attachment = 1; - depth_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + depth_reference.layout = attachments[1].finalLayout; VkSubpassDescription subpass{}; subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; @@ -166,8 +175,13 @@ VkRenderPass VulkanQueueRunner::GetRenderPass(VKRRenderPassAction colorLoadActio attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + attachments[0].initialLayout = VK_IMAGE_LAYOUT_GENERAL; + attachments[0].finalLayout = VK_IMAGE_LAYOUT_GENERAL; // TODO: Look into auto-transitioning to SAMPLED when appropriate. +#else attachments[0].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; attachments[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; // TODO: Look into auto-transitioning to SAMPLED when appropriate. +#endif attachments[0].flags = 0; attachments[1].format = vulkan_->GetDeviceInfo().preferredDepthStencilFormat; @@ -196,17 +210,22 @@ VkRenderPass VulkanQueueRunner::GetRenderPass(VKRRenderPassAction colorLoadActio } attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_STORE; attachments[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + attachments[1].initialLayout = VK_IMAGE_LAYOUT_GENERAL; + attachments[1].finalLayout = VK_IMAGE_LAYOUT_GENERAL; +#else attachments[1].initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachments[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; +#endif attachments[1].flags = 0; VkAttachmentReference color_reference{}; color_reference.attachment = 0; - color_reference.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + color_reference.layout = attachments[0].finalLayout; VkAttachmentReference depth_reference{}; depth_reference.attachment = 1; - depth_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + depth_reference.layout = attachments[1].finalLayout; VkSubpassDescription subpass{}; subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; @@ -501,40 +520,35 @@ void VulkanQueueRunner::PerformRenderPass(const VKRStep &step, VkCommandBuffer c // Transition the framebuffer if requested. // Don't need to transition it if VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL. if (fb && step.render.finalColorLayout != VK_IMAGE_LAYOUT_UNDEFINED && step.render.finalColorLayout != VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - VkImageMemoryBarrier barrier{}; - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier.oldLayout = fb->color.layout; - barrier.subresourceRange.layerCount = 1; - barrier.subresourceRange.levelCount = 1; - barrier.image = fb->color.image; - barrier.srcAccessMask = 0; - switch (barrier.oldLayout) { + VkAccessFlags srcAccessMask = 0; + VkAccessFlags dstAccessMask = 0; + switch (fb->color.layout) { case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - barrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; break; case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: - barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; break; default: Crash(); } - barrier.newLayout = step.render.finalColorLayout; - switch (barrier.newLayout) { + switch (step.render.finalColorLayout) { case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: - barrier.dstAccessMask = VK_ACCESS_SHADER_READ_BIT; + dstAccessMask = VK_ACCESS_SHADER_READ_BIT; break; case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: - barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; break; default: Crash(); } - barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - // we're between passes so it's OK. // ARM Best Practices guide recommends these stage bits. - vkCmdPipelineBarrier(cmd, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &barrier); - fb->color.layout = barrier.newLayout; + TransitionImageLayout2(cmd, fb->color.image, 0, 1, VK_IMAGE_ASPECT_COLOR_BIT, + fb->color.layout, step.render.finalColorLayout, + VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, + srcAccessMask, dstAccessMask); + fb->color.layout = step.render.finalColorLayout; } } @@ -833,6 +847,24 @@ void VulkanQueueRunner::SetupTransitionToTransferSrc(VKRImage &img, VkImageMemor barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; img.layout = barrier.newLayout; + + // NOTE: Must do this AFTER updating img.layout to avoid behaviour differences. +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + if (aspect == VK_IMAGE_ASPECT_COLOR_BIT) { + if (barrier.oldLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || barrier.oldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + if (barrier.newLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || barrier.newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + if (aspect != VK_IMAGE_ASPECT_COLOR_BIT) { + if (barrier.oldLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || barrier.oldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + if (barrier.newLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || barrier.newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif } void VulkanQueueRunner::SetupTransitionToTransferDst(VKRImage &img, VkImageMemoryBarrier &barrier, VkPipelineStageFlags &stage, VkImageAspectFlags aspect) { @@ -869,6 +901,24 @@ void VulkanQueueRunner::SetupTransitionToTransferDst(VKRImage &img, VkImageMemor barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; img.layout = barrier.newLayout; + + // NOTE: Must do this AFTER updating img.layout to avoid behaviour differences. +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + if (aspect == VK_IMAGE_ASPECT_COLOR_BIT) { + if (barrier.oldLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || barrier.oldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + if (barrier.newLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL || barrier.newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_DEPTH_STENCIL + if (aspect != VK_IMAGE_ASPECT_COLOR_BIT) { + if (barrier.oldLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || barrier.oldLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; + if (barrier.newLayout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL || barrier.newLayout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) + barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; + } +#endif } void VulkanQueueRunner::PerformReadback(const VKRStep &step, VkCommandBuffer cmd) { diff --git a/ext/native/thin3d/thin3d_vulkan.cpp b/ext/native/thin3d/thin3d_vulkan.cpp index 1f5660adfb..1899512bd3 100644 --- a/ext/native/thin3d/thin3d_vulkan.cpp +++ b/ext/native/thin3d/thin3d_vulkan.cpp @@ -859,7 +859,11 @@ VkDescriptorSet VKContext::GetOrCreateDescriptorSet(VkBuffer buf) { VkDescriptorImageInfo imageDesc; imageDesc.imageView = boundTextures_[0]->GetImageView(); imageDesc.sampler = boundSamplers_[0]->GetSampler(); +#ifdef VULKAN_USE_GENERAL_LAYOUT_FOR_COLOR + imageDesc.imageLayout = VK_IMAGE_LAYOUT_GENERAL; +#else imageDesc.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; +#endif VkWriteDescriptorSet writes[2] = {}; writes[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;