X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=d8e4d4a1978504373e5614aad6e59555d358e955;hb=4369f481b06d28056deceecbfcb69550a65c92dc;hp=5f9e7eb9185a4e812c1826edf0e071677e2b20d7;hpb=2a70fecfbbe8708be2bdaa75d222dd5a889a8ed3;p=libs%2Fgl.git diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 5f9e7eb9..d8e4d4a1 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -48,8 +48,12 @@ void VulkanPipelineState::update() const 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; + constexpr unsigned graphics_mask = PipelineState::FRAMEBUFFER|PipelineState::VERTEX_SETUP|PipelineState::FACE_CULL| + PipelineState::DEPTH_TEST|PipelineState::STENCIL_TEST|PipelineState::BLEND|PipelineState::PRIMITIVE_TYPE| + PipelineState::PATCH_SIZE; + unsigned pipeline_mask = PipelineState::SHPROG; + if(!self.shprog->is_compute()) + pipeline_mask |= graphics_mask; if(changes&pipeline_mask) { handle = device.get_pipeline_cache().get_pipeline(self); @@ -98,56 +102,72 @@ void VulkanPipelineState::update() const uint64_t VulkanPipelineState::compute_hash() const { const PipelineState &self = *static_cast(this); - const FrameFormat &format = self.framebuffer->get_format(); uint64_t result = hash<64>(self.shprog); - result = hash_update<64>(result, self.vertex_setup->compute_hash()); - result = hash_round<64>(result, self.primitive_type); - if(self.front_face!=NON_MANIFOLD && self.face_cull!=NO_CULL) + if(!self.shprog->is_compute()) { - result = hash_round<64>(result, self.front_face); - result = hash_round<64>(result, self.face_cull); - } + const FrameFormat &format = self.framebuffer->get_format(); - result = hash_round<64>(result, format.get_samples()); + result = hash_update<64>(result, self.vertex_setup->compute_hash()); + result = hash_round<64>(result, self.primitive_type); - if(self.depth_test.enabled) - { - result = hash_round<64>(result, self.depth_test.compare); - result = hash_update<64>(result, self.depth_test.write); - } + if(self.front_face!=NON_MANIFOLD && self.face_cull!=NO_CULL) + { + result = hash_round<64>(result, self.front_face); + result = hash_round<64>(result, self.face_cull); + } - if(self.stencil_test.enabled) - { - result = hash_round<64>(result, self.stencil_test.compare); - result = hash_round<64>(result, self.stencil_test.stencil_fail_op); - result = hash_round<64>(result, self.stencil_test.depth_fail_op); - result = hash_round<64>(result, self.stencil_test.depth_pass_op); - result = hash_update<64>(result, self.stencil_test.reference); - } + result = hash_round<64>(result, format.get_samples()); + if(format.get_samples()>1) + result = hash_round<64>(result, self.blend.alpha_to_coverage); - if(self.blend.enabled) - { - result = hash_round<64>(result, self.blend.equation); - result = hash_round<64>(result, self.blend.src_factor); - result = hash_round<64>(result, self.blend.dst_factor); - result = hash_round<64>(result, self.blend.write_mask); - } + if(self.depth_test.enabled) + { + result = hash_round<64>(result, self.depth_test.compare); + result = hash_update<64>(result, self.depth_test.write); + } - for(FrameAttachment a: format) - result = hash_update<64>(result, a); + if(self.stencil_test.enabled) + { + result = hash_round<64>(result, self.stencil_test.compare); + result = hash_round<64>(result, self.stencil_test.stencil_fail_op); + result = hash_round<64>(result, self.stencil_test.depth_fail_op); + result = hash_round<64>(result, self.stencil_test.depth_pass_op); + result = hash_update<64>(result, self.stencil_test.reference); + } + + if(self.blend.enabled) + { + result = hash_round<64>(result, self.blend.equation); + result = hash_round<64>(result, self.blend.src_factor); + result = hash_round<64>(result, self.blend.dst_factor); + result = hash_round<64>(result, self.blend.write_mask); + } + + for(FrameAttachment a: format) + result = hash_update<64>(result, a); + } return result; } void VulkanPipelineState::fill_creation_info(vector &buffer) const +{ + if(static_cast(this)->shprog->is_compute()) + fill_compute_creation_info(buffer); + else + fill_graphics_creation_info(buffer); +} + +void VulkanPipelineState::fill_graphics_creation_info(vector &buffer) const { const PipelineState &self = *static_cast(this); const FrameFormat &format = self.framebuffer->get_format(); RenderPass render_pass; render_pass.framebuffer = self.framebuffer; + render_pass.to_present = self.framebuffer->is_presentable(); render_pass.update(device); unsigned n_color_attachments = 0; @@ -158,9 +178,13 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const ++n_color_attachments; } - StructureBuilder sb(buffer, 10); + bool has_tessellation = (self.shprog && self.shprog->has_tessellation()); + + StructureBuilder sb(buffer, 12); VkGraphicsPipelineCreateInfo *const &pipeline_info = sb.add(); VkPipelineInputAssemblyStateCreateInfo *const &input_assembly_info = sb.add(); + VkPipelineTessellationStateCreateInfo *const &tessellation_info = sb.add(has_tessellation); + VkPipelineTessellationDomainOriginStateCreateInfo *const &tess_origin_info = sb.add(has_tessellation); VkPipelineViewportStateCreateInfo *const &viewport_info = sb.add(); VkPipelineRasterizationStateCreateInfo *const &raster_info = sb.add(); VkPipelineMultisampleStateCreateInfo *const &multisample_info = sb.add(); @@ -172,7 +196,17 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const 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)); - input_assembly_info->primitiveRestartEnable = true; + input_assembly_info->primitiveRestartEnable = !has_tessellation; + + if(has_tessellation) + { + tessellation_info->sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; + tessellation_info->pNext = tess_origin_info; + tessellation_info->patchControlPoints = self.patch_size; + + tess_origin_info->sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_DOMAIN_ORIGIN_STATE_CREATE_INFO; + tess_origin_info->domainOrigin = VK_TESSELLATION_DOMAIN_ORIGIN_LOWER_LEFT; + } viewport_info->sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; viewport_info->viewportCount = 1; @@ -200,7 +234,7 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const multisample_info->sampleShadingEnable = VK_FALSE; multisample_info->minSampleShading = 1.0f; multisample_info->pSampleMask = 0; - multisample_info->alphaToCoverageEnable = VK_FALSE; + multisample_info->alphaToCoverageEnable = (format.get_samples()>1 && self.blend.alpha_to_coverage ? VK_TRUE : VK_FALSE); multisample_info->alphaToOneEnable = VK_FALSE; depth_stencil_info->sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; @@ -245,7 +279,7 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const pipeline_info->sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; pipeline_info->pInputAssemblyState = input_assembly_info; - pipeline_info->pTessellationState = 0; + pipeline_info->pTessellationState = (has_tessellation ? tessellation_info : 0); pipeline_info->pViewportState = viewport_info; pipeline_info->pRasterizationState = raster_info; pipeline_info->pMultisampleState = multisample_info; @@ -266,6 +300,22 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const pipeline_info->pVertexInputState = reinterpret_cast(self.vertex_setup->creation_info.data()); } +void VulkanPipelineState::fill_compute_creation_info(vector &buffer) const +{ + const PipelineState &self = *static_cast(this); + + StructureBuilder sb(buffer, 1); + VkComputePipelineCreateInfo *const &pipeline_info = sb.add(); + + pipeline_info->sType = VK_STRUCTURE_TYPE_COMPUTE_PIPELINE_CREATE_INFO; + + if(self.shprog) + { + pipeline_info->stage = *reinterpret_cast(self.shprog->creation_info.data()); + pipeline_info->layout = handle_cast<::VkPipelineLayout>(self.shprog->layout_handle); + } +} + uint64_t VulkanPipelineState::compute_descriptor_set_hash(unsigned index) const { const PipelineState &self = *static_cast(this); @@ -398,16 +448,25 @@ unsigned VulkanPipelineState::fill_descriptor_writes(unsigned index, unsigned fr ++write_ptr; } +#ifdef DEBUG + self.check_bound_resources(); +#endif + return n_writes; } -void VulkanPipelineState::synchronize_resources(bool discard_fb_contents) const +void VulkanPipelineState::synchronize_resources() const { const PipelineState &self = *static_cast(this); for(const PipelineState::BoundResource &r: self.resources) - if(r.type==PipelineState::STORAGE_TEXTURE) - r.texture->change_layout(-1, VK_IMAGE_LAYOUT_GENERAL, false); + if(r.used) + { + if(r.type==PipelineState::STORAGE_TEXTURE) + r.texture->change_layout(-1, VK_IMAGE_LAYOUT_GENERAL, false); + else if(r.type==PipelineState::SAMPLED_TEXTURE) + r.texture->change_layout(-1, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, false); + } } void VulkanPipelineState::apply(const VulkanCommandRecorder &vkCmd, const VulkanPipelineState *last, unsigned frame, bool negative_viewport) const @@ -446,10 +505,11 @@ void VulkanPipelineState::apply(const VulkanCommandRecorder &vkCmd, const Vulkan unapplied |= PipelineState::SCISSOR; } + VkPipelineBindPoint bind_point = (self.shprog->is_compute() ? VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS); if(unapplied&PipelineState::SHPROG) - vkCmd.BindPipeline(VK_PIPELINE_BIND_POINT_GRAPHICS, handle); + vkCmd.BindPipeline(bind_point, handle); - if(unapplied&PipelineState::VERTEX_SETUP) + if(!self.shprog->is_compute() && (unapplied&PipelineState::VERTEX_SETUP)) if(const VertexSetup *vs = self.vertex_setup) { vkCmd.BindVertexBuffers(0, vs->n_bindings, vs->buffers, vs->offsets); @@ -476,11 +536,11 @@ void VulkanPipelineState::apply(const VulkanCommandRecorder &vkCmd, const Vulkan descriptor_set_handles.push_back(device.get_descriptor_pool().get_descriptor_set( self.descriptor_set_slots[i], self, i, frame)); - vkCmd.BindDescriptorSets(VK_PIPELINE_BIND_POINT_GRAPHICS, self.shprog->layout_handle, + vkCmd.BindDescriptorSets(bind_point, self.shprog->layout_handle, first_changed_desc_set, descriptor_set_handles.size(), descriptor_set_handles.data(), 0, 0); } - if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR)) + if(!self.shprog->is_compute() && (unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR))) { Rect fb_rect = self.framebuffer->get_rect();