Rework multisample resolve to use resolve attachments

[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 777d1a6b8b3a17a7ca882c2e9f0a4ea5f82433bf..2273d91920e555741f86991c1694e761bc83a877 100644 (file)
--- a/source/backends/vulkan/commands_backend.cpp
+++ b/source/backends/vulkan/commands_backend.cpp
@@ -8,8 +8,8 @@
 #include "frameformat.h"
 #include "pipelinestate.h"
 #include "rect.h"
+#include "renderpass.h"
 #include "semaphore.h"
-#include "structurebuilder.h"
 #include "swapchaintexture.h"
 #include "vulkan.h"
 
@@ -98,52 +98,20 @@ void VulkanCommands::begin_render_pass(bool clear, const ClearValue *clear_value
                if(dynamic_cast<const SwapChainTexture *>(framebuffer->get_attachment(i)))
                        fb_is_swapchain = true;
 
-       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);
-
        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 *const &begin_info = sb.add<VkRenderPassBeginInfo>(1);
-       VkClearValue *const &vk_clear_values = sb.add<VkClearValue>(FrameFormat::MAX_ATTACHMENTS);
+       RenderPass render_pass;
+       render_pass.framebuffer = framebuffer;
+       render_pass.render_area = viewport;
+       render_pass.clear = clear;
+       render_pass.clear_values = clear_values;
+       render_pass.to_present = fb_is_swapchain;
+       render_pass.update(device);
 
-       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);
+       discard_fb_contents = render_pass.discard_fb_contents;
 
-       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)
-       {
-               unsigned i = 0;
-               for(FrameAttachment a: framebuffer->get_format())
-               {
-                       if(get_attach_point(a)==get_attach_point(DEPTH_ATTACHMENT))
-                               vk_clear_values[i].depthStencil.depth = clear_values[i].depth_stencil.depth;
-                       else if(get_attach_point(a)==get_attach_point(STENCIL_ATTACHMENT))
-                               vk_clear_values[i].depthStencil.stencil = clear_values[i].depth_stencil.stencil;
-                       else
-                       {
-                               vk_clear_values[i].color.float32[0] = clear_values[i].color.r;
-                               vk_clear_values[i].color.float32[1] = clear_values[i].color.g;
-                               vk_clear_values[i].color.float32[2] = clear_values[i].color.b;
-                               vk_clear_values[i].color.float32[3] = clear_values[i].color.a;
-                       }
-                       ++i;
-               }
-
-               begin_info->clearValueCount = framebuffer->get_format().size();
-               begin_info->pClearValues = vk_clear_values;
-       }
+       begin_buffer(render_pass.handle);
+       render_pass.fill_begin_info(pass_begin_info);
 }
 
 void VulkanCommands::end_render_pass()
@@ -265,7 +233,24 @@ void VulkanCommands::draw_instanced(const Batch &batch, unsigned count)
        vkCmd.DrawIndexed(batch.size(), count, first_index, 0, 0);
 }
 
-void VulkanCommands::resolve_multisample(Framebuffer &)
+void VulkanCommands::dispatch(unsigned count_x, unsigned count_y, unsigned count_z)
+{
+       if(!pipeline_state)
+               throw invalid_operation("VulkanCommands::draw_instanced");
+
+       if(framebuffer)
+               end_render_pass();
+
+       VulkanCommandRecorder vkCmd(device.get_functions(), primary_buffer);
+
+       pipeline_state->refresh();
+       pipeline_state->synchronize_resources();
+       device.get_synchronizer().barrier(vkCmd);
+       pipeline_state->apply(vkCmd, 0, frame_index, false);
+       vkCmd.Dispatch(count_x, count_y, count_z);
+}
+
+void VulkanCommands::resolve_multisample()
 {
        throw logic_error("VulkanCommands::resolve_multisample is unimplemented");
 }