https://vulkan-tutorial.com/en/Drawing_a_triangle/Graphics_pipeline_basics/Shader_modules

Reached shader lessons. Stopping to refactor code.

main.cpp

@@ -1,7 +1,11 @@
 
 #include "Logger.h"
 #include "VulkanInstanceManager.h"
+#include "VulkanDeviceManager.h"
+#include "VulkanDebugManager.h"
 #include "GlfwWindowManager.h"
+#include "VulkanGraphicsPipeline.h"
+// #include "VulkanContext.h"
 
 struct AppConfig
 {
@@ -19,41 +23,59 @@ class HelloTriangleApplication
 public:
 	void Run()
 	{
-		InitGlfw();
-		InitVulkan();
+		Initialization();
 		MainLoop();
 		Cleanup();
 	}
 
 private:
-	VulkanInstanceManager VkInstanceManager;
-	GlfwWindowManager	  GlfwWindowManager;
-	AppConfig			  Settings = {};
+	AppConfig Settings = {};
+
+	VulkanInstanceManager InstanceManager;
+	GlfwWindowManager	  WindowManager;
+
+	void Initialization()
+	{
+		InitGlfw();
+		InitVulkan();
+		InstanceManager.SetupDebug();
+		WindowManager.CreateSurface(InstanceManager.GetInstance());
+		InstanceManager.SetupDevice();
+	}
 
 	void InitVulkan()
 	{
-		FVulkanConfig Config = { Settings.bValidationEnabled, Settings.bVerboseLogging };
-		VkInstanceManager.Initialize(Config);
+		FVulkanConfig Config = {
+			Settings.bValidationEnabled,
+			Settings.bVerboseLogging
+		};
+		InstanceManager.Initialize(Config);
 	}
 
 	void InitGlfw()
 	{
-		FWindowConfig Config = { Settings.Title, Settings.Width, Settings.Height, Settings.bResizable, Settings.bFullscreen };
-		GlfwWindowManager.Initialize(Config);
+		FWindowConfig Config = {
+			Settings.Title,
+			Settings.Width,
+			Settings.Height,
+			Settings.bResizable,
+			Settings.bFullscreen
+		};
+		WindowManager.Initialize(Config);
 	}
 
 	void MainLoop()
 	{
-		while (!GlfwWindowManager.ShouldClose())
+		while (!WindowManager.ShouldClose())
 		{
-			GlfwWindowManager.PollEvents();
+			WindowManager.PollEvents();
 		}
 	}
 
 	void Cleanup()
 	{
-		// VkInstanceManager.Cleanup();
-		// GlfwWindowManager.Cleanup();
+		WindowManager.Cleanup(InstanceManager.GetInstance());
+		InstanceManager.Cleanup();
 	}
 };