Skip to content
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.

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

Dynamic rendering #92

Merged
merged 21 commits into from
Apr 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dcdd084
Modified graphics pipeline so that it can now be created with dynamic…
MatejSakmary Oct 27, 2023
acd4e35
Use KHR types to fix build issues with Vulkan 1.2
MatejSakmary Oct 27, 2023
38350f2
Added begin and end rendering commands
MatejSakmary Oct 31, 2023
8c3acbd
Fix bugs in begin_dynamic_rendering()
MatejSakmary Oct 31, 2023
0d1e5e5
Apply suggestions from code review
MatejSakmary Nov 13, 2023
a9f7cf3
Merge branch 'development' of https://github.com/cg-tuwien/Auto-Vk in…
MatejSakmary Mar 10, 2024
e69b0ff
Add fixes to issues raised in pr review:
MatejSakmary Mar 10, 2024
98400d1
PR proposed fixes (mostly cosmetic) + inital draft of MSAA support (n…
MatejSakmary Mar 23, 2024
e58f0ad
Modified dynamic rendering attachments to take in subpass_usages and …
MatejSakmary Mar 28, 2024
f34f844
Added View mask to begin dynamic rendering parameters
MatejSakmary Mar 28, 2024
b09a326
Trying to fix GitHub workflows
johannesugb Apr 12, 2024
4cdd8e2
Merge branch 'development' into dynamic_rendering
johannesugb Apr 12, 2024
081f9e8
Trying to fix GitHub workflows
johannesugb Apr 12, 2024
5cda692
Using Invoke-WebRequest instead of curl
johannesugb Apr 12, 2024
d310080
Reverted the last change
johannesugb Apr 12, 2024
4aaeb37
I have no idea what I'm doing
johannesugb Apr 12, 2024
d06ff39
Moving two vulkan-hpp includes a bit down, namely:
johannesugb Apr 12, 2024
48136de
Testing ["latest", "1.3.216.0", "1.2.198.1"] also in windows-latest
johannesugb Apr 12, 2024
44bfd85
Using vk::ImageLayout::eDepthStencilAttachmentOptimal instead of vk::…
johannesugb Apr 12, 2024
af94d78
Merge branch 'dynamic_rendering' of https://github.com/cg-tuwien/Auto…
johannesugb Apr 12, 2024
40fbdf5
Disable VMA=ON on Linux with 1.2 SDK
johannesugb Apr 12, 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
Prev Previous commit
Next Next commit
Fix bugs in begin_dynamic_rendering()
MatejSakmary committed Oct 31, 2023

Verified

This commit was signed with the committer’s verified signature.
ilblackdragon Illia Polosukhin
commit 8c3acbdedbee47bcd18004ae4eba67d1bf039a8b
27 changes: 17 additions & 10 deletions src/avk.cpp
Original file line number Diff line number Diff line change
@@ -8388,7 +8388,7 @@ namespace avk
}
}
#endif //_DEBUG
const bool detectExtent = aRenderAreaExtent.has_value();
const bool detectExtent = !aRenderAreaExtent.has_value();
std::vector<vk::RenderingAttachmentInfoKHR> colorAttachments = {};
std::optional<vk::RenderingAttachmentInfoKHR> depthAttachment = {};
std::optional<vk::RenderingAttachmentInfoKHR> stencilAttachment = {};
@@ -8480,14 +8480,6 @@ namespace avk
}
}
}
auto const renderingInfo = vk::RenderingInfoKHR{}
.setRenderArea(vk::Rect2D(aRenderAreaOffset, aRenderAreaExtent.value()))
.setLayerCount(aLayerCount)
.setViewMask(0) //TODO(msakmary) this is for multiview - do we want to support it?
.setColorAttachmentCount(static_cast<uint32_t>(colorAttachments.size()))
.setPColorAttachments(colorAttachments.data())
.setPDepthAttachment(depthAttachment.has_value() ? &depthAttachment.value() : nullptr)
.setPStencilAttachment(stencilAttachment.has_value() ? &stencilAttachment.value() : nullptr);

return action_type_command{
avk::sync::sync_hint {
@@ -8501,7 +8493,22 @@ namespace avk
}}
},
{},
[renderingInfo](avk::command_buffer_t& cb) {
[
colorAttachments,
depthAttachment,
stencilAttachment,
aLayerCount,
aRenderAreaOffset,
aRenderAreaExtent
](avk::command_buffer_t& cb) {
auto const renderingInfo = vk::RenderingInfoKHR{}
.setRenderArea(vk::Rect2D(aRenderAreaOffset, aRenderAreaExtent.value()))
.setLayerCount(aLayerCount)
.setViewMask(0) //TODO(msakmary) this is for multiview - do we want to support it?
.setColorAttachmentCount(static_cast<uint32_t>(colorAttachments.size()))
.setPColorAttachments(colorAttachments.data())
.setPDepthAttachment(depthAttachment.has_value() ? &depthAttachment.value() : nullptr)
.setPStencilAttachment(stencilAttachment.has_value() ? &stencilAttachment.value() : nullptr);
cb.handle().beginRenderingKHR(renderingInfo, cb.root_ptr()->dispatch_loader_ext());
}
};