refa Remove redundant render pass

* src/vk/render_pass.hpp: Both 2D pipelines used identical render
passes. I merged both in a single render pass.
* src/vk/renderer.cpp (Renderer::draw): Use only one render pass for
both 2D graphics pipelines.

1 files changed, 1 insertions, 73 deletions

diff --git a/src/vk/graphics_pipeline_2d_solid_layout.cpp b/src/vk/graphics_pipeline_2d_solid_layout.cpp
index cbd656a..712e840 100644
--- a/src/vk/graphics_pipeline_2d_solid_layout.cpp
+++ b/src/vk/graphics_pipeline_2d_solid_layout.cpp
@@ -61,80 +61,8 @@ unload_pipeline(void *obj)
     cg_core.vk_device_with_swapchain->device, self->pipeline, nullptr);
 }
 
-void
-load_render_pass(void *obj)
-{
-  auto self = static_cast<VK::GraphicsPipeline2DSolidLayout*>(obj);
-
-  std::array<VkAttachmentDescription, 1> attachments{};
-  // Color attachment.
-  attachments[0].flags = 0;
-  attachments[0].format = cg_core.vk_swapchain->image_format;
-  attachments[0].samples = VK_SAMPLE_COUNT_1_BIT;
-  attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
-  attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
-  attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-  attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-  attachments[0].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-  attachments[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-
-  VkAttachmentReference color_attachment_ref{};
-  color_attachment_ref.attachment = 0;
-  color_attachment_ref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-
-  VkSubpassDescription subpass{};
-  subpass.flags = 0;
-  subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
-  subpass.inputAttachmentCount = 0;
-  subpass.pInputAttachments = nullptr;
-  subpass.colorAttachmentCount = 1;
-  subpass.pColorAttachments = &color_attachment_ref;
-  subpass.pResolveAttachments = nullptr;
-  subpass.pDepthStencilAttachment = nullptr;
-  subpass.preserveAttachmentCount = 0;
-  subpass.pPreserveAttachments = nullptr;
-
-  VkSubpassDependency dependency{};
-  dependency.srcSubpass = VK_SUBPASS_EXTERNAL;
-  dependency.dstSubpass = 0;
-  dependency.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-    VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
-  dependency.srcAccessMask = 0;
-  dependency.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT |
-    VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT;
-  dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT |
-    VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT |
-    VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
-
-  VkRenderPassCreateInfo render_pass_info{};
-  render_pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
-  render_pass_info.pNext = nullptr;
-  render_pass_info.flags = 0;
-  render_pass_info.attachmentCount = attachments.size();
-  render_pass_info.pAttachments = attachments.data();
-  render_pass_info.subpassCount = 1;
-  render_pass_info.pSubpasses = &subpass;
-  render_pass_info.dependencyCount = 1;
-  render_pass_info.pDependencies = &dependency;
-
-  if(vkCreateRenderPass(
-       cg_core.vk_device_with_swapchain->device, &render_pass_info,
-       nullptr, &self->render_pass) != VK_SUCCESS)
-    throw CommandError{"Failed to create Vulkan Render Pass 2D."};
-}
-
-static void
-unload_render_pass(void *obj)
-{
-  auto self = static_cast<VK::GraphicsPipeline2DSolidLayout*>(obj);
-
-  vkDestroyRenderPass(
-    cg_core.vk_device_with_swapchain->device, self->render_pass, nullptr);
-}
-
 const CommandChain loader{
-  {&load_pipeline, &unload_pipeline},
-  {&load_render_pass, &unload_render_pass}
+  {&load_pipeline, &unload_pipeline}
 };
 
 }