From a003ab3d2d94bd93246b98a36ab42d2c72f084ee Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Mon, 25 Jul 2016 18:10:41 +1200 Subject: layers: Add plumbing for descriptor requirements We want to be able to impose requirements on images & views bound to descriptor sets based on their usage in the shader. This adds the plumbing from pipelines into descriptor sets to enable that. Signed-off-by: Chris Forbes --- layers/descriptor_sets.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'layers/descriptor_sets.cpp') diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp index a149485f..b3a49670 100644 --- a/layers/descriptor_sets.cpp +++ b/layers/descriptor_sets.cpp @@ -335,10 +335,11 @@ bool cvdescriptorset::DescriptorSet::IsCompatible(const DescriptorSetLayout *lay // This includes validating that all descriptors in the given bindings are updated, // that any update buffers are valid, and that any dynamic offsets are within the bounds of their buffers. // Return true if state is acceptable, or false and write an error message into error string -bool cvdescriptorset::DescriptorSet::ValidateDrawState(const std::unordered_set &bindings, +bool cvdescriptorset::DescriptorSet::ValidateDrawState(const std::unordered_map &bindings, const std::vector &dynamic_offsets, std::string *error) const { auto dyn_offset_index = 0; - for (auto binding : bindings) { + for (auto binding_pair : bindings) { + auto binding = binding_pair.first; if (!p_layout_->HasBinding(binding)) { std::stringstream error_str; error_str << "Attempting to validate DrawState for binding #" << binding @@ -417,11 +418,12 @@ bool cvdescriptorset::DescriptorSet::ValidateDrawState(const std::unordered_set< return true; } // For given bindings, place any update buffers or images into the passed-in unordered_sets -uint32_t cvdescriptorset::DescriptorSet::GetStorageUpdates(const std::unordered_set &bindings, +uint32_t cvdescriptorset::DescriptorSet::GetStorageUpdates(const std::unordered_map &bindings, std::unordered_set *buffer_set, std::unordered_set *image_set) const { auto num_updates = 0; - for (auto binding : bindings) { + for (auto binding_pair : bindings) { + auto binding = binding_pair.first; // If a binding doesn't exist, skip it if (!p_layout_->HasBinding(binding)) { continue; -- cgit v1.2.3