From 4f80ffd830c0619f2058781193620a312758b3f3 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Tue, 9 Aug 2022 13:30:31 +0100
Subject: [PATCH] [vulkan] Use surface creation from wsi interface

---
 src/vulkan/vulkan_presenter.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/vulkan/vulkan_presenter.cpp b/src/vulkan/vulkan_presenter.cpp
index b8c2d1225..5725b3644 100644
--- a/src/vulkan/vulkan_presenter.cpp
+++ b/src/vulkan/vulkan_presenter.cpp
@@ -2,6 +2,8 @@
 
 #include "../dxvk/dxvk_format.h"
 
+#include "../wsi/wsi_window.h"
+
 namespace dxvk::vk {
 
   Presenter::Presenter(
@@ -416,16 +418,8 @@ namespace dxvk::vk {
 
 
   VkResult Presenter::createSurface() {
-    HINSTANCE instance = reinterpret_cast<HINSTANCE>(
-      GetWindowLongPtr(m_window, GWLP_HINSTANCE));
-    
-    VkWin32SurfaceCreateInfoKHR info = { VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR };
-    info.hinstance  = instance;
-    info.hwnd       = m_window;
-    
-    VkResult status = m_vki->vkCreateWin32SurfaceKHR(
-      m_vki->instance(), &info, nullptr, &m_surface);
-    
+    VkResult status = wsi::createSurface(m_window, m_vki, &m_surface);
+
     if (status != VK_SUCCESS)
       return status;