Move some initialisation from Instance.Init() to GraphicsCore Init()

Author: VReaperV

src/engine/renderer-vulkan/GraphicsCore/Init.cpp

@@ -37,17 +37,65 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../Shared/Timer.h"
 
+#include "../Error.h"
+
 #include "../Thread/TaskList.h"
 #include "../Sync/Fence.h"
 
 #include "GraphicsCoreStore.h"
 #include "Instance.h"
 
+#include "PhysicalDevice.h"
+
+#include "EngineConfig.h"
+
+#include "Memory/DescriptorSet.h"
+#include "Memory/EngineAllocator.h"
+#include "ResourceSystem.h"
+
 #include "Init.h"
 
+#include "SwapChain.h"
+#include "Vulkan.h"
+
 #include "Memory/CoreThreadMemory.h"
 void InitGraphicsEngine() {
 	instance.Init( "Daemon-vulkan", CLIENT_WINDOW_TITLE );
+
+	std::string foundQueues = "Found queues: graphics (present: true)";
+	graphicsQueue.Init( device, queuesConfig.graphicsQueue.id, queuesConfig.graphicsQueue.queueCount );
+
+	uint32 presentSupported;
+	vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queuesConfig.graphicsQueue.id, mainSwapChain.surface, &presentSupported );
+
+	if ( !presentSupported ) {
+		Err( "Graphics queue doesn't support present" );
+		return;
+	}
+
+	uint32 presentSupported;
+	if ( queuesConfig.computeQueue.unique ) {
+		computeQueue.Init( device, queuesConfig.computeQueue.id, queuesConfig.computeQueue.queueCount );
+		vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queuesConfig.computeQueue.id, mainSwapChain.surface, &presentSupported );
+		foundQueues += Str::Format( ", async compute (present: %s)", ( bool ) presentSupported );
+	}
+
+	if ( queuesConfig.transferQueue.unique ) {
+		transferQueue.Init( device, queuesConfig.transferQueue.id, queuesConfig.transferQueue.queueCount );
+		foundQueues += Str::Format( ", async transfer" );
+	}
+
+	if ( queuesConfig.sparseQueue.unique ) {
+		sparseQueue.Init( device, queuesConfig.sparseQueue.id, queuesConfig.sparseQueue.queueCount );
+		foundQueues += Str::Format( ", async sparse binding" );
+	}
+
+	Log::Notice( foundQueues );
+
+	AllocDescriptors( engineConfig.maxImages, engineConfig.maxStorageImages );
+
+	engineAllocator.Init();
+
 	InitCmdPools();
 
 	FenceMain initExecCmdFence;

src/engine/renderer-vulkan/GraphicsCore/Instance.cpp

@@ -40,25 +40,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../Error.h"
 
-#include "Vulkan.h"
 #include "../VulkanLoader/VulkanLoadFunctions.h"
 
-#include "SwapChain.h"
+#include "Vulkan.h"
 
 #include "CapabilityPack.h"
-#include "EngineConfig.h"
-#include "QueuesConfig.h"
 #include "PhysicalDevice.h"
-#include "Queue.h"
+#include "SwapChain.h"
+#include "QueuesConfig.h"
 
 #include "GraphicsCoreStore.h"
 
-#include "Memory/DescriptorSet.h"
-#include "Memory/EngineAllocator.h"
-
 #include "Instance.h"
 
-
 void Instance::Init( const char* engineName, const char* appName ) {
 	VkApplicationInfo appInfo {
 		.pApplicationName   = appName,
@@ -123,37 +117,4 @@ void Instance::Init( const char* engineName, const char* appName ) {
 	VulkanLoadDeviceFunctions( device );
 
 	mainSwapChain.Init( instance );
-
-	std::string foundQueues = "Found queues: graphics (present: true)";
-	graphicsQueue.Init( device, queuesConfig.graphicsQueue.id, queuesConfig.graphicsQueue.queueCount );
-
-	uint32 presentSupported;
-	vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queuesConfig.graphicsQueue.id, mainSwapChain.surface, &presentSupported );
-
-	if ( !presentSupported ) {
-		Err( "Graphics queue doesn't support present" );
-		return;
-	}
-
-	if( queuesConfig.computeQueue.unique ) {
-		computeQueue.Init(  device, queuesConfig.computeQueue.id,  queuesConfig.computeQueue.queueCount );
-		vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queuesConfig.computeQueue.id, mainSwapChain.surface, &presentSupported );
-		foundQueues += Str::Format( ", async compute (present: %s)", ( bool ) presentSupported );
-	}
-
-	if ( queuesConfig.transferQueue.unique ) {
-		transferQueue.Init( device, queuesConfig.transferQueue.id, queuesConfig.transferQueue.queueCount );
-		foundQueues += Str::Format( ", async transfer" );
-	}
-
-	if ( queuesConfig.sparseQueue.unique ) {
-		sparseQueue.Init(   device, queuesConfig.sparseQueue.id,   queuesConfig.sparseQueue.queueCount );
-		foundQueues += Str::Format( ", async sparse binding" );
-	}
-
-	Log::Notice( foundQueues );
-
-	AllocDescriptors( engineConfig.maxImages, engineConfig.maxStorageImages );
-
-	engineAllocator.Init();
 }