Add featuresConfig to GraphicsCoreStore, clean-up & fixes

Author: VReaperV

src/engine/renderer-vulkan/GraphicsCore/Decls.h

@@ -55,6 +55,8 @@ struct VkAllocationCallbacks;
 
 struct Semaphore;
 
+struct VkPhysicalDeviceProperties2;
+struct VkPhysicalDeviceFeatures2;
 struct VkDeviceCreateInfo;
 
 VK_DEFINE_HANDLE( VkInstance );

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

@@ -41,6 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "SwapChain.h"
 
+#include "FeaturesConfig.h"
 #include "EngineConfig.h"
 #include "QueuesConfig.h"
 #include "Queue.h"
@@ -55,8 +56,9 @@ Instance instance;
 
 SwapChain mainSwapChain;
 
-EngineConfig engineConfig;
-QueuesConfig queuesConfig;
+FeaturesConfig featuresConfig;
+EngineConfig   engineConfig;
+QueuesConfig   queuesConfig;
 
 VkPhysicalDevice physicalDevice;
 

src/engine/renderer-vulkan/GraphicsCore/GraphicsCoreStore.h

@@ -44,8 +44,9 @@ extern Instance instance;
 
 extern SwapChain mainSwapChain;
 
-extern EngineConfig engineConfig;
-extern QueuesConfig queuesConfig;
+extern FeaturesConfig featuresConfig;
+extern EngineConfig   engineConfig;
+extern QueuesConfig   queuesConfig;
 
 extern VkPhysicalDevice physicalDevice;
 

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

@@ -73,7 +73,6 @@ void InitGraphicsEngine() {
 		return;
 	}
 
-	uint32 presentSupported;
 	if ( queuesConfig.computeQueue.unique ) {
 		computeQueue.Init( device, queuesConfig.computeQueue.id, queuesConfig.computeQueue.queueCount );
 		vkGetPhysicalDeviceSurfaceSupportKHR( physicalDevice, queuesConfig.computeQueue.id, mainSwapChain.surface, &presentSupported );

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

@@ -46,6 +46,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "QueuesConfig.h"
 #include "CapabilityPack.h"
 
+#include "GraphicsCoreStore.h"
+
 #include "PhysicalDevice.h"
 
 #include "FeaturesConfig.h"
@@ -154,9 +156,8 @@ void CreateDevice( const VkPhysicalDevice& physicalDevice, EngineConfig& config,
 		queueInfo.pQueuePriorities = priorities.memory;
 	}
 
-	FeaturesConfig cfgF           = GetPhysicalDeviceFeatures( physicalDevice, config );
-	FeaturesConfig cfgOut;
-	DynamicArray<const char*> ext = GetCapabilityPackFeatures( ( CapabilityPackType::Type ) config.capabilityPack, cfgF, &cfgOut );
+	FeaturesConfig cfg            = GetPhysicalDeviceFeatures( physicalDevice, config );
+	DynamicArray<const char*> ext = GetCapabilityPackFeatures( ( CapabilityPackType::Type ) config.capabilityPack, cfg, &featuresConfig );
 
 	VkDeviceCreateInfo info {
 		.queueCreateInfoCount    = queuesConfig.count,
@@ -165,7 +166,7 @@ void CreateDevice( const VkPhysicalDevice& physicalDevice, EngineConfig& config,
 		.ppEnabledExtensionNames = ext.memory
 	};
 
-	VkResult res                  = ( VkResult ) CreatePhysicalDevice( info, nullptr, config, cfgOut, device );
+	VkResult res                  = ( VkResult ) CreatePhysicalDevice( info, nullptr, config, featuresConfig, device );
 	Q_UNUSED( res );
 	Q_UNUSED( config );
 }