X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fpipelinestate_backend.cpp;h=4f50c77e11b62ed78b736a58fe35ad35dceeee98;hb=b7808c60e0bbbb198500066880b6ed37c0b0e9d0;hp=172386d6eee9c8bcf85d4e41dfc91b55551d1f70;hpb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;p=libs%2Fgl.git diff --git a/source/backends/vulkan/pipelinestate_backend.cpp b/source/backends/vulkan/pipelinestate_backend.cpp index 172386d6..4f50c77e 100644 --- a/source/backends/vulkan/pipelinestate_backend.cpp +++ b/source/backends/vulkan/pipelinestate_backend.cpp @@ -35,21 +35,27 @@ void VulkanPipelineState::update() const { const PipelineState &self = *static_cast(this); - if(self.changes&PipelineState::VERTEX_SETUP) + 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(self.changes&pipeline_mask) + if(changes&pipeline_mask) + { handle = device.get_pipeline_cache().get_pipeline(self); + unapplied |= PipelineState::SHPROG; + } - if(self.changes&(PipelineState::SHPROG|PipelineState::UNIFORMS|PipelineState::TEXTURES)) + if(changes&(PipelineState::SHPROG|PipelineState::UNIFORMS|PipelineState::TEXTURES)) { - unsigned changed_sets = (self.changes&PipelineState::SHPROG ? ~0U : 0U); + unsigned changed_sets = (changes&PipelineState::SHPROG ? ~0U : 0U); for(const PipelineState::BoundUniformBlock &u: self.uniform_blocks) if(u.changed || changed_sets==~0U) { - u.used = self.shprog->uses_uniform_block_binding(u.binding); + if(u.block) + u.used = self.shprog->uses_uniform_block_binding(u.binding); if(u.binding>=0) changed_sets |= 1<<(u.binding>>20); u.changed = false; @@ -57,7 +63,8 @@ void VulkanPipelineState::update() const for(const PipelineState::BoundTexture &t: self.textures) if(t.changed || changed_sets==~0U) { - t.used = self.shprog->uses_texture_binding(t.binding); + if(t.texture && t.sampler) + 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(); @@ -66,13 +73,17 @@ void VulkanPipelineState::update() const t.changed = false; } - descriptor_set_handles.resize(self.shprog->get_n_descriptor_sets()); - for(unsigned i=0; iget_n_descriptor_sets()); + for(unsigned i=0; i(result, format.get_samples()); - if(const DepthTest *depth_test = self.depth_test) - if(depth_test->enabled) - { - result = hash_round<64>(result, depth_test->compare); - result = hash_update<64>(result, depth_test->write); - } + if(self.depth_test.enabled) + { + result = hash_round<64>(result, self.depth_test.compare); + result = hash_update<64>(result, self.depth_test.write); + } - if(const StencilTest *stencil_test = self.stencil_test) - if(stencil_test->enabled) - { - result = hash_round<64>(result, stencil_test->compare); - result = hash_round<64>(result, stencil_test->stencil_fail_op); - result = hash_round<64>(result, stencil_test->depth_fail_op); - result = hash_round<64>(result, stencil_test->depth_pass_op); - result = hash_update<64>(result, stencil_test->reference); - } + 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(const Blend *blend = self.blend) - if(blend->enabled) - { - result = hash_round<64>(result, blend->equation); - result = hash_round<64>(result, blend->src_factor); - result = hash_round<64>(result, blend->dst_factor); - result = hash_round<64>(result, blend->write_mask); - } + 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); @@ -190,44 +198,31 @@ void VulkanPipelineState::fill_creation_info(vector &buffer) const multisample_info->alphaToOneEnable = VK_FALSE; depth_stencil_info->sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; - if(const DepthTest *depth_test = self.depth_test) + depth_stencil_info->depthTestEnable = self.depth_test.enabled; + depth_stencil_info->depthWriteEnable = self.depth_test.write; + depth_stencil_info->depthCompareOp = static_cast(get_vulkan_predicate(self.depth_test.compare)); + depth_stencil_info->depthBoundsTestEnable = VK_FALSE; + + depth_stencil_info->stencilTestEnable = self.stencil_test.enabled; + depth_stencil_info->front.failOp = static_cast(get_vulkan_stencil_op(self.stencil_test.stencil_fail_op)); + depth_stencil_info->front.passOp = static_cast(get_vulkan_stencil_op(self.stencil_test.depth_pass_op)); + depth_stencil_info->front.depthFailOp = static_cast(get_vulkan_stencil_op(self.stencil_test.depth_fail_op)); + depth_stencil_info->front.compareOp = static_cast(get_vulkan_predicate(self.stencil_test.compare)); + depth_stencil_info->front.compareMask = 0xFFFFFFFFU; + depth_stencil_info->front.writeMask = 0xFFFFFFFFU; + depth_stencil_info->front.reference = self.stencil_test.reference; + depth_stencil_info->back = depth_stencil_info->front; + + for(unsigned i=0; idepthTestEnable = depth_test->enabled; - depth_stencil_info->depthWriteEnable = depth_test->write; - depth_stencil_info->depthCompareOp = static_cast(get_vulkan_predicate(depth_test->compare)); - depth_stencil_info->depthBoundsTestEnable = VK_FALSE; - } - if(const StencilTest *stencil_test = self.stencil_test) - { - depth_stencil_info->stencilTestEnable = stencil_test->enabled; - depth_stencil_info->front.failOp = static_cast(get_vulkan_stencil_op(stencil_test->stencil_fail_op)); - depth_stencil_info->front.passOp = static_cast(get_vulkan_stencil_op(stencil_test->depth_pass_op)); - depth_stencil_info->front.depthFailOp = static_cast(get_vulkan_stencil_op(stencil_test->depth_fail_op)); - depth_stencil_info->front.compareOp = static_cast(get_vulkan_predicate(stencil_test->compare)); - depth_stencil_info->front.compareMask = 0xFFFFFFFFU; - depth_stencil_info->front.writeMask = 0xFFFFFFFFU; - depth_stencil_info->front.reference = stencil_test->reference; - depth_stencil_info->back = depth_stencil_info->front; - } - - if(const Blend *blend = self.blend) - { - for(unsigned i=0; ienabled; - blend_attachments[i].srcColorBlendFactor = static_cast(get_vulkan_blend_factor(blend->src_factor)); - blend_attachments[i].dstColorBlendFactor = static_cast(get_vulkan_blend_factor(blend->dst_factor)); - blend_attachments[i].colorBlendOp = static_cast(get_vulkan_blend_equation(blend->equation)); - blend_attachments[i].srcAlphaBlendFactor = blend_attachments[i].srcColorBlendFactor; - blend_attachments[i].dstAlphaBlendFactor = blend_attachments[i].dstColorBlendFactor; - blend_attachments[i].alphaBlendOp = blend_attachments[i].colorBlendOp; - blend_attachments[i].colorWriteMask = get_vulkan_color_mask(blend->write_mask); - } - } - else - { - for(unsigned i=0; i(get_vulkan_blend_factor(self.blend.src_factor)); + blend_attachments[i].dstColorBlendFactor = static_cast(get_vulkan_blend_factor(self.blend.dst_factor)); + blend_attachments[i].colorBlendOp = static_cast(get_vulkan_blend_equation(self.blend.equation)); + blend_attachments[i].srcAlphaBlendFactor = blend_attachments[i].srcColorBlendFactor; + blend_attachments[i].dstAlphaBlendFactor = blend_attachments[i].dstColorBlendFactor; + blend_attachments[i].alphaBlendOp = blend_attachments[i].colorBlendOp; + blend_attachments[i].colorWriteMask = get_vulkan_color_mask(self.blend.write_mask); } blend_info->sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; @@ -275,14 +270,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)); - result = hash_update<64>(result, reinterpret_cast(b.buffer)); + result = hash_update<64>(result, reinterpret_cast(b.buffer->handle)); } 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, reinterpret_cast(t.texture->handle)); + result = hash_update<64>(result, reinterpret_cast(t.sampler->handle)); result = hash_update<64>(result, t.level); } @@ -357,19 +352,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(); @@ -381,7 +400,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()); @@ -398,46 +417,41 @@ void VulkanPipelineState::apply(VkCommandBuffer command_buffer, unsigned frame, 0, descriptor_set_handles.size(), descriptor_set_handles.data(), dynamic_offsets.size(), dynamic_offsets.data()); } - VkViewport viewport = { }; - if(self.viewport) + if(unapplied&(PipelineState::VIEWPORT|PipelineState::SCISSOR)) { - viewport.x = self.viewport->left; - viewport.y = self.viewport->bottom; - viewport.width = self.viewport->width; - viewport.height = self.viewport->height; - } - else - { - viewport.x = 0; - viewport.y = 0; - 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); + Rect fb_rect = self.framebuffer->get_rect(); - VkRect2D scissor = { }; - if(self.scissor) - { - scissor.offset.x = self.scissor->left; - scissor.offset.y = self.scissor->bottom; - scissor.extent.width = self.scissor->width; - scissor.extent.height = self.scissor->height; - } - else - { - scissor.offset.x = 0; - scissor.offset.y = 0; - scissor.extent.width = self.framebuffer->get_width(); - scissor.extent.height = self.framebuffer->get_height(); + 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); + } } - vk.CmdSetScissor(command_buffer, 0, 1, &scissor); + + unapplied = 0; } } // namespace GL