Shifted Vulkan window surface creation into renderer

Author: jonjondev

engine/render/renderer/Renderer.cpp

@@ -26,11 +26,14 @@ Renderer::Renderer(Window& window) : window {window}
 
     if (instance == nullptr) instance = this;
 
-    auto extent = window.GetExtents();
+    auto createWindowSurface = [&window](VkInstance instance, VkSurfaceKHR* surface) -> bool {
+        return glfwCreateWindowSurface(instance, window.GetGlfwWindow(), nullptr, surface) == VK_SUCCESS;
+    };
 
+    auto extent = window.GetExtents();
     context.Init({extent.width, extent.height},
                  Window::GetRequiredExtensions,
-                 Window::CreateWindowSurface);
+                 createWindowSurface);
 
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1024);
     DescriptorPool::AddPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1024);

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

@@ -25,7 +25,7 @@ Context::~Context()
 
 void Context::Init(const Utils::Extent2D& extent,
                    Instance::GetSurfaceExtensionsCallback surfaceExtensionsCallback,
-                   GetWindowSurfaceCallBack windowSurfaceCallback)
+                   const GetWindowSurfaceCallBack& windowSurfaceCallback)
 {
     CC_ASSERT(volkInitialize() == VK_SUCCESS, "Unable to initialise Volk!")
 

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

@@ -20,15 +20,15 @@ class Context
 {
 public:
 
-    typedef bool (*getSurfaceCallback)(VkInstance, Surface*);
+    typedef std::function<bool(VkInstance, VkSurfaceKHR*)> getSurfaceCallback;
     typedef getSurfaceCallback GetWindowSurfaceCallBack;
 
     Context() = default;
     ~Context();
 
     void Init(const Utils::Extent2D& extent,
               Instance::GetSurfaceExtensionsCallback surfaceExtensionsCallback,
-              GetWindowSurfaceCallBack windowSurfaceCallback);
+              const GetWindowSurfaceCallBack& windowSurfaceCallback);
 
     static Context& Get();
 

engine/render/window/Window.cpp

@@ -24,11 +24,6 @@ bool Window::WindowShouldClose()
     return glfwWindowShouldClose(window);
 }
 
-bool Window::CreateWindowSurface(VkInstance instance, VkSurfaceKHR* surface)
-{
-    return glfwCreateWindowSurface(instance, window, nullptr, surface) == VK_SUCCESS;
-}
-
 MHArray<const char*> Window::GetRequiredExtensions()
 {
     uint32_t glfwExtensionCount = 0;

engine/render/window/Window.h

@@ -9,8 +9,6 @@
 #ifndef SIEGE_ENGINE_RENDERER_WINDOW_H
 #define SIEGE_ENGINE_RENDERER_WINDOW_H
 
-#include <volk/volk.h>
-
 #include <cstdint>
 
 #include <GLFW/glfw3.h>
@@ -120,8 +118,6 @@ class Window
 
     bool WindowShouldClose();
 
-    static bool CreateWindowSurface(VkInstance instance, VkSurfaceKHR* surface);
-
     bool WasResized() const
     {
         return wasResized;