1 files changed, 13 insertions, 12 deletions

diff --git a/src/blucat/graphics_pipeline_2d_solid.cpp b/src/blucat/graphics_pipeline_2d_solid.cpp
index 28b19b6..afd8a2e 100644
--- a/src/blucat/graphics_pipeline_2d_solid.cpp
+++ b/src/blucat/graphics_pipeline_2d_solid.cpp
@@ -18,7 +18,7 @@
 
 #include <array>
 
-#include "../core.hpp"
+#include "core.hpp"
 #include "sprite.hpp"
 #include "uniform_data_object.hpp"
 
@@ -37,7 +37,7 @@ load_pipeline(void *obj)
   vert_shader_stage_info.flags = 0;
   vert_shader_stage_info.stage = VK_SHADER_STAGE_VERTEX_BIT;
   vert_shader_stage_info.module =
-    cg_core.vk_device_with_swapchain->vert2d_solid_shader_module;
+    BluCat::core.vk_device_with_swapchain->vert2d_solid_shader_module;
   vert_shader_stage_info.pName = "main";
   vert_shader_stage_info.pSpecializationInfo = nullptr;
 
@@ -48,7 +48,7 @@ load_pipeline(void *obj)
   frag_shader_stage_info.flags = 0;
   frag_shader_stage_info.stage = VK_SHADER_STAGE_FRAGMENT_BIT;
   frag_shader_stage_info.module =
-    cg_core.vk_device_with_swapchain->frag2d_solid_shader_module;
+    BluCat::core.vk_device_with_swapchain->frag2d_solid_shader_module;
   frag_shader_stage_info.pName = "main";
   frag_shader_stage_info.pSpecializationInfo = nullptr;
 
@@ -91,14 +91,14 @@ load_pipeline(void *obj)
   VkViewport viewport = {};
   viewport.x = 0;
   viewport.y = 0;
-  viewport.width = cg_core.display_width;
-  viewport.height = cg_core.display_height;
+  viewport.width = BluCat::core.display_width;
+  viewport.height = BluCat::core.display_height;
   viewport.minDepth = 0.0f;
   viewport.maxDepth = 1.0f;
 
   VkRect2D scissor = {};
   scissor.offset = {0, 0};
-  scissor.extent = {cg_core.display_width, cg_core.display_height};
+  scissor.extent = {BluCat::core.display_width, BluCat::core.display_height};
 
   VkPipelineViewportStateCreateInfo viewport_state = {};
   viewport_state.sType =
@@ -191,14 +191,14 @@ load_pipeline(void *obj)
   pipeline_info.pColorBlendState = &color_blending;
   pipeline_info.pDynamicState = &dynamic_state_info;
   pipeline_info.layout =
-    cg_core.vk_graphics_pipeline_2d_solid_layout->pipeline;
-  pipeline_info.renderPass = cg_core.vk_render_pass->pipeline_2d;
+    BluCat::core.vk_graphics_pipeline_2d_solid_layout->pipeline;
+  pipeline_info.renderPass = BluCat::core.vk_render_pass->pipeline_2d;
   pipeline_info.subpass = 0;
   pipeline_info.basePipelineHandle = VK_NULL_HANDLE;
   pipeline_info.basePipelineIndex = -1;
 
   if(vkCreateGraphicsPipelines(
-       cg_core.vk_device_with_swapchain->device, VK_NULL_HANDLE, 1,
+       BluCat::core.vk_device_with_swapchain->device, VK_NULL_HANDLE, 1,
        &pipeline_info, nullptr, &self->graphic_pipeline)
      != VK_SUCCESS)
     throw CommandError{"Failed to create graphics pipeline."};
@@ -210,7 +210,8 @@ unload_pipeline(void *obj)
   auto self = static_cast<BluCat::GraphicsPipeline2DSolid*>(obj);
 
   vkDestroyPipeline(
-    cg_core.vk_device_with_swapchain->device, self->graphic_pipeline, nullptr);
+    BluCat::core.vk_device_with_swapchain->device, self->graphic_pipeline,
+		nullptr);
 }
 
 const CommandChain loader{
@@ -276,7 +277,7 @@ GraphicsPipeline2DSolid::draw(
 
     vkCmdBindDescriptorSets(
       draw_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-      cg_core.vk_graphics_pipeline_2d_solid_layout->pipeline, 0,
+      core.vk_graphics_pipeline_2d_solid_layout->pipeline, 0,
       vk_descriptor_sets.size(), vk_descriptor_sets.data(), 0, nullptr);
     vkCmdBindVertexBuffers(
       draw_command_buffer, 0, 1, &sprite_to_draw.sprite->vertex_buffer->buffer,
@@ -285,7 +286,7 @@ GraphicsPipeline2DSolid::draw(
     UDOVector4D position{sprite_to_draw.position};
     vkCmdPushConstants(
       draw_command_buffer,
-      cg_core.vk_graphics_pipeline_2d_solid_layout->pipeline,
+      core.vk_graphics_pipeline_2d_solid_layout->pipeline,
       VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(UDOVector4D), &position);
     vkCmdDraw(draw_command_buffer, Sprite::vertex_count, 1, 0, 0);
   }