X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=87e03242d329ae90fb66d5346cefe9a4af4e195e;hb=1b4d387b74b2108f3926796d8115bee134fbf7f1;hp=31488bad1ef92d49b534306ab61721b43fae77ce;hpb=1ed4d66194a8a86413701a4c4e4178c2fb0a4ded;p=libs%2Fgl.git diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 31488bad..87e03242 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -41,6 +41,12 @@ void VulkanPipelineState::update() const if(changes&PipelineState::VERTEX_SETUP) self.vertex_setup->refresh(); + if(changes&PipelineState::SHPROG) + { + push_const_compat = hash<32>(self.shprog->stage_flags); + push_const_compat = hash_update<32>(push_const_compat, self.shprog->get_push_constants_size()); + } + constexpr unsigned pipeline_mask = PipelineState::SHPROG|PipelineState::VERTEX_SETUP|PipelineState::FACE_CULL| PipelineState::DEPTH_TEST|PipelineState::STENCIL_TEST|PipelineState::BLEND|PipelineState::PRIMITIVE_TYPE; if(changes&pipeline_mask) @@ -76,10 +82,15 @@ void VulkanPipelineState::update() const if(changed_sets) { - descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets()); - for(unsigned i=0; iget_n_descriptor_sets()); + first_changed_desc_set = descriptor_set_slots.size(); + for(unsigned i=0; i &buffer) const } StructureBuilder sb(buffer, 10); - VkGraphicsPipelineCreateInfo *&pipeline_info = sb.add(); - VkPipelineInputAssemblyStateCreateInfo *&input_assembly_info = sb.add(); - VkPipelineViewportStateCreateInfo *&viewport_info = sb.add(); - VkPipelineRasterizationStateCreateInfo *&raster_info = sb.add(); - VkPipelineMultisampleStateCreateInfo *&multisample_info = sb.add(); - VkPipelineDepthStencilStateCreateInfo *&depth_stencil_info = sb.add(); - VkPipelineColorBlendStateCreateInfo *&blend_info = sb.add(); - VkPipelineColorBlendAttachmentState *&blend_attachments = sb.add(n_color_attachments); - VkPipelineDynamicStateCreateInfo *&dynamic_info = sb.add(); - VkDynamicState *&dynamic_states = sb.add(2); + VkGraphicsPipelineCreateInfo *const &pipeline_info = sb.add(); + VkPipelineInputAssemblyStateCreateInfo *const &input_assembly_info = sb.add(); + VkPipelineViewportStateCreateInfo *const &viewport_info = sb.add(); + VkPipelineRasterizationStateCreateInfo *const &raster_info = sb.add(); + VkPipelineMultisampleStateCreateInfo *const &multisample_info = sb.add(); + VkPipelineDepthStencilStateCreateInfo *const &depth_stencil_info = sb.add(); + VkPipelineColorBlendStateCreateInfo *const &blend_info = sb.add(); + VkPipelineColorBlendAttachmentState *const &blend_attachments = sb.add(n_color_attachments); + VkPipelineDynamicStateCreateInfo *const &dynamic_info = sb.add(); + VkDynamicState *const &dynamic_states = sb.add(2); input_assembly_info->sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; input_assembly_info->topology = static_cast(get_vulkan_primitive_type(self.primitive_type)); @@ -261,6 +272,7 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const const PipelineState &self = *static_cast(this); uint64_t result = hash<64>(0, 0); + bool empty = true; auto i = lower_bound_member(self.uniform_blocks, static_cast(index)<<20, &PipelineState::BoundUniformBlock::binding); for(; (i!=self.uniform_blocks.end() && static_cast(i->binding)>>20==index); ++i) @@ -269,6 +281,7 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const result = hash_update<64>(result, i->binding); result = hash_update<64>(result, reinterpret_cast(i->block)); result = hash_update<64>(result, reinterpret_cast(i->buffer->handle)); + empty = false; } auto j = lower_bound_member(self.textures, index<<20, &PipelineState::BoundTexture::binding); @@ -279,17 +292,33 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const result = hash_update<64>(result, reinterpret_cast(j->texture->handle)); result = hash_update<64>(result, reinterpret_cast(j->sampler->handle)); result = hash_update<64>(result, j->level); + empty = false; } + if(!empty) + result = hash_update<64>(result, self.shprog->stage_flags); + return result; } +bool VulkanPipelineState::is_descriptor_set_dynamic(unsigned index) const +{ + const PipelineState &self = *static_cast(this); + + auto i = lower_bound_member(self.uniform_blocks, static_cast(index)<<20, &PipelineState::BoundUniformBlock::binding); + for(; (i!=self.uniform_blocks.end() && static_cast(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(this)->shprog->desc_set_layout_handles[index]; } -unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector &buffer) const +unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, unsigned frame, vector &buffer) const { const PipelineState &self = *static_cast(this); @@ -307,9 +336,9 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector(n_writes); - VkDescriptorBufferInfo *&buffers = sb.add(n_buffers); - VkDescriptorImageInfo *&images = sb.add(n_images); + VkWriteDescriptorSet *const &writes = sb.add(n_writes); + VkDescriptorBufferInfo *const &buffers = sb.add(n_buffers); + VkDescriptorImageInfo *const &images = sb.add(n_images); VkWriteDescriptorSet *write_ptr = writes; VkDescriptorBufferInfo *buffer_ptr = buffers; @@ -320,12 +349,14 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vectorbuffer = 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; @@ -355,24 +386,34 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector(this); - const VulkanFunctions &vk = device.get_functions(); if(!last) + { unapplied = ~0U; + first_changed_desc_set = 0; + } else if(last!=this) { const PipelineState &last_ps = *static_cast(last); if(handle!=last->handle) + { unapplied |= PipelineState::SHPROG; + if(self.push_const_compat!=last_ps.push_const_compat) + { + unapplied |= PipelineState::UNIFORMS; + first_changed_desc_set = 0; + } + } if(self.vertex_setup!=last_ps.vertex_setup) unapplied |= PipelineState::VERTEX_SETUP; - for(unsigned i=0; (idescriptor_set_handles.size()); ++i) - if(descriptor_set_handles[i]!=last->descriptor_set_handles[i]) + for(unsigned i=0; i=last->descriptor_set_slots.size() || descriptor_set_slots[i]!=last->descriptor_set_slots[i]) { unapplied |= PipelineState::UNIFORMS; + first_changed_desc_set = min(first_changed_desc_set, i); break; } if(self.viewport!=last_ps.viewport) @@ -382,14 +423,14 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe } if(unapplied&PipelineState::SHPROG) - vk.CmdBindPipeline(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, handle); + vkCmd.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, handle); if(unapplied&PipelineState::VERTEX_SETUP) if(const VertexSetup *vs = self.vertex_setup) { - vk.CmdBindVertexBuffers(command_buffer, 0, vs->n_bindings, vs->buffers, vs->offsets); + vkCmd.BindVertexBuffers(0, vs->n_bindings, vs->buffers, vs->offsets); VkIndexType index_type = static_cast(get_vulkan_index_type(vs->get_index_type())); - vk.CmdBindIndexBuffer(command_buffer, vs->get_index_buffer()->handle, 0, index_type); + vkCmd.BindIndexBuffer(vs->get_index_buffer()->handle, 0, index_type); } if(!self.uniform_blocks.empty()) @@ -398,26 +439,21 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe if(first_block.used && first_block.binding==ReflectData::PUSH_CONSTANT) { const UniformBlock &pc_block = *first_block.block; - vk.CmdPushConstants(command_buffer, self.shprog->layout_handle, self.shprog->stage_flags, + vkCmd.PushConstants(self.shprog->layout_handle, self.shprog->stage_flags, pc_block.get_offset(), pc_block.get_data_size(), pc_block.get_data_pointer()); } } - if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_handles.empty()) + if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_slots.empty()) { - vector 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); - } - - 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()); + vector descriptor_set_handles; + descriptor_set_handles.reserve(descriptor_set_slots.size()-first_changed_desc_set); + for(unsigned i=first_changed_desc_set; ilayout_handle, + first_changed_desc_set, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0); } if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR)) @@ -439,7 +475,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe } viewport.minDepth = 0.0f; viewport.maxDepth = 1.0f; - vk.CmdSetViewport(command_buffer, 0, 1, &viewport); + vkCmd.SetViewport(0, 1, &viewport); } if(unapplied&PipelineState::SCISSOR) @@ -450,11 +486,12 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, const VulkanPipe scissor.offset.y = scissor_rect.bottom; scissor.extent.width = scissor_rect.width; scissor.extent.height = scissor_rect.height; - vk.CmdSetScissor(command_buffer, 0, 1, &scissor); + vkCmd.SetScissor(0, 1, &scissor); } } unapplied = 0; + first_changed_desc_set = descriptor_set_slots.size(); } } // namespace GL