Removed Vulkan dependency on window module

Author: jonjondev

engine/render/renderer/Renderer.h

@@ -17,7 +17,7 @@
 #include "render/renderer/platform/vulkan/CommandBuffer.h"
 #include "render/renderer/platform/vulkan/Context.h"
 #include "render/renderer/platform/vulkan/DescriptorPool.h"
-#include "renderer/Common.h"
+#include "renderer/CameraData.h"
 #include "renderer/Renderer2D.h"
 #include "renderer/Renderer3D.h"
 

engine/render/renderer/platform/vulkan/Context.cpp

@@ -7,15 +7,19 @@
 //
 
 #define VOLK_IMPLEMENTATION
+#define GLFW_INCLUDE_VULKAN
 
 #include "Context.h"
 
-#include <GLFW/glfw3.h>
 #include <utils/Logging.h>
 
 #include "render/renderer/Renderer.h"
 #include "utils/TypeAdaptor.h"
 
+// clang-format off
+#include <GLFW/glfw3.h> // Must be final include
+// clang-format on
+
 namespace Siege::Vulkan
 {
 Context::~Context()
@@ -32,7 +36,10 @@ void Context::Init(Window& window)
 
     vulkanInstance = Instance(window.GetRequiredExtensions());
 
-    surface = (VkSurfaceKHR) Siege::Window::GetWindowSurface(window, vulkanInstance.GetInstance());
+    glfwCreateWindowSurface(vulkanInstance.GetInstance(),
+                            reinterpret_cast<GLFWwindow*>(window.GetRawWindow()),
+                            nullptr,
+                            &surface);
 
     CC_ASSERT(surface != VK_NULL_HANDLE, "Unable to create surface!")
 

engine/render/renderer/renderer/Common.h renamed to engine/render/renderer/renderer/CameraData.h

@@ -100,7 +100,7 @@ void Renderer3D::DrawQuad(const Vec3 position,
 
 void Renderer3D::Render(uint32_t currentFrame,
                         Vulkan::CommandBuffer& commandBuffer,
-                        CameraData cameraData)
+                        const CameraData& cameraData)
 {
     global3DData.cameraData = cameraData;
     uint64_t globalDataSize = sizeof(global3DData);

engine/render/renderer/renderer/Renderer3D.cpp

@@ -12,7 +12,7 @@
 #include "../lights/PointLight.h"
 #include "../model/Model.h"
 #include "BillboardRenderer.h"
-#include "Common.h"
+#include "CameraData.h"
 #include "DebugRenderer3D.h"
 #include "LightRenderer.h"
 #include "ModelRenderer.h"
@@ -71,7 +71,7 @@ class Renderer3D
 
     static void Render(uint32_t currentFrame,
                        Vulkan::CommandBuffer& commandBuffer,
-                       CameraData cameraData);
+                       const CameraData& cameraData);
     static void Flush();
 
     static void DestroyRenderer3D();

engine/render/renderer/renderer/Renderer3D.h

@@ -16,7 +16,7 @@ windowDepends := $(patsubst %.o, %.d, $(call rwildcard,$(windowBinDir)/,*.o))
 windowLibs := $(vendorDir)/glfw/build/src/libglfw3.a
 
 linkFlags += -l utils
-compileFlags += -I $(vendorDir)/glfw/include -I $(vendorDir)/vulkan/include
+compileFlags += -I $(vendorDir)/glfw/include
 
 # Build the static library
 $(windowLib): $(windowObjects)

engine/window/Makefile

@@ -115,11 +115,6 @@ MHArray<const char*> Window::GetRequiredExtensions()
     return Glfw::GetRequiredExtensions();
 }
 
-void* Window::GetWindowSurface(Window& window, void* instance)
-{
-    return Glfw::GetWindowSurface((Glfw::Window) window.GetRawWindow(), instance);
-}
-
 void Window::ToggleCursor(bool state)
 {
     state ? DisableCursor() : EnableCursor();

engine/window/Window.cpp

@@ -57,7 +57,6 @@ class Window
     void DisableCursor();
 
     static MHArray<const char*> GetRequiredExtensions();
-    static void* GetWindowSurface(Window& window, void* instance);
 
     void ToggleCursor(bool state);
 

engine/window/Window.h

@@ -8,7 +8,6 @@
 
 #include "Window.h"
 
-#define GLFW_INCLUDE_VULKAN
 #include <GLFW/glfw3.h>
 
 #include "window/Window.h"
@@ -99,13 +98,6 @@ MHArray<const char*> GetRequiredExtensions()
     return MHArray<const char*>(glfwExtensions, glfwExtensionCount);
 }
 
-void* GetWindowSurface(Window window, void* instance)
-{
-    VkSurfaceKHR surface = nullptr;
-    glfwCreateWindowSurface((VkInstance) instance, window, nullptr, &surface);
-    return surface;
-}
-
 void FreeWindow(Window window)
 {
     glfwDestroyWindow(window);

engine/window/platform/glfw/Window.cpp

@@ -45,7 +45,6 @@ void SetIsMouseMotionRaw(Window window, bool state);
 bool WindowShouldClose(Window window);
 
 MHArray<const char*> GetRequiredExtensions();
-void* GetWindowSurface(Window window, void* instance);
 
 void FreeWindow(Window window);
 void FreeGlfw();