-
Notifications
You must be signed in to change notification settings - Fork 215
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
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 714e006
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill f8f74bb
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill ccf7ce4
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 5ac42c1
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 7fe517b
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 313eec2
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 4fc8c7d
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 24dc4a8
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 90250b9
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 3c322e3
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 8b3e660
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 010cf77
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 6d95eb3
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill b726f15
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 660576f
Reserve maxSets OR descriptorPoolSizes if either are required. Ensure…
rolandhill 5e17f9b
Merge branch 'ContextWarning' of github.com:rolandhill/VulkanSceneGra…
rolandhill 32cfc5f
Merge branch 'vsg-dev:master' into ContextWarning
rolandhill File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -184,6 +184,7 @@ void Context::getDescriptorPoolSizesToUse(uint32_t& maxSets, DescriptorPoolSizes | |
{ | ||
maxSets = minimum_maxSets; | ||
} | ||
maxSets = std::max(1u, maxSets); | ||
|
||
for (auto& [minimum_type, minimum_descriptorCount] : minimum_descriptorPoolSizes) | ||
{ | ||
|
@@ -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()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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)); | ||
} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.