#include "pipelinestate.h"
#include "rect.h"
#include "semaphore.h"
+#include "structurebuilder.h"
#include "swapchaintexture.h"
#include "vulkan.h"
vk.QueueWaitIdle();
}
-void VulkanCommands::begin_buffer()
+void VulkanCommands::begin_buffer(VkRenderPass render_pass)
{
if(!current_pool)
throw invalid_operation("VulkanCommands::begin_buffer");
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;
- vk.BeginCommandBuffer(current_buffer, begin_info);
+ begin_info.pInheritanceInfo = &inherit_info;
+ }
+
+ vk.BeginCommandBuffer(buffer, begin_info);
}
void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_values)
viewport = pipeline_state->get_viewport();
- const VulkanFunctions &vk = device.get_functions();
-
- if(!current_buffer)
- begin_buffer();
-
- device.get_transfer_queue().dispatch_transfers(current_buffer);
+ if(!primary_buffer)
+ begin_buffer(0);
Synchronizer &sync = device.get_synchronizer();
sync.reset();
framebuffer->refresh();
- sync.barrier(current_buffer);
+ sync.barrier(primary_buffer);
+
+ 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 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;
++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);
+
+ 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);
+
framebuffer = 0;
viewport = 0;
+ pass_buffer = 0;
}
void VulkanCommands::begin_frame(unsigned index)
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();
if(framebuffer)
end_render_pass();
- vk.EndCommandBuffer(current_buffer);
+ vk.EndCommandBuffer(primary_buffer);
VkSubmitInfo submit_info = { };
submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
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);
- current_buffer = 0;
+ primary_buffer = 0;
}
void VulkanCommands::use_pipeline(const PipelineState *ps)
begin_render_pass(false, 0);
pipeline_state->refresh();
- pipeline_state->apply(current_buffer, fb_is_swapchain);
+ pipeline_state->apply(pass_buffer, 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 &)
projects / libs / gl.git / blobdiff