From b875d49c850fb77e9b4fd3ea2470330b5814671f Mon Sep 17 00:00:00 2001 From: Joshua Ashton Date: Sun, 14 Aug 2022 16:57:14 +0000 Subject: [PATCH] [wsi] Move DxvkWindowState to wsi platform header --- src/wsi/win32/wsi_platform_win32.h | 16 ++++++++++++++++ src/wsi/wsi_platform.h | 5 +++++ src/wsi/wsi_window.h | 12 +----------- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 src/wsi/win32/wsi_platform_win32.h create mode 100644 src/wsi/wsi_platform.h diff --git a/src/wsi/win32/wsi_platform_win32.h b/src/wsi/win32/wsi_platform_win32.h new file mode 100644 index 000000000..d382f20ad --- /dev/null +++ b/src/wsi/win32/wsi_platform_win32.h @@ -0,0 +1,16 @@ +#pragma once + +#include + +namespace dxvk::wsi { + + /** + * \brief Impl-dependent state + */ + struct DxvkWindowState { + LONG style = 0; + LONG exstyle = 0; + RECT rect = { 0, 0, 0, 0 }; + }; + +} \ No newline at end of file diff --git a/src/wsi/wsi_platform.h b/src/wsi/wsi_platform.h new file mode 100644 index 000000000..5028b20bb --- /dev/null +++ b/src/wsi/wsi_platform.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef DXVK_WSI_WIN32 +#include "win32/wsi_platform_win32.h" +#endif diff --git a/src/wsi/wsi_window.h b/src/wsi/wsi_window.h index 7471d50cd..9928b43d6 100644 --- a/src/wsi/wsi_window.h +++ b/src/wsi/wsi_window.h @@ -3,22 +3,12 @@ #include #include "wsi_monitor.h" +#include "wsi_platform.h" #include "../vulkan/vulkan_loader.h" namespace dxvk::wsi { - /** - * \brief Impl-dependent state - */ - struct DxvkWindowState { -#ifdef DXVK_WSI_WIN32 - LONG style = 0; - LONG exstyle = 0; - RECT rect = { 0, 0, 0, 0 }; -#endif - }; - /** * \brief The size of the window *