Skip to content

Fixed some issues with rendepass re-initialisation. #114

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 2 commits into from
Dec 7, 2023
Merged

Fixed some issues with rendepass re-initialisation. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c344a1
Fixed some issues with rendepass re-initialisation.
DragonJoker Dec 7, 2023
3d7bee6
Updated vcpkg
DragonJoker Dec 7, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup vcpkg
uses: lukka/run-vcpkg@v10
with:
vcpkgGitCommitId: 'd15470bb6464a3bb0ce3d98d118190cfd5189080'
vcpkgGitCommitId: 'f740d6f22908ccd8a519228a26b267f7a68dda9c'
setupOnly: true

- name: Install dependencies from vcpkg
Expand Down Expand Up @@ -67,13 +67,13 @@ jobs:
if: runner.os == 'Linux' && matrix.os[2] == 'clang'
shell: bash
working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
run: echo "CC=clang-12" >> $GITHUB_ENV
run: echo "CC=clang-14" >> $GITHUB_ENV

- name: Configure Clang++ version (Linux)
if: runner.os == 'Linux' && matrix.os[2] == 'clang'
shell: bash
working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
run: echo "CXX=clang++-12" >> $GITHUB_ENV
run: echo "CXX=clang++-14" >> $GITHUB_ENV

- name: Configure CMake
shell: bash
Expand Down
6 changes: 0 additions & 6 deletions source/RenderGraph/FrameGraph.natvis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,7 @@
<Item Name="graph">m_graph</Item>
<Item Name="callbacks">m_callbacks</Item>
<Item Name="ruConfig">m_ruConfig</Item>
<Item Name="commandPool">m_commandPool</Item>
<Item Name="commandBuffers">m_commandBuffers</Item>
<Item Name="semaphore">m_semaphore</Item>
<Item Name="fence">m_fence</Item>
<Item Name="timer">m_timer</Item>
<Item Name="layoutTransitions">m_layoutTransitions</Item>
<Item Name="accessTransitions">m_accessTransitions</Item>
<Item Name="passContexts">m_passContexts</Item>
</Expand>
</Type>
Expand Down
2 changes: 1 addition & 1 deletion source/RenderGraph/RunnableGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ namespace crg

if ( nextPass != m_passes.end() )
{
if ( pass->isEnabled() )
if ( ( *nextPass )->isEnabled() )
{
recordContext.setNextPipelineState( ( *nextPass )->getPipelineState()
, rungrf::gatherNextImageLayouts( pass->getImageLayouts()
Expand Down
4 changes: 3 additions & 1 deletion source/RenderGraph/RunnablePasses/RenderPassHolder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ namespace crg
, attaches.end()
, [&context]( RenderPassHolder::Entry const & lookup )
{
return context.getLayoutState( lookup.view ) != lookup.input;
auto layout = context.getLayoutState( lookup.view );
return layout.layout != VK_IMAGE_LAYOUT_UNDEFINED
&& layout != lookup.input;
} );
return it == attaches.end();
}
Expand Down