refa Move layouts away from graphics pipelines

1 files changed, 43 insertions, 150 deletions

diff --git a/src/core.cpp b/src/core.cpp
index 2ad14bd..46fb6eb 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -452,154 +452,43 @@ unload_vk_swapchain(void *obj)
 }
 
 static void
-load_vk_render_pass_3d(void *obj)
-{
-  std::array<VkAttachmentDescription, 2> 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_CLEAR;
-  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_UNDEFINED;
-  attachments[0].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-  // Depth attachment.
-  attachments[1].flags = 0;
-  attachments[1].format = VK_FORMAT_D32_SFLOAT;
-  attachments[1].samples = VK_SAMPLE_COUNT_1_BIT;
-  attachments[1].loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
-  attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-  attachments[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
-  attachments[1].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
-  attachments[1].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-  attachments[1].finalLayout =
-      VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
-
-  VkAttachmentReference color_attachment_ref{};
-  color_attachment_ref.attachment = 0;
-  color_attachment_ref.layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
-  VkAttachmentReference depth_attachment_ref{};
-  depth_attachment_ref.attachment = 1;
-  depth_attachment_ref.layout =
-    VK_IMAGE_LAYOUT_DEPTH_STENCIL_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 = &depth_attachment_ref;
-  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, &cg_core.vk_render_pass_3d) != VK_SUCCESS)
-    throw CommandError{"Failed to create Vulkan Render Pass 3D."};
-}
-
-static void
-unload_vk_render_pass_3d(void *obj)
-{
-  vkDestroyRenderPass(
-    cg_core.vk_device_with_swapchain->device, cg_core.vk_render_pass_3d,
-    nullptr);
-}
-
-static void
-load_vk_render_pass_2d(void *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_PRESENT_SRC_KHR;
-
-  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, &cg_core.vk_render_pass_2d) != VK_SUCCESS)
-    throw CommandError{"Failed to create Vulkan Render Pass 2D."};
-}
-
-static void
-unload_vk_render_pass_2d(void *obj)
-{
-  vkDestroyRenderPass(
-    cg_core.vk_device_with_swapchain->device, cg_core.vk_render_pass_2d,
-    nullptr);
+load_vk_graphics_pipeline_3d_layout(void *obj)
+{
+  try
+  {
+    cg_core.vk_graphics_pipeline_3d_layout =
+      new VK::GraphicsPipeline3DLayout();
+  }
+  catch(const CommandError &e)
+  {
+    throw CommandError{"Failed to create 3d graphics pipeline."};
+  }
+}
+
+static void
+unload_vk_graphics_pipeline_3d_layout(void *obj)
+{
+  delete cg_core.vk_graphics_pipeline_3d_layout;
+}
+
+static void
+load_vk_graphics_pipeline_2d_layout(void *obj)
+{
+  try
+  {
+    cg_core.vk_graphics_pipeline_2d_layout =
+      new VK::GraphicsPipeline2DLayout();
+  }
+  catch(const CommandError &e)
+  {
+    throw CommandError{"Failed to create 2d graphics pipeline."};
+  }
+}
+
+static void
+unload_vk_graphics_pipeline_2d_layout(void *obj)
+{
+  delete cg_core.vk_graphics_pipeline_2d_layout;
 }
 
 static void
@@ -697,10 +586,14 @@ const CommandChain cg_sCore::loader{
 #endif
   {&load_vk_devices, &unload_vk_devices},
   {&load_vk_swapchain, &unload_vk_swapchain},
-  {&load_vk_render_pass_3d, &unload_vk_render_pass_3d},
-  {&load_vk_render_pass_2d, &unload_vk_render_pass_2d},
+
+  {&load_vk_graphics_pipeline_3d_layout,
+   &unload_vk_graphics_pipeline_3d_layout},
+  {&load_vk_graphics_pipeline_2d_layout,
+   &unload_vk_graphics_pipeline_2d_layout},
   {&load_vk_graphics_pipeline_3d, &unload_vk_graphics_pipeline_3d},
   {&load_vk_graphics_pipeline_2d, &unload_vk_graphics_pipeline_2d},
+
   {&load_vk_renderer, &unload_vk_renderer},
   {&load_mruby, &unload_mruby},
   {&load_mruby_symbols, nullptr}