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();
- if(!current_pool->in_use)
+ CommandPool ¤t_pool = command_pools[frame_index];
+ if(!current_pool.in_use)
{
- current_pool->fence.reset();
- current_pool->in_use = true;
+ current_pool.fence.reset();
+ current_pool.in_use = true;
}
- CommandBuffers &buffers = (render_pass ? current_pool->secondary : current_pool->primary);
+ 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.commandPool = handle_cast<::VkCommandPool>(current_pool.pool);
alloc_info.level = (render_pass ? VK_COMMAND_BUFFER_LEVEL_SECONDARY : VK_COMMAND_BUFFER_LEVEL_PRIMARY);
alloc_info.commandBufferCount = 1;
}
vk.BeginCommandBuffer(buffer, begin_info);
+ last_pipeline = 0;
}
void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_values)
if(!primary_buffer)
begin_buffer(0);
- Synchronizer &sync = device.get_synchronizer();
- sync.reset();
-
fb_is_swapchain = false;
unsigned n_attachments = framebuffer->get_format().size();
for(unsigned i=0; (!fb_is_swapchain && i<n_attachments); ++i)
if(dynamic_cast<const SwapChainTexture *>(framebuffer->get_attachment(i)))
fb_is_swapchain = true;
- if(!fb_is_swapchain)
- framebuffer->prepare_image_layouts(clear && !viewport);
- VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(), clear, (!clear_values && !viewport), fb_is_swapchain);
- framebuffer->refresh();
+ Rect fb_rect = framebuffer->get_rect();
+ Rect render_area = fb_rect.intersect(viewport);
+ bool full_viewport = render_area==fb_rect;
+ discard_fb_contents = (clear && full_viewport);
- sync.barrier(primary_buffer);
+ framebuffer->refresh();
+ VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(framebuffer->get_format(),
+ clear, (!clear_values && full_viewport), fb_is_swapchain);
begin_buffer(render_pass);
StructureBuilder sb(pass_begin_info, 2);
- VkRenderPassBeginInfo *&begin_info = sb.add<VkRenderPassBeginInfo>(1);
- VkClearValue *&vk_clear_values = sb.add<VkClearValue>(FrameFormat::MAX_ATTACHMENTS);
+ VkRenderPassBeginInfo *const &begin_info = sb.add<VkRenderPassBeginInfo>(1);
+ VkClearValue *const &vk_clear_values = sb.add<VkClearValue>(FrameFormat::MAX_ATTACHMENTS);
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;
- }
- else
- {
- begin_info->renderArea.extent.width = framebuffer->get_width();
- begin_info->renderArea.extent.height = framebuffer->get_height();
- }
+ begin_info->renderArea.offset.x = render_area.left;
+ begin_info->renderArea.offset.y = render_area.bottom;
+ begin_info->renderArea.extent.width = render_area.width;
+ begin_info->renderArea.extent.height = render_area.height;
if(clear_values)
{
void VulkanCommands::end_render_pass()
{
const VulkanFunctions &vk = device.get_functions();
+ VulkanCommandRecorder vkCmd(vk, primary_buffer);
vk.EndCommandBuffer(pass_buffer);
+ device.get_transfer_queue().dispatch_transfers(vkCmd);
+
+ Synchronizer &sync = device.get_synchronizer();
+ sync.reset();
+ if(!fb_is_swapchain)
+ framebuffer->prepare_image_layouts(discard_fb_contents);
+ sync.barrier(vkCmd);
+
const VkRenderPassBeginInfo &begin_info = *reinterpret_cast<const VkRenderPassBeginInfo *>(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);
+ vkCmd.BeginRenderPass(begin_info, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
+ vkCmd.ExecuteCommands(1, &pass_buffer);
+ vkCmd.EndRenderPass();
framebuffer = 0;
- viewport = 0;
+ viewport = Rect::max();
pass_buffer = 0;
}
{
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(); i<pool_index+1; ++i)
+ command_pools.reserve(frame_index+1);
+ for(unsigned i=command_pools.size(); i<frame_index+1; ++i)
command_pools.emplace_back(device);
}
- current_pool = &command_pools[pool_index];
- if(current_pool->in_use)
+ CommandPool ¤t_pool = command_pools[frame_index];
+ if(current_pool.in_use)
{
- current_pool->fence.wait();
- vk.ResetCommandPool(current_pool->pool, 0);
- current_pool->in_use = false;
- current_pool->primary.next_buffer = 0;
- current_pool->secondary.next_buffer = 0;
+ current_pool.fence.wait();
+ vk.ResetCommandPool(current_pool.pool, 0);
+ current_pool.in_use = false;
+ current_pool.primary.next_buffer = 0;
+ current_pool.secondary.next_buffer = 0;
}
+
+ device.get_descriptor_pool().begin_frame();
}
void VulkanCommands::submit_frame(Semaphore *wait_sem, Semaphore *signal_sem)
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);
primary_buffer = 0;
}
if(!pipeline_state)
throw invalid_operation("VulkanCommands::draw_instanced");
- const VulkanFunctions &vk = device.get_functions();
-
if(!framebuffer)
begin_render_pass(false, 0);
+ VulkanCommandRecorder vkCmd(device.get_functions(), pass_buffer);
+
pipeline_state->refresh();
- pipeline_state->apply(pass_buffer, fb_is_swapchain);
+ pipeline_state->apply(vkCmd, last_pipeline, frame_index, fb_is_swapchain);
+ last_pipeline = pipeline_state;
unsigned first_index = batch.get_offset()/batch.get_index_size();
- vk.CmdDrawIndexed(pass_buffer, batch.size(), count, first_index, 0, 0);
+ vkCmd.DrawIndexed(batch.size(), count, first_index, 0, 0);
}
void VulkanCommands::resolve_multisample(Framebuffer &)
projects / libs / gl.git / blobdiff