From 895e8cdd91a028b80977b8dd8e517c48ca96d30c Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Tue, 23 Jul 2024 21:44:55 +0200 Subject: [PATCH 1/2] Fixed dependency lookup regarding buffers. --- source/RenderGraph/FramePassDependenciesBuilder.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/RenderGraph/FramePassDependenciesBuilder.cpp b/source/RenderGraph/FramePassDependenciesBuilder.cpp index 555a81a..e232e5c 100644 --- a/source/RenderGraph/FramePassDependenciesBuilder.cpp +++ b/source/RenderGraph/FramePassDependenciesBuilder.cpp @@ -157,12 +157,14 @@ namespace crg::builder static bool isInput( Attachment const & attach ) { return attach.isInput() - && ( attach.isStorageBuffer() || attach.isTransitionBuffer() ); + && ( attach.isStorageBuffer() || attach.isUniformBuffer() || attach.isTransitionBuffer() + || attach.isStorageBufferView() || attach.isUniformBufferView() || attach.isTransitionBufferView() ); } static bool isOutput( Attachment const & attach ) { - return attach.isOutput() && attach.isStorageBuffer(); + return attach.isOutput() + && ( attach.isStorageBuffer() || attach.isStorageBufferView() ); } }; @@ -605,7 +607,7 @@ namespace crg::builder static bool match( Buffer const & lhs, Buffer const & rhs ) { - return lhs.buffer() != rhs.buffer(); + return lhs.buffer() == rhs.buffer(); } static bool match( ImageViewId const & lhs, ImageViewId const & rhs ) From e77886c943ea9ea37991e5100179cdd9b98bd05e Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Tue, 23 Jul 2024 21:49:48 +0200 Subject: [PATCH 2/2] Updated vcpkg for Actions. --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e9b7656..7297aab 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -23,7 +23,7 @@ jobs: - name: Setup vcpkg uses: lukka/run-vcpkg@v11 with: - vcpkgGitCommitId: 'f740d6f22908ccd8a519228a26b267f7a68dda9c' + vcpkgGitCommitId: '7a57b42f959ad138a5283477fe2e6c97a7cb852f' - name: Install dependencies from vcpkg shell: bash run: |