diff options
| author | Józef Kucia <joseph.kucia@gmail.com> | 2017-09-10 11:24:08 +0200 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2017-09-13 12:27:13 -0600 |
| commit | fd558f59041145754a9509323622ea7047a2286c (patch) | |
| tree | c2f8d17b4ab95a5d43e7962ac8c4ebb14e5aa5a5 /layers/descriptor_sets.cpp | |
| parent | 071d290969f0544120f079f2ad057e2b9580c3b1 (diff) | |
| download | usermoji-fd558f59041145754a9509323622ea7047a2286c.tar.xz | |
layers: Use layout flags to test for push descriptor sets
Diffstat (limited to 'layers/descriptor_sets.cpp')
| -rw-r--r-- | layers/descriptor_sets.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp index cf527cd4..c6f057df 100644 --- a/layers/descriptor_sets.cpp +++ b/layers/descriptor_sets.cpp @@ -31,7 +31,11 @@ // Construct DescriptorSetLayout instance from given create info cvdescriptorset::DescriptorSetLayout::DescriptorSetLayout(const VkDescriptorSetLayoutCreateInfo *p_create_info, const VkDescriptorSetLayout layout) - : layout_(layout), binding_count_(p_create_info->bindingCount), descriptor_count_(0), dynamic_descriptor_count_(0) { + : layout_(layout), + flags_(p_create_info->flags), + binding_count_(p_create_info->bindingCount), + descriptor_count_(0), + dynamic_descriptor_count_(0) { // Dyn array indicies are ordered by binding # and array index of any array within the binding // so we store up bindings w/ count in ordered map in order to create dyn array mappings below std::map<uint32_t, uint32_t> binding_to_dyn_count; @@ -315,14 +319,13 @@ cvdescriptorset::AllocateDescriptorSetsData::AllocateDescriptorSetsData(uint32_t : required_descriptors_by_type{}, layout_nodes(count, nullptr) {} cvdescriptorset::DescriptorSet::DescriptorSet(const VkDescriptorSet set, const VkDescriptorPool pool, - const std::shared_ptr<DescriptorSetLayout const> &layout, const layer_data *dev_data) + const std::shared_ptr<DescriptorSetLayout const> &layout, const layer_data *dev_data) : some_update_(false), set_(set), pool_state_(nullptr), p_layout_(layout), device_data_(dev_data), - limits_(GetPhysDevProperties(dev_data)->properties.limits), - push_descriptor_(false) { + limits_(GetPhysDevProperties(dev_data)->properties.limits) { pool_state_ = GetDescriptorPoolState(dev_data, pool); // Foreach binding, create default descriptors of given type for (uint32_t i = 0; i < p_layout_->GetBindingCount(); ++i) { |