X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=31488bad1ef92d49b534306ab61721b43fae77ce;hb=1ed4d66194a8a86413701a4c4e4178c2fb0a4ded;hp=1d381022ace90136fc193681d97361a3b5f3d063;hpb=50492d9a5106b3dd76e3d6fa5ac88d9f97ba3c47;p=libs%2Fgl.git diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 1d381022..31488bad 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -1,3 +1,4 @@ +#include #include #include "batch.h" #include "blend.h" @@ -35,13 +36,18 @@ void VulkanPipelineState::update() const { const PipelineState &self = *static_cast(this); + unapplied |= changes&(PipelineState::VIEWPORT|PipelineState::SCISSOR|PipelineState::VERTEX_SETUP); + if(changes&PipelineState::VERTEX_SETUP) self.vertex_setup->refresh(); 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) + { handle = device.get_pipeline_cache().get_pipeline(self); + unapplied |= PipelineState::SHPROG; + } if(changes&(PipelineState::SHPROG|PipelineState::UNIFORMS|PipelineState::TEXTURES)) { @@ -74,6 +80,7 @@ void VulkanPipelineState::update() const for(unsigned i=0; i &buffer) const raster_info->depthClampEnable = VK_FALSE; raster_info->rasterizerDiscardEnable = VK_FALSE; raster_info->polygonMode = VK_POLYGON_MODE_FILL; + raster_info->frontFace = (self.front_face==CLOCKWISE ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE); if(self.face_cull==NO_CULL || self.front_face==NON_MANIFOLD) - { raster_info->cullMode = VK_CULL_MODE_NONE; - raster_info->frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; - } else - { raster_info->cullMode = (self.face_cull==CULL_FRONT ? VK_CULL_MODE_FRONT_BIT : VK_CULL_MODE_BACK_BIT); - raster_info->frontFace = (self.front_face==CLOCKWISE ? VK_FRONT_FACE_CLOCKWISE : VK_FRONT_FACE_COUNTER_CLOCKWISE); - } raster_info->depthBiasEnable = VK_FALSE; raster_info->depthBiasConstantFactor = 0.0f; raster_info->depthBiasClamp = 0.0f; @@ -259,20 +261,24 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const const PipelineState &self = *static_cast(this); uint64_t result = hash<64>(0, 0); - for(const PipelineState::BoundUniformBlock &b: self.uniform_blocks) - if(b.used && b.binding>=0 && static_cast(b.binding>>20)==index) + + 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) { - result = hash_update<64>(result, b.binding); - result = hash_update<64>(result, reinterpret_cast(b.block)); - result = hash_update<64>(result, reinterpret_cast(b.buffer->handle)); + 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)); } - for(const PipelineState::BoundTexture &t: self.textures) - if(t.used && (t.binding>>20)==index) + + auto j = lower_bound_member(self.textures, index<<20, &PipelineState::BoundTexture::binding); + for(; (j!=self.textures.end() && j->binding>>20==index); ++j) + if(j->used) { - result = hash_update<64>(result, t.binding); - result = hash_update<64>(result, reinterpret_cast(t.texture->handle)); - result = hash_update<64>(result, reinterpret_cast(t.sampler->handle)); - result = hash_update<64>(result, t.level); + result = hash_update<64>(result, j->binding); + 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); } return result; @@ -287,13 +293,16 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector(this); + auto u_begin = lower_bound_member(self.uniform_blocks, static_cast(index)<<20, &PipelineState::BoundUniformBlock::binding); + auto t_begin = lower_bound_member(self.textures, index<<20, &PipelineState::BoundTexture::binding); + unsigned n_buffers = 0; - for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) - if(u.used && u.binding>=0 && static_cast(u.binding>>20)==index) + for(auto i=u_begin; (i!=self.uniform_blocks.end() && static_cast(i->binding)>>20==index); ++i) + if(i->used) ++n_buffers; unsigned n_images = 0; - for(const PipelineState::BoundTexture &t: self.textures) - if(t.used && (t.binding>>20)==index) + for(auto i=t_begin; (i!=self.textures.end() && i->binding>>20==index); ++i) + if(i->used) ++n_images; unsigned n_writes = n_buffers+n_images; @@ -306,15 +315,15 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector=0 && static_cast(u.binding>>20)==index) + for(auto i=u_begin; (i!=self.uniform_blocks.end() && static_cast(i->binding)>>20==index); ++i) + if(i->used) { - buffer_ptr->buffer = handle_cast<::VkBuffer>(u.buffer->handle); - buffer_ptr->offset = u.block->get_offset(); - buffer_ptr->range = u.block->get_data_size(); + buffer_ptr->buffer = handle_cast<::VkBuffer>(i->buffer->handle); + buffer_ptr->offset = i->block->get_offset(); + buffer_ptr->range = i->block->get_data_size(); write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - write_ptr->dstBinding = u.binding&0xFFFFF; + write_ptr->dstBinding = i->binding&0xFFFFF; write_ptr->descriptorCount = 1; write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC; write_ptr->pBufferInfo = buffer_ptr; @@ -323,18 +332,18 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector>20)==index) + for(auto i=t_begin; (i!=self.textures.end() && i->binding>>20==index); ++i) + if(i->used) { - image_ptr->sampler = handle_cast<::VkSampler>(t.sampler->handle); - if(t.level<0) - image_ptr->imageView = handle_cast<::VkImageView>(t.texture->view_handle); + image_ptr->sampler = handle_cast<::VkSampler>(i->sampler->handle); + if(i->level<0) + image_ptr->imageView = handle_cast<::VkImageView>(i->texture->view_handle); else - image_ptr->imageView = handle_cast<::VkImageView>(t.texture->mip_view_handles[t.level]); + image_ptr->imageView = handle_cast<::VkImageView>(i->texture->mip_view_handles[i->level]); image_ptr->imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; write_ptr->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - write_ptr->dstBinding = t.binding&0xFFFFF; + write_ptr->dstBinding = i->binding&0xFFFFF; write_ptr->descriptorCount = 1; write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; write_ptr->pImageInfo = image_ptr; @@ -346,19 +355,43 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector(this); const VulkanFunctions &vk = device.get_functions(); - vk.CmdBindPipeline(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, handle); - if(const VertexSetup *vs = self.vertex_setup) + if(!last) + unapplied = ~0U; + else if(last!=this) { - vk.CmdBindVertexBuffers(command_buffer, 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); + const PipelineState &last_ps = *static_cast(last); + if(handle!=last->handle) + unapplied |= PipelineState::SHPROG; + 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]) + { + unapplied |= PipelineState::UNIFORMS; + break; + } + if(self.viewport!=last_ps.viewport) + unapplied |= PipelineState::VIEWPORT; + if(self.scissor!=last_ps.scissor) + unapplied |= PipelineState::SCISSOR; } + if(unapplied&PipelineState::SHPROG) + vk.CmdBindPipeline(command_buffer, 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); + 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); + } + if(!self.uniform_blocks.empty()) { const PipelineState::BoundUniformBlock &first_block = self.uniform_blocks.front(); @@ -370,7 +403,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame, } } - if(!descriptor_set_handles.empty()) + if((unapplied&PipelineState::UNIFORMS) && !descriptor_set_handles.empty()) { vector dynamic_offsets; dynamic_offsets.reserve(self.uniform_blocks.size()); @@ -387,30 +420,41 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame, 0, descriptor_set_handles.size(), descriptor_set_handles.data(), dynamic_offsets.size(), dynamic_offsets.data()); } - Rect fb_rect = self.framebuffer->get_rect(); - - Rect viewport_rect = fb_rect.intersect(self.viewport); - VkViewport viewport = { }; - viewport.x = viewport_rect.left; - viewport.y = viewport_rect.bottom; - viewport.width = viewport_rect.width; - viewport.height = viewport_rect.height; - if(negative_viewport) + if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR)) { - viewport.y += viewport.height; - viewport.height = -viewport.height; + Rect fb_rect = self.framebuffer->get_rect(); + + if(unapplied&PipelineState::VIEWPORT) + { + Rect viewport_rect = fb_rect.intersect(self.viewport); + VkViewport viewport = { }; + viewport.x = viewport_rect.left; + viewport.y = viewport_rect.bottom; + viewport.width = viewport_rect.width; + viewport.height = viewport_rect.height; + if(negative_viewport) + { + viewport.y += viewport.height; + viewport.height = -viewport.height; + } + viewport.minDepth = 0.0f; + viewport.maxDepth = 1.0f; + vk.CmdSetViewport(command_buffer, 0, 1, &viewport); + } + + if(unapplied&PipelineState::SCISSOR) + { + Rect scissor_rect = fb_rect.intersect(self.scissor); + VkRect2D scissor = { }; + scissor.offset.x = scissor_rect.left; + 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); + } } - viewport.minDepth = 0.0f; - viewport.maxDepth = 1.0f; - vk.CmdSetViewport(command_buffer, 0, 1, &viewport); - - Rect scissor_rect = fb_rect.intersect(self.scissor); - VkRect2D scissor = { }; - scissor.offset.x = scissor_rect.left; - 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); + + unapplied = 0; } } // namespace GL