Skip to content

Fixed barrier generation for attachments #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JackOfBlades232 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed barrier generation for attachments #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion etna/source/RenderTargetStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ RenderTargetState::RenderTargetState(
attachmentInfos[i].clearValue = color_attachments[i].clearColorValue;

etna::get_context().getResourceTracker().setColorTarget(
commandBuffer, color_attachments[i].image, behavior);
commandBuffer,
color_attachments[i].image,
color_attachments[i].loadOp == vk::AttachmentLoadOp::eLoad,
color_attachments[i].storeOp == vk::AttachmentStoreOp::eStore,
behavior);

if (color_attachments[i].resolveImage)
{
Expand Down Expand Up @@ -90,6 +94,8 @@ RenderTargetState::RenderTargetState(
commandBuffer,
depth_attachment.image,
vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil,
depth_attachment.loadOp == vk::AttachmentLoadOp::eLoad,
depth_attachment.storeOp == vk::AttachmentStoreOp::eStore,
behavior);

if (depth_attachment.resolveImage && stencil_attachment.resolveImage)
Expand All @@ -109,6 +115,8 @@ RenderTargetState::RenderTargetState(
commandBuffer,
depth_attachment.image,
depth_attachment.imageAspect.value_or(vk::ImageAspectFlagBits::eDepth),
depth_attachment.loadOp == vk::AttachmentLoadOp::eLoad,
depth_attachment.storeOp == vk::AttachmentStoreOp::eStore,
behavior);

if (depth_attachment.resolveImage)
Expand All @@ -127,6 +135,8 @@ RenderTargetState::RenderTargetState(
commandBuffer,
stencil_attachment.image,
stencil_attachment.imageAspect.value_or(vk::ImageAspectFlagBits::eStencil),
stencil_attachment.loadOp == vk::AttachmentLoadOp::eLoad,
stencil_attachment.storeOp == vk::AttachmentStoreOp::eStore,
behavior);

if (stencil_attachment.resolveImage)
Expand Down
18 changes: 15 additions & 3 deletions etna/source/StateTracking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,20 @@ void ResourceStates::flushBarriers(vk::CommandBuffer com_buf)
}

void ResourceStates::setColorTarget(
vk::CommandBuffer com_buffer, vk::Image image, BarrierBehavior behavior)
vk::CommandBuffer com_buffer, vk::Image image, bool read, bool write, BarrierBehavior behavior)
{
if (get_context().shouldGenerateBarriersWhen(behavior))
{
vk::AccessFlags2 accessFlags;
if (read)
accessFlags |= vk::AccessFlagBits2::eColorAttachmentRead;
if (write)
accessFlags |= vk::AccessFlagBits2::eColorAttachmentWrite;
setTextureState(
com_buffer,
image,
vk::PipelineStageFlagBits2::eColorAttachmentOutput,
vk::AccessFlagBits2::eColorAttachmentWrite,
accessFlags,
vk::ImageLayout::eColorAttachmentOptimal,
vk::ImageAspectFlagBits::eColor);
}
Expand All @@ -138,16 +143,23 @@ void ResourceStates::setDepthStencilTarget(
vk::CommandBuffer com_buffer,
vk::Image image,
vk::ImageAspectFlags aspect_flags,
bool read,
bool write,
BarrierBehavior behavior)
{
if (get_context().shouldGenerateBarriersWhen(behavior))
{
vk::AccessFlags2 accessFlags;
if (read)
accessFlags |= vk::AccessFlagBits2::eDepthStencilAttachmentRead;
if (write)
accessFlags |= vk::AccessFlagBits2::eDepthStencilAttachmentWrite;
setTextureState(
com_buffer,
image,
vk::PipelineStageFlagBits2::eEarlyFragmentTests |
vk::PipelineStageFlagBits2::eLateFragmentTests,
vk::AccessFlagBits2::eDepthStencilAttachmentWrite,
accessFlags,
vk::ImageLayout::eDepthStencilAttachmentOptimal,
aspect_flags);
}
Expand Down
4 changes: 4 additions & 0 deletions etna/source/StateTracking.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,15 @@ class ResourceStates
void setColorTarget(
vk::CommandBuffer com_buffer,
vk::Image image,
bool read,
bool write,
BarrierBehavior behavior = BarrierBehavior::eDefault);
void setDepthStencilTarget(
vk::CommandBuffer com_buffer,
vk::Image image,
vk::ImageAspectFlags aspect_flags,
bool read,
bool write,
BarrierBehavior behavior = BarrierBehavior::eDefault);
void setResolveTarget(
vk::CommandBuffer com_buffer,
Expand Down
Loading