X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=a1a03d3d8fcb31d2646027036bb4936a237d4194;hb=b0db98d71aeb32d9e57315b8a06ff4068aeccbca;hp=4714ff67015a1fe736d3459f1375f8a39ccd4677;hpb=37076ae3c42e963d8ee90e54f06da1227d85129f;p=libs%2Fgl.git diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 4714ff67..a1a03d3d 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -35,6 +35,9 @@ void VulkanPipelineState::update() const { const PipelineState &self = *static_cast(this); + if(self.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(self.changes&pipeline_mask) @@ -46,11 +49,22 @@ void VulkanPipelineState::update() const for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) if(u.changed || changed_sets==~0U) { - u.used = self.shprog->uses_binding(u.binding); + u.used = self.shprog->uses_uniform_block_binding(u.binding); if(u.binding>=0) changed_sets |= 1<<(u.binding>>20); u.changed = false; } + for(const PipelineState::BoundTexture &t: self.textures) + if(t.changed || changed_sets==~0U) + { + t.used = self.shprog->uses_texture_binding(t.binding); + changed_sets |= 1<<(t.binding>>20); + if(t.texture && t.level>=0) + t.texture->refresh_mip_views(); + if(t.sampler) + t.sampler->refresh(); + t.changed = false; + } descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets()); for(unsigned i=0; i &buffer) const } if(self.vertex_setup) - { - self.vertex_setup->refresh(); pipeline_info->pVertexInputState = reinterpret_cast(self.vertex_setup->creation_info.data()); - } } uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const @@ -265,6 +276,14 @@ uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const result = hash_update<64>(result, b.binding); result = hash_update<64>(result, reinterpret_cast(b.block)); } + for(const PipelineState::BoundTexture &t: self.textures) + if(t.used && (t.binding>>20)==index) + { + result = hash_update<64>(result, t.binding); + result = hash_update<64>(result, reinterpret_cast(t.texture)); + result = hash_update<64>(result, reinterpret_cast(t.sampler)); + result = hash_update<64>(result, t.level); + } return result; } @@ -282,13 +301,20 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector=0 && static_cast(u.binding>>20)==index) ++n_buffers; - - StructureBuilder sb(buffer, 2); - VkWriteDescriptorSet *&writes = sb.add(n_buffers); + unsigned n_images = 0; + for(const PipelineState::BoundTexture &t: self.textures) + if(t.used && (t.binding>>20)==index) + ++n_images; + unsigned n_writes = n_buffers+n_images; + + StructureBuilder sb(buffer, 3); + VkWriteDescriptorSet *&writes = sb.add(n_writes); VkDescriptorBufferInfo *&buffers = sb.add(n_buffers); + VkDescriptorImageInfo *&images = sb.add(n_images); VkWriteDescriptorSet *write_ptr = writes; VkDescriptorBufferInfo *buffer_ptr = buffers; + VkDescriptorImageInfo *image_ptr = images; for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) if(u.used && u.binding>=0 && static_cast(u.binding>>20)==index) @@ -307,10 +333,30 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, vector>20)==index) + { + image_ptr->sampler = handle_cast<::VkSampler>(t.sampler->handle); + if(t.level<0) + image_ptr->imageView = handle_cast<::VkImageView>(t.texture->view_handle); + else + image_ptr->imageView = handle_cast<::VkImageView>(t.texture->mip_view_handles[t.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->descriptorCount = 1; + write_ptr->descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; + write_ptr->pImageInfo = image_ptr; + + ++image_ptr; + ++write_ptr; + } + + return n_writes; } -void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const +void VulkanPipelineState::apply(VkCommandBuffer command_buffer, bool negative_viewport) const { const PipelineState &self = *static_cast(this); const VulkanFunctions &vk = device.get_functions(); @@ -329,18 +375,19 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const 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, VK_SHADER_STAGE_ALL, + vk.CmdPushConstants(command_buffer, self.shprog->layout_handle, self.shprog->stage_flags, pc_block.get_offset(), pc_block.get_data_size(), pc_block.get_data_pointer()); } } - vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle, 0, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0); + if(!descriptor_set_handles.empty()) + vk.CmdBindDescriptorSets(command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle, 0, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0); VkViewport viewport = { }; if(self.viewport) { viewport.x = self.viewport->left; - viewport.y = self.framebuffer->get_height()-(self.viewport->bottom+self.viewport->height); + viewport.y = self.viewport->bottom; viewport.width = self.viewport->width; viewport.height = self.viewport->height; } @@ -351,6 +398,11 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const viewport.width = self.framebuffer->get_width(); viewport.height = self.framebuffer->get_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); @@ -359,7 +411,7 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer) const if(self.scissor) { scissor.offset.x = self.scissor->left; - scissor.offset.y = self.framebuffer->get_height()-(self.scissor->bottom+self.scissor->height); + scissor.offset.y = self.scissor->bottom; scissor.extent.width = self.scissor->width; scissor.extent.height = self.scissor->height; }