if(changed_sets)
{
- descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets());
- for(unsigned i=0; i<descriptor_set_handles.size(); ++i)
+ descriptor_set_slots.resize(self.shprog->get_n_descriptor_sets());
+ for(unsigned i=0; i<descriptor_set_slots.size(); ++i)
if(changed_sets&(1<<i))
- descriptor_set_handles[i] = device.get_pipeline_cache().get_descriptor_set(self, i);
+ descriptor_set_slots[i] = device.get_descriptor_pool().get_descriptor_set_slot(self, i);
unapplied |= PipelineState::UNIFORMS;
}
}
return result;
}
+bool VulkanPipelineState::is_descriptor_set_dynamic(unsigned index) const
+{
+ const PipelineState &self = *static_cast<const PipelineState *>(this);
+
+ auto i = lower_bound_member(self.uniform_blocks, static_cast<int>(index)<<20, &PipelineState::BoundUniformBlock::binding);
+ for(; (i!=self.uniform_blocks.end() && static_cast<unsigned>(i->binding)>>20==index); ++i)
+ if(i->used && i->buffer && i->buffer->get_usage()==STREAMING)
+ return true;
+
+ return false;
+}
+
VkDescriptorSetLayout VulkanPipelineState::get_descriptor_set_layout(unsigned index) const
{
return static_cast<const PipelineState *>(this)->shprog->desc_set_layout_handles[index];
}
-unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector<char> &buffer) const
+unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, unsigned frame, vector<char> &buffer) const
{
const PipelineState &self = *static_cast<const PipelineState *>(this);
{
buffer_ptr->buffer = handle_cast<::VkBuffer>(i->buffer->handle);
buffer_ptr->offset = i->block->get_offset();
+ if(i->buffer->get_usage()==STREAMING)
+ buffer_ptr->offset += frame*i->buffer->get_size();
buffer_ptr->range = i->block->get_data_size();
write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
write_ptr->dstBinding = i->binding&0xFFFFF;
write_ptr->descriptorCount = 1;
- write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
+ write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
write_ptr->pBufferInfo = buffer_ptr;
++buffer_ptr;
unapplied |= PipelineState::SHPROG;
if(self.vertex_setup!=last_ps.vertex_setup)
unapplied |= PipelineState::VERTEX_SETUP;
- for(unsigned i=0; (i<descriptor_set_handles.size() && i<last->descriptor_set_handles.size()); ++i)
- if(descriptor_set_handles[i]!=last->descriptor_set_handles[i])
+ for(unsigned i=0; (i<descriptor_set_slots.size() && i<last->descriptor_set_slots.size()); ++i)
+ if(descriptor_set_slots[i]!=last->descriptor_set_slots[i])
{
unapplied |= PipelineState::UNIFORMS;
break;
}
}
- if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_handles.empty())
+ if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_slots.empty())
{
- vector<uint32_t> dynamic_offsets;
- dynamic_offsets.reserve(self.uniform_blocks.size());
- for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks)
- if(u.used && u.binding>=0)
- {
- if(u.buffer->get_usage()==STREAMING)
- dynamic_offsets.push_back(frame*u.buffer->get_size());
- else
- dynamic_offsets.push_back(0);
- }
+ vector<VkDescriptorSet> descriptor_set_handles;
+ descriptor_set_handles.reserve(self.descriptor_set_slots.size());
+ for(unsigned i=0; i<self.descriptor_set_slots.size(); ++i)
+ descriptor_set_handles.push_back(device.get_descriptor_pool().get_descriptor_set(self.descriptor_set_slots[i], self, i, frame));
vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle,
- 0, descriptor_set_handles.size(), descriptor_set_handles.data(), dynamic_offsets.size(), dynamic_offsets.data());
+ 0, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0);
}
if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR))