Fix issues from the command recorder refactoring

[libs/gl.git] / source / backends / vulkan / commands_backend.cpp

diff --git a/source/backends/vulkan/commands_backend.cpp b/source/backends/vulkan/commands_backend.cpp
index 13acd8a38495baa6091afe43beb1a07ae0af7216..777d1a6b8b3a17a7ca882c2e9f0a4ea5f82433bf 100644 (file)
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -110,8 +110,8 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
        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);
@@ -149,21 +149,22 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
 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(primary_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(primary_buffer);
+       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 = Rect::max();
@@ -252,16 +253,16 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count)
        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, last_pipeline, frame_index, 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 &)