Skip to content

Fixed dependency lookup regarding buffers. #139

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
Jul 23, 2024
Merged

Fixed dependency lookup regarding buffers. #139

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
895e8cd
Fixed dependency lookup regarding buffers.
DragonJoker Jul 23, 2024
e77886c
Updated vcpkg for Actions.
DragonJoker Jul 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 5 additions & 3 deletions source/RenderGraph/FramePassDependenciesBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() );
}
};

Expand Down Expand Up @@ -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 )
Expand Down