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

Reserve maxSets OR descriptorPoolSizes if either are required. Ensure… #961

Closed
wants to merge 18 commits into from
Closed
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4d802e4
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Sep 7, 2023
714e006
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Sep 7, 2023
f8f74bb
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Nov 13, 2023
ccf7ce4
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Sep 7, 2023
5ac42c1
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Nov 16, 2023
7fe517b
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Sep 7, 2023
313eec2
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Nov 19, 2023
4fc8c7d
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Jan 8, 2024
24dc4a8
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Jan 11, 2024
90250b9
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Jan 8, 2024
3c322e3
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Feb 26, 2024
8b3e660
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Jan 8, 2024
010cf77
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Feb 26, 2024
6d95eb3
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill May 28, 2024
b726f15
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Jun 6, 2024
660576f
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill Jun 26, 2024
5e17f9b
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill Jul 9, 2024
32cfc5f
Merge branch 'vsg-dev:master' into ContextWarning
rolandhill Jul 9, 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
3 changes: 2 additions & 1 deletion src/vsg/vk/Context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ void Context::getDescriptorPoolSizesToUse(uint32_t& maxSets, DescriptorPoolSizes
{
maxSets = minimum_maxSets;
}
maxSets = std::max(1u, maxSets);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is essentially equivalent to setting minimum_maxSets to 1.


for (auto& [minimum_type, minimum_descriptorCount] : minimum_descriptorPoolSizes)
{
Expand Down Expand Up @@ -276,7 +277,7 @@ void Context::reserve(const ResourceRequirements& requirements)
if (required_maxSets > 0 || !required_descriptorPoolSizes.empty())
{
getDescriptorPoolSizesToUse(required_maxSets, required_descriptorPoolSizes);
if (required_maxSets > 0 && !required_descriptorPoolSizes.empty())
if (required_maxSets > 0 || !required_descriptorPoolSizes.empty())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The recent changes were made because we were seeing Vulkan debug errors when maxSets was 0 or the pool sizes vector was empty so checking both using an && was required.

{
descriptorPools.push_back(vsg::DescriptorPool::create(device, required_maxSets, required_descriptorPoolSizes));
}
Expand Down
Loading