From 8c344a1906a7db2d72e8853b481f749438654a48 Mon Sep 17 00:00:00 2001
From: Sylvain Doremus <dragonjoker59@hotmail.com>
Date: Thu, 7 Dec 2023 07:28:00 +0100
Subject: [PATCH 1/2] Fixed some issues with rendepass re-initialisation.

---
 source/RenderGraph/FrameGraph.natvis                   | 6 ------
 source/RenderGraph/RunnableGraph.cpp                   | 2 +-
 source/RenderGraph/RunnablePasses/RenderPassHolder.cpp | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/source/RenderGraph/FrameGraph.natvis b/source/RenderGraph/FrameGraph.natvis
index e75094c..f8fd5be 100644
--- a/source/RenderGraph/FrameGraph.natvis
+++ b/source/RenderGraph/FrameGraph.natvis
@@ -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>
diff --git a/source/RenderGraph/RunnableGraph.cpp b/source/RenderGraph/RunnableGraph.cpp
index bc49b6f..67af1a4 100644
--- a/source/RenderGraph/RunnableGraph.cpp
+++ b/source/RenderGraph/RunnableGraph.cpp
@@ -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()
diff --git a/source/RenderGraph/RunnablePasses/RenderPassHolder.cpp b/source/RenderGraph/RunnablePasses/RenderPassHolder.cpp
index 6475aff..703998f 100644
--- a/source/RenderGraph/RunnablePasses/RenderPassHolder.cpp
+++ b/source/RenderGraph/RunnablePasses/RenderPassHolder.cpp
@@ -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();
 		}

From 3d7bee612326c7fde538ef328a2aba403b716a73 Mon Sep 17 00:00:00 2001
From: Sylvain Doremus <dragonjoker59@hotmail.com>
Date: Thu, 7 Dec 2023 07:33:29 +0100
Subject: [PATCH 2/2] Updated vcpkg

---
 .github/workflows/cmake.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index afb59e2..0e23e80 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -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
@@ -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