X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fcommands_backend.cpp;h=bf8ee3f13d5652c21a14db09ff1e077e016740cc;hb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;hp=8243b58fe1ba66849b10a2cf2d94538f5d4450a8;hpb=d98d835a6359844efcbc13b18ea6c93ace117359;p=libs%2Fgl.git diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp index 8243b58f..bf8ee3f1 100644 --- a/source/backends/vulkan/commands_backend.cpp +++ b/source/backends/vulkan/commands_backend.cpp @@ -9,6 +9,7 @@ #include "pipelinestate.h" #include "rect.h" #include "semaphore.h" +#include "structurebuilder.h" #include "swapchaintexture.h" #include "vulkan.h" @@ -28,39 +29,55 @@ VulkanCommands::~VulkanCommands() vk.QueueWaitIdle(); } -void VulkanCommands::begin_buffer() +void VulkanCommands::begin_buffer(VkRenderPass render_pass) { - if(!current_pool) + if(frame_index>=command_pools.size()) throw invalid_operation("VulkanCommands::begin_buffer"); const VulkanFunctions &vk = device.get_functions(); + CommandPool *current_pool = &command_pools[frame_index]; if(!current_pool->in_use) { current_pool->fence.reset(); current_pool->in_use = true; } - if(current_pool->next_buffer>=current_pool->buffers.size()) + CommandBuffers &buffers = (render_pass ? current_pool->secondary : current_pool->primary); + + if(buffers.next_buffer>=buffers.buffers.size()) { VkCommandBufferAllocateInfo alloc_info = { }; alloc_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; alloc_info.commandPool = handle_cast<::VkCommandPool>(current_pool->pool); - alloc_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + alloc_info.level = (render_pass ? VK_COMMAND_BUFFER_LEVEL_SECONDARY : VK_COMMAND_BUFFER_LEVEL_PRIMARY); alloc_info.commandBufferCount = 1; VkCommandBuffer buffer; vk.AllocateCommandBuffers(alloc_info, &buffer); - current_pool->buffers.push_back(buffer); + buffers.buffers.push_back(buffer); } - current_buffer = current_pool->buffers[current_pool->next_buffer++]; + VkCommandBuffer buffer = buffers.buffers[buffers.next_buffer++]; + (render_pass ? pass_buffer : primary_buffer) = buffer; VkCommandBufferBeginInfo begin_info = { }; begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; + if(render_pass) + begin_info.flags |= VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT; + + VkCommandBufferInheritanceInfo inherit_info = { }; + if(render_pass) + { + inherit_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO; + inherit_info.renderPass = handle_cast<::VkRenderPass>(render_pass); + inherit_info.subpass = 0; + + begin_info.pInheritanceInfo = &inherit_info; + } - vk.BeginCommandBuffer(current_buffer, begin_info); + vk.BeginCommandBuffer(buffer, begin_info); } void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_values) @@ -71,48 +88,43 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value viewport = pipeline_state->get_viewport(); - const VulkanFunctions &vk = device.get_functions(); - - if(!current_buffer) - begin_buffer(); - - device.get_transfer_queue().dispatch_transfers(current_buffer); - - Synchronizer &sync = device.get_synchronizer(); - sync.reset(); + if(!primary_buffer) + begin_buffer(0); - bool to_present = false; + fb_is_swapchain = false; unsigned n_attachments = framebuffer->get_format().size(); - for(unsigned i=0; i(framebuffer->get_attachment(i))) - to_present = true; - if(!to_present) - framebuffer->prepare_image_layouts(clear && !viewport); - VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, (!clear_values && !viewport), to_present); + fb_is_swapchain = true; + + discard_fb_contents = (clear && !viewport); framebuffer->refresh(); - sync.barrier(current_buffer); + VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, (!clear_values && !viewport), fb_is_swapchain); + begin_buffer(render_pass); + + StructureBuilder sb(pass_begin_info, 2); + VkRenderPassBeginInfo *&begin_info = sb.add(1); + VkClearValue *&vk_clear_values = sb.add(FrameFormat::MAX_ATTACHMENTS); - VkRenderPassBeginInfo begin_info = { }; - begin_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; - begin_info.renderPass = handle_cast<::VkRenderPass>(render_pass); - begin_info.framebuffer = handle_cast<::VkFramebuffer>(framebuffer->handle); + begin_info->sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; + begin_info->renderPass = handle_cast<::VkRenderPass>(render_pass); + begin_info->framebuffer = handle_cast<::VkFramebuffer>(framebuffer->handle); if(viewport) { - begin_info.renderArea.offset.x = viewport->left; - begin_info.renderArea.offset.y = viewport->bottom; - begin_info.renderArea.extent.width = viewport->width; - begin_info.renderArea.extent.height = viewport->height; + begin_info->renderArea.offset.x = viewport->left; + begin_info->renderArea.offset.y = viewport->bottom; + begin_info->renderArea.extent.width = viewport->width; + begin_info->renderArea.extent.height = viewport->height; } else { - begin_info.renderArea.extent.width = framebuffer->get_width(); - begin_info.renderArea.extent.height = framebuffer->get_height(); + begin_info->renderArea.extent.width = framebuffer->get_width(); + begin_info->renderArea.extent.height = framebuffer->get_height(); } - VkClearValue vk_clear_values[7]; if(clear_values) { unsigned i = 0; @@ -132,47 +144,61 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value ++i; } - begin_info.clearValueCount = framebuffer->get_format().size(); - begin_info.pClearValues = vk_clear_values; + begin_info->clearValueCount = framebuffer->get_format().size(); + begin_info->pClearValues = vk_clear_values; } - - vk.CmdBeginRenderPass(current_buffer, begin_info, VK_SUBPASS_CONTENTS_INLINE); } void VulkanCommands::end_render_pass() { const VulkanFunctions &vk = device.get_functions(); - vk.CmdEndRenderPass(current_buffer); + vk.EndCommandBuffer(pass_buffer); + + device.get_transfer_queue().dispatch_transfers(primary_buffer); + + Synchronizer &sync = device.get_synchronizer(); + sync.reset(); + if(!fb_is_swapchain) + framebuffer->prepare_image_layouts(discard_fb_contents); + sync.barrier(primary_buffer); + + const VkRenderPassBeginInfo &begin_info = *reinterpret_cast(pass_begin_info.data()); + vk.CmdBeginRenderPass(primary_buffer, begin_info, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS); + vk.CmdExecuteCommands(primary_buffer, 1, &pass_buffer); + vk.CmdEndRenderPass(primary_buffer); + framebuffer = 0; viewport = 0; + pass_buffer = 0; } void VulkanCommands::begin_frame(unsigned index) { const VulkanFunctions &vk = device.get_functions(); - unsigned pool_index = index%device.get_n_frames_in_flight(); - if(pool_index>=command_pools.size()) + frame_index = index%device.get_n_frames_in_flight(); + if(frame_index>=command_pools.size()) { - command_pools.reserve(pool_index+1); - for(unsigned i=command_pools.size(); iin_use) { current_pool->fence.wait(); vk.ResetCommandPool(current_pool->pool, 0); current_pool->in_use = false; - current_pool->next_buffer = 0; + current_pool->primary.next_buffer = 0; + current_pool->secondary.next_buffer = 0; } } void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem) { - if(!current_buffer) + if(!primary_buffer) return; const VulkanFunctions &vk = device.get_functions(); @@ -183,7 +209,7 @@ void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem) if(framebuffer) end_render_pass(); - vk.EndCommandBuffer(current_buffer); + vk.EndCommandBuffer(primary_buffer); VkSubmitInfo submit_info = { }; submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; @@ -191,13 +217,13 @@ void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem) submit_info.pWaitSemaphores = &vk_wait_sem; submit_info.pWaitDstStageMask = &wait_stages; submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = handle_cast<::VkCommandBuffer *>(¤t_buffer); + submit_info.pCommandBuffers = handle_cast<::VkCommandBuffer *>(&primary_buffer); submit_info.signalSemaphoreCount = (signal_sem ? 1 : 0); submit_info.pSignalSemaphores = &vk_signal_sem; - vk.QueueSubmit(1, &submit_info, current_pool->fence.handle); + vk.QueueSubmit(1, &submit_info, command_pools[frame_index].fence.handle); - current_buffer = 0; + primary_buffer = 0; } void VulkanCommands::use_pipeline(const PipelineState *ps) @@ -233,9 +259,9 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count) begin_render_pass(false, 0); pipeline_state->refresh(); - pipeline_state->apply(current_buffer); + pipeline_state->apply(pass_buffer, frame_index, fb_is_swapchain); unsigned first_index = batch.get_offset()/batch.get_index_size(); - vk.CmdDrawIndexed(current_buffer, batch.size(), count, first_index, 0, 0); + vk.CmdDrawIndexed(pass_buffer, batch.size(), count, first_index, 0, 0); } void VulkanCommands::resolve_multisample(Framebuffer &)