1 files changed, 14 insertions, 15 deletions
diff --git a/src/vk/graphics_pipeline_2d_layout.cpp b/src/vk/graphics_pipeline_2d_layout.cpp
index f8822b9..6840f2c 100644
--- a/src/vk/graphics_pipeline_2d_layout.cpp
+++ b/src/vk/graphics_pipeline_2d_layout.cpp
@@ -24,7 +24,7 @@ namespace
 {
 
 void
-load_descriptor_set_layout_projection(void *obj)
+load_descriptor_set_view(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
@@ -45,23 +45,23 @@ load_descriptor_set_layout_projection(void *obj)
 
   if(vkCreateDescriptorSetLayout(
        cg_core.vk_device_with_swapchain->device, &layout_info, nullptr,
-       &self->descriptor_set_projection) != VK_SUCCESS)
+       &self->descriptor_set_view) != VK_SUCCESS)
     throw CommandError{
       "Failed to create Vulkan descriptor set layout for projection."};
 }
 
 void
-unload_descriptor_set_layout_projection(void *obj)
+unload_descriptor_set_view(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
   vkDestroyDescriptorSetLayout(
-    cg_core.vk_device_with_swapchain->device, self->descriptor_set_projection,
+    cg_core.vk_device_with_swapchain->device, self->descriptor_set_view,
     nullptr);
 }
 
 void
-load_descriptor_set_layout_sprite(void *obj)
+load_descriptor_set_sprite(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
@@ -95,22 +95,22 @@ load_descriptor_set_layout_sprite(void *obj)
 }
 
 void
-unload_descriptor_set_layout_sprite(void *obj)
+unload_descriptor_set_sprite(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
   vkDestroyDescriptorSetLayout(
-    cg_core.vk_device_with_swapchain->device,
-    self->descriptor_set_sprite, nullptr);
+    cg_core.vk_device_with_swapchain->device, self->descriptor_set_sprite,
+    nullptr);
 }
 
 void
-load_pipeline_layout(void *obj)
+load_pipeline(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
   std::array<VkDescriptorSetLayout, 2> set_layouts{
-    self->descriptor_set_projection, self->descriptor_set_sprite
+    self->descriptor_set_view, self->descriptor_set_sprite
   };
 
   VkPipelineLayoutCreateInfo pipeline_layout_info{};
@@ -127,7 +127,7 @@ load_pipeline_layout(void *obj)
 }
 
 void
-unload_pipeline_layout(void *obj)
+unload_pipeline(void *obj)
 {
   auto self = static_cast<VK::GraphicsPipeline2DLayout*>(obj);
 
@@ -207,10 +207,9 @@ unload_render_pass(void *obj)
 }
 
 const CommandChain loader{
-  {&load_descriptor_set_layout_projection,
-   &unload_descriptor_set_layout_projection},
-  {&load_descriptor_set_layout_sprite, &unload_descriptor_set_layout_sprite},
-  {&load_pipeline_layout, &unload_pipeline_layout},
+  {&load_descriptor_set_view, &unload_descriptor_set_view},
+  {&load_descriptor_set_sprite, &unload_descriptor_set_sprite},
+  {&load_pipeline, &unload_pipeline},
   {&load_render_pass, &unload_render_pass}
 };