Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions include/RenderGraph/RunnableGraph.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,21 @@ namespace crg
return m_fence;
}

FramePassTimer const & getTimer()const
FramePassTimer const & getTimer()const noexcept
{
return m_timer;
}

FramePassTimer & getTimer()
FramePassTimer & getTimer()noexcept
{
return m_timer;
}

GraphContext & getContext()const noexcept
{
return m_context;
}

private:
FrameGraph & m_graph;
GraphContext & m_context;
Expand Down
4 changes: 2 additions & 2 deletions include/RenderGraph/RunnablePasses/RenderPassHolder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ namespace crg
return m_passes[index].renderArea;
}

std::vector< ClearValue > const & getClearValues( uint32_t index )const
std::vector< VkClearValue > const & getClearValues( uint32_t index )const
{
return m_passes[index].clearValues;
}
Expand All @@ -83,7 +83,7 @@ namespace crg
mutable VkFramebuffer frameBuffer{};
Rect2D renderArea{};
std::vector< Attachment const * > attachments;
std::vector< ClearValue > clearValues;
std::vector< VkClearValue > clearValues;
std::vector< Entry > attaches;
PipelineState previousState;
PipelineState nextState;
Expand Down
11 changes: 5 additions & 6 deletions source/RenderGraph/RunnablePasses/RenderPassHolder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace crg
, ImageViewId view
, VkAttachmentDescriptionArray & attaches
, std::vector< RenderPassHolder::Entry > & viewAttaches
, std::vector< ClearValue > & clearValues
, std::vector< VkClearValue > & clearValues
, LayoutState initialLayout
, LayoutState finalLayout
, bool separateDepthStencilLayouts )
Expand All @@ -41,7 +41,7 @@ namespace crg
, convert( initialLayout.layout )
, convert( finalLayout.layout ) } );
viewAttaches.push_back( { view, initialLayout, finalLayout } );
clearValues.push_back( attach.getClearValue() );
clearValues.push_back( convert( attach.getClearValue() ) );

if ( view.data->source.empty() )
{
Expand All @@ -63,7 +63,7 @@ namespace crg
, ImageViewId view
, VkAttachmentDescriptionArray & attaches
, std::vector< RenderPassHolder::Entry > & viewAttaches
, std::vector< ClearValue > & clearValues
, std::vector< VkClearValue > & clearValues
, VkPipelineColorBlendAttachmentStateArray & blendAttachs
, LayoutState initialLayout
, LayoutState finalLayout
Expand Down Expand Up @@ -190,14 +190,13 @@ namespace crg
VkRenderPassBeginInfo RenderPassHolder::getBeginInfo( uint32_t index )const
{
auto frameBuffer = getFramebuffer( index );
auto clearValues = convert( getClearValues( index ) );
return VkRenderPassBeginInfo{ VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO
, nullptr
, getRenderPass( index )
, frameBuffer
, convert( getRenderArea( index ) )
, uint32_t( clearValues.size() )
, clearValues.data() };
, uint32_t( getClearValues( index ).size() )
, getClearValues( index ).data() };
}

void RenderPassHolder::begin( RecordContext & context
Expand Down