From c2a16b234fbd087e3f076895f9ce6873ef7b3e29 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 8 Aug 2020 19:13:00 -0700 Subject: Vk backend: improved handling of RESOURCE_STATE_RESOLVE_DEST attachment state --- Graphics/GraphicsEngine/include/RenderPassBase.hpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/RenderPassBase.hpp b/Graphics/GraphicsEngine/include/RenderPassBase.hpp index 96b479e6..c2a6b5c1 100644 --- a/Graphics/GraphicsEngine/include/RenderPassBase.hpp +++ b/Graphics/GraphicsEngine/include/RenderPassBase.hpp @@ -42,6 +42,21 @@ namespace Diligent void ValidateRenderPassDesc(const RenderPassDesc& Desc); +template +void _CorrectAttachmentState(RESOURCE_STATE& State) {} + +template <> +inline void _CorrectAttachmentState(RESOURCE_STATE& State) +{ + if (State == RESOURCE_STATE_RESOLVE_DEST) + { + // In Vulkan resolve attachments must be in VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL state. + // It is important to correct the state because outside of render pass RESOURCE_STATE_RESOLVE_DEST maps + // to VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL. + State = RESOURCE_STATE_RENDER_TARGET; + } +} + /// Template class implementing base functionality for the render pass object. /// \tparam BaseInterface - base interface that this class will inheret @@ -76,6 +91,7 @@ public: for (Uint32 i = 0; i < Desc.AttachmentCount; ++i) { pAttachments[i] = Desc.pAttachments[i]; + _CorrectAttachmentState(pAttachments[i].FinalState); } } @@ -150,6 +166,7 @@ public: for (Uint32 rslv_attachment = 0; rslv_attachment < SrcSubpass.RenderTargetAttachmentCount; ++rslv_attachment, ++pCurrAttachmentRef) { *pCurrAttachmentRef = SrcSubpass.pResolveAttachments[rslv_attachment]; + _CorrectAttachmentState(pCurrAttachmentRef->State); UpdateAttachmentStateAndFirstUseSubpass(*pCurrAttachmentRef); } } -- cgit v1.2.3