Rendering pipeline

editor/src/main.cpp

@@ -5,7 +5,10 @@
 #include <logger/log.hpp>
 
 int main() {
+	// We don't want to initialize the logger in release mode.
+#ifndef GEN_NDEBUG
 	auto logger = gen::logger::Instance{}; // Required to initialize the logger
+#endif
 
 	gen::Application app;
 

engine/CMakeLists.txt

@@ -9,8 +9,9 @@ add_library(genesis::lib ALIAS genesis)
 
 target_compile_definitions(genesis
         PUBLIC
-        $<$<CONFIG:Debug>:GENESIS_DEBUG>
-        $<$<CONFIG:Release>:GENESIS_NDEBUG>
+        $<$<CONFIG:Debug>:GEN_DEBUG>
+        $<$<CONFIG:RelWithDebInfo>:GEN_DEBUG>
+        $<$<CONFIG:Release>:GEN_NDEBUG>
         )
 
 if (GENESIS_ENABLE_SIMD)

engine/include/graphics/device.hpp

@@ -42,7 +42,7 @@ namespace gen
 		GraphicsDevice& operator=(GraphicsDevice&&) = delete;
 
 
-#if defined(NDEBUG) || defined(GEN_NDEBUG)
+#if defined(GEN_NDEBUG)
 		static constexpr bool enableValidationLayers = false;
 #else
 		static constexpr bool enableValidationLayers = true;
@@ -98,19 +98,19 @@ namespace gen
 							std::vector<std::string> const & extensions,
 							u32 const & apiVersion
 		);
-		/*
-		void createDebugMessenger();
-		void createSurface();
-		void pickPhysicalDevice();
-		void createLogicalDevice();
-		void createCommandPool();
 
-		bool isDeviceSuitable(vk::PhysicalDevice device);
-		QueueFamilyIndices findQueueFamilies(vk::PhysicalDevice device);
-		bool checkDeviceExtensionSupport(vk::PhysicalDevice device);
-		SwapChainSupportDetails querySwapChainSupport(vk::PhysicalDevice device);
+		//void createDebugMessenger();
+		//void createSurface();
+		//void pickPhysicalDevice();
+		//void createLogicalDevice();
+		//void createCommandPool();
+
+		//bool isDeviceSuitable(const vk::PhysicalDevice & device);
+		//QueueFamilyIndices findQueueFamilies(vk::PhysicalDevice device);
+		//bool checkDeviceExtensionSupport(vk::PhysicalDevice device);
+		//SwapChainSupportDetails querySwapChainSupport(vk::PhysicalDevice device);
+
 
-*/
 
 		vk::Instance m_instance;
 		vk::DebugUtilsMessengerEXT m_debugMessenger;
@@ -126,8 +126,8 @@ namespace gen
 
 		Window &m_window; // NOLINT(cppcoreguidelines-avoid-const-or-ref-data-members)
 
-		const std::vector<const char *> validationLayers = {"VK_LAYER_KHRONOS_validation"};
-		const std::vector<const char *> deviceExtensions = {VK_KHR_SWAPCHAIN_EXTENSION_NAME};
+		const std::vector<std::string> validationLayers = {"VK_LAYER_KHRONOS_validation"};
+		const std::vector<std::string> deviceExtensions = {VK_KHR_SWAPCHAIN_EXTENSION_NAME};
 
 
 	};

engine/include/graphics/vkHelpers.hpp

@@ -21,20 +21,20 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debugUtilsMessengerCallback( VkDebugUtilsMessageS
 														   void * /*pUserData*/ );
 
     std::vector<char const*> gatherExtensions(std::vector<std::string> const& extensions
-    #if !defined(NDEBUG) || !defined(GEN_NDEBUG)
+    #ifndef GEN_NDEBUG
                                               ,
                                               std::vector<vk::ExtensionProperties> const& extensionProperties
     #endif
     );
 
     std::vector<char const*> gatherLayers(std::vector<std::string> const& layers
-    #if !defined(NDEBUG) || !defined(GEN_NDEBUG)
+    #ifndef GEN_NDEBUG
                                           ,
                                           std::vector<vk::LayerProperties> const& layerProperties
     #endif
     );
 
-#if defined(NDEBUG) || defined(GEN_NDEBUG)
+#ifdef GEN_NDEBUG
     vk::StructureChain<vk::InstanceCreateInfo>
 #else
     vk::StructureChain<vk::InstanceCreateInfo, vk::DebugUtilsMessengerCreateInfoEXT>
@@ -45,7 +45,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debugUtilsMessengerCallback( VkDebugUtilsMessageS
 
 	vk::DebugUtilsMessengerCreateInfoEXT makeDebugUtilsMessengerCreateInfoEXT();
 
-	bool checkValidationLayerSupport(const std::vector<const char*>& validationLayers);
+	bool checkValidationLayerSupport(const std::vector<std::string>& validationLayers);
 
 	bool checkDeviceExtensionSupport(vk::PhysicalDevice device, const std::vector<const char*>& deviceExtensions);
 

engine/src/graphics/device.cpp

@@ -11,14 +11,15 @@ namespace gen
 
 	GraphicsDevice::GraphicsDevice(gen::Window & window) : m_window{window}
 	{
-		createInstance(window.getTitle(), "Genesis Engine", {}, {}, VK_API_VERSION_1_0);
-		/*
-	    createDebugMessenger();
-        createSurface();
-		pickPhysicalDevice();
-		createLogicalDevice();
-		createCommandPool();
-		 */
+		// TODO: Allow for the vulkan api to be specified in a config file or through command line arguments.
+		// We could also dynamically check for the highest supported version of the vulkan api, but that feels outside the scope of this project.
+		createInstance(window.getTitle(), "Genesis Engine", validationLayers, {}, VK_API_VERSION_1_0);
+
+	    //createDebugMessenger();
+        //createSurface();
+		//pickPhysicalDevice();
+		//createLogicalDevice();
+		//createCommandPool();
 	}
 
 	GraphicsDevice::~GraphicsDevice()
@@ -41,6 +42,7 @@ namespace gen
 		auto vkGetInstanceProcAddr = vkdl.getProcAddress<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
 		VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);
 #endif
+
 		if (enableValidationLayers) //NOLINT validation layers are enabled conditionally and this trips up clang-tidy
         {
 			if (!vk::util::checkValidationLayerSupport(validationLayers))
@@ -50,6 +52,7 @@ namespace gen
 			}
         }
 
+		// TODO: Allow for the application to be able to specify its version itself. Instead of just using the engine version.
 		vk::ApplicationInfo const appInfo(
 			appName.c_str(),
 			gen::version_v.getVersion(),
@@ -60,14 +63,14 @@ namespace gen
 		vk::InstanceCreateInfo const createInfo({}, &appInfo);
 
 		auto enabledLayers = vk::util::gatherLayers(layers
-#if !defined(NDEBUG) || !defined(GEN_NDEBUG)
+#ifndef GEN_NDEBUG
 													,
 													vk::enumerateInstanceLayerProperties()
 #endif
 		);
 
 		auto enabledExtensions = vk::util::gatherExtensions(extensions
-#if !defined(NDEBUG) || !defined(GEN_NDEBUG)
+#ifndef GEN_NDEBUG
 															,
 															vk::enumerateInstanceExtensionProperties()
 #endif
@@ -80,7 +83,53 @@ namespace gen
 		VULKAN_HPP_DEFAULT_DISPATCHER.init(m_instance);
 #endif
 	}
-/*
+
+	/*
+	QueueFamilyIndices GraphicsDevice::findQueueFamilies(vk::PhysicalDevice device)
+	{
+		QueueFamilyIndices indices;
+
+		std::vector<vk::QueueFamilyProperties> const queueFamilies = device.getQueueFamilyProperties();
+
+		gen::u32 index = 0;
+		for (const auto & queueFamily : queueFamilies)
+		{
+			if (queueFamily.queueFlags & vk::QueueFlagBits::eGraphics)
+			{
+				indices.graphicsFamily = index;
+			}
+
+			vk::Bool32 const presentSupport = device.getSurfaceSupportKHR(index, m_surface);
+			if (presentSupport != 0U)
+			{
+				indices.presentFamily = index;
+			}
+
+			if (indices.isComplete())
+			{
+				break;
+			}
+
+			index++;
+		}
+
+		return indices;
+	}
+
+	bool GraphicsDevice::checkDeviceExtensionSupport(vk::PhysicalDevice device)
+	{
+		std::vector<vk::ExtensionProperties> const availableExtensions = device.enumerateDeviceExtensionProperties();
+
+		std::set<std::string> requiredExtensions(deviceExtensions.begin(), deviceExtensions.end());
+
+		for (const auto & extension : availableExtensions)
+		{
+			requiredExtensions.erase(extension.extensionName.data());
+		}
+
+		return requiredExtensions.empty();
+	}
+
 
 	void GraphicsDevice::createDebugMessenger()
 	{
@@ -89,6 +138,24 @@ namespace gen
 #endif
 	}
 
+	bool GraphicsDevice::isDeviceSuitable(const vk::PhysicalDevice & device)
+	{
+		QueueFamilyIndices const indices = findQueueFamilies(device);
+
+		bool const extensionsSupported = checkDeviceExtensionSupport(device);
+
+		bool swapChainAdequate = false;
+		if (extensionsSupported)
+		{
+			SwapChainSupportDetails const swapChainSupport = querySwapChainSupport(device);
+			swapChainAdequate = !swapChainSupport.formats.empty() && !swapChainSupport.presentModes.empty();
+		}
+
+		return indices.isComplete() && extensionsSupported && swapChainAdequate;
+	}
+	*/
+	/*
+
 	void GraphicsDevice::createSurface()
     {
         m_surface = m_window.createWindowSurface(m_instance);
@@ -120,6 +187,9 @@ namespace gen
         }
 	}
 
+*/
+
+	/*
 	void GraphicsDevice::createLogicalDevice()
 	{
 		QueueFamilyIndices indices = findQueueFamilies(m_physicalDevice);
@@ -153,65 +223,10 @@ namespace gen
 
         m_commandPool = m_device.createCommandPool(poolInfo);
     }
-	bool GraphicsDevice::isDeviceSuitable(vk::PhysicalDevice device)
-	{
-		QueueFamilyIndices const indices = findQueueFamilies(device);
-
-        bool const extensionsSupported = checkDeviceExtensionSupport(device);
-
-        bool swapChainAdequate = false;
-        if (extensionsSupported)
-        {
-            SwapChainSupportDetails const swapChainSupport = querySwapChainSupport(device);
-            swapChainAdequate = !swapChainSupport.formats.empty() && !swapChainSupport.presentModes.empty();
-        }
-
-        return indices.isComplete() && extensionsSupported && swapChainAdequate;
-	}
-	bool GraphicsDevice::checkDeviceExtensionSupport(vk::PhysicalDevice device)
-	{
-        std::vector<vk::ExtensionProperties> const availableExtensions = device.enumerateDeviceExtensionProperties();
 
-        std::set<std::string> requiredExtensions(deviceExtensions.begin(), deviceExtensions.end());
 
-        for (const auto & extension : availableExtensions)
-        {
-            requiredExtensions.erase(extension.extensionName.data());
-        }
 
-        return requiredExtensions.empty();
-	}
 
-	QueueFamilyIndices GraphicsDevice::findQueueFamilies(vk::PhysicalDevice device)
-	{
-		QueueFamilyIndices indices;
-
-        std::vector<vk::QueueFamilyProperties> const queueFamilies = device.getQueueFamilyProperties();
-
-        gen::u32 index = 0;
-        for (const auto & queueFamily : queueFamilies)
-        {
-            if (queueFamily.queueFlags & vk::QueueFlagBits::eGraphics)
-            {
-                indices.graphicsFamily = index;
-            }
-
-            vk::Bool32 const presentSupport = device.getSurfaceSupportKHR(index, m_surface);
-            if (presentSupport != 0U)
-            {
-                indices.presentFamily = index;
-            }
-
-            if (indices.isComplete())
-            {
-                break;
-            }
-
-			index++;
-        }
-
-        return indices;
-	}
 
 	SwapChainSupportDetails GraphicsDevice::querySwapChainSupport(vk::PhysicalDevice device)
 	{

engine/src/graphics/pipeline.cpp

@@ -46,17 +46,18 @@ namespace gen {
 
 	void GraphicsPipeline::createGraphicsPipeline()
 	{
-        auto vertShaderCode = readFile("shaders/vert.spv");
-		auto fragShaderCode = readFile("shaders/frag.spv");
+        //auto vertShaderCode = readFile("shaders/vert.spv");
+		//auto fragShaderCode = readFile("shaders/frag.spv");
 
-		gen::logger::debug("graphics", "vertShaderCode size: " + std::to_string(vertShaderCode.size()));
-		gen::logger::debug("graphics", "fragShaderCode size: " + std::to_string(fragShaderCode.size()));
+		//gen::logger::debug("graphics", "vertShaderCode size: " + std::to_string(vertShaderCode.size()));
+		//gen::logger::debug("graphics", "fragShaderCode size: " + std::to_string(fragShaderCode.size()));
     }
 
 	void GraphicsPipeline::destroyGraphicsPipeline()
 	{
 
 	}
+
 	void GraphicsPipeline::createShaderModule(const std::vector<char> & code, vk::ShaderModule * shaderModule)
 	{
 		m_vertShaderModule = vk::util::createShaderModule(m_device.getDevice(), vk::ShaderStageFlagBits::eVertex, code.data());