Skip to content

Added a way to force memory barriers. #105

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

Merged
DragonJoker merged 1 commit into from
May 28, 2023
Merged

Added a way to force memory barriers. #105

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
24 changes: 16 additions & 8 deletions include/RenderGraph/RecordContext.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,30 +93,36 @@ namespace crg
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageViewId const & view
, VkImageLayout initialLayout
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageSubresourceRange const & subresourceRange
, VkImageLayout initialLayout
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageViewType viewType
, VkImageSubresourceRange const & subresourceRange
, VkImageLayout initialLayout
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageViewId const & view
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageSubresourceRange const & subresourceRange
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageViewType viewType
, VkImageSubresourceRange const & subresourceRange
, LayoutState const & wantedState );
, LayoutState const & wantedState
, bool force = false );
//@}
/**
*\name Buffers
Expand All @@ -127,11 +133,13 @@ namespace crg
, BufferSubresourceRange const & subresourceRange
, VkAccessFlags initialMask
, VkPipelineStageFlags initialStage
, AccessState const & wantedState );
, AccessState const & wantedState
, bool force = false );
CRG_API void memoryBarrier( VkCommandBuffer commandBuffer
, VkBuffer buffer
, BufferSubresourceRange const & subresourceRange
, AccessState const & wantedState );
, AccessState const & wantedState
, bool force = false );
//@}
//@}
CRG_API GraphContext & getContext()const;
Expand Down
53 changes: 35 additions & 18 deletions source/RenderGraph/RecordContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,36 +189,41 @@ namespace crg
void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageViewId const & view
, VkImageLayout initialLayout
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, view.data->image
, view.data->info.viewType
, view.data->info.subresourceRange
, initialLayout
, wantedState );
, wantedState
, force );
}

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageSubresourceRange const & subresourceRange
, VkImageLayout initialLayout
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, image
, VkImageViewType( image.data->info.imageType )
, subresourceRange
, initialLayout
, wantedState );
, wantedState
, force );
}

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageViewType viewType
, VkImageSubresourceRange const & subresourceRange
, VkImageLayout initialLayout
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
auto & resources = getResources();

Expand All @@ -241,8 +246,10 @@ namespace crg
, getStageMask( initialLayout ) };
}

if ( from.layout != wantedState.layout
&& wantedState.layout != VK_IMAGE_LAYOUT_UNDEFINED )
if ( force
|| ( ( from.layout != wantedState.layout
|| from.state.pipelineStage != wantedState.state.pipelineStage )
&& wantedState.layout != VK_IMAGE_LAYOUT_UNDEFINED ) )
{
VkImageMemoryBarrier barrier{ VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER
, nullptr
Expand Down Expand Up @@ -273,49 +280,56 @@ namespace crg

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageViewId const & view
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, view.data->image
, view.data->info.viewType
, view.data->info.subresourceRange
, VK_IMAGE_LAYOUT_UNDEFINED
, wantedState );
, wantedState
, force );
}

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageSubresourceRange const & subresourceRange
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, image
, VkImageViewType( image.data->info.imageType )
, subresourceRange
, VK_IMAGE_LAYOUT_UNDEFINED
, wantedState );
, wantedState
, force );
}

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, ImageId const & image
, VkImageViewType viewType
, VkImageSubresourceRange const & subresourceRange
, LayoutState const & wantedState )
, LayoutState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, image
, viewType
, subresourceRange
, VK_IMAGE_LAYOUT_UNDEFINED
, wantedState );
, wantedState
, force );
}

void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, VkBuffer buffer
, BufferSubresourceRange const & subresourceRange
, VkAccessFlags initialMask
, VkPipelineStageFlags initialStage
, AccessState const & wantedState )
, AccessState const & wantedState
, bool force )
{
auto & resources = getResources();

Expand All @@ -332,8 +346,9 @@ namespace crg
from = { initialMask, initialStage };
}

if ( from.access != wantedState.access
|| from.pipelineStage != wantedState.pipelineStage )
if ( force
|| ( from.access != wantedState.access
|| from.pipelineStage != wantedState.pipelineStage ) )
{
VkBufferMemoryBarrier barrier{ VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER
, nullptr
Expand Down Expand Up @@ -363,14 +378,16 @@ namespace crg
void RecordContext::memoryBarrier( VkCommandBuffer commandBuffer
, VkBuffer buffer
, BufferSubresourceRange const & subresourceRange
, AccessState const & wantedState )
, AccessState const & wantedState
, bool force )
{
memoryBarrier( commandBuffer
, buffer
, subresourceRange
, 0u
, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT
, wantedState );
, wantedState
, force );
}

GraphContext & RecordContext::getContext()const
Expand Down