rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-03 13:24:20 +01:00
Code Issues Projects Releases Wiki Activity

[wsi] Refactor the WSI backends to be implementations of a WsiDriver interface.

Browse Source 
Rather than directly calling functions, the API now calls shared functions that call into a WsiDriver instance, which is allocated and implemented by the backend. Functionally this should be the same, it just has the extra allocation for the function table.

This prepares the WSI library for supporting multiple implementations in a single binary.
This commit is contained in:
Ethan Lee 2023-12-08 00:45:46 -05:00 committed by Joshie
parent 529129c332
commit 0f7c1f753a
15 changed files with 559 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wsi/glfw/wsi_monitor_glfw.cpp
View File

@ -11,22 +11,22 @@
namespace dxvk::wsi {
HMONITOR getDefaultMonitor() {
HMONITOR GlfwWsiDriver::getDefaultMonitor() {
return enumMonitors(0);
}
HMONITOR enumMonitors(uint32_t index) {
HMONITOR GlfwWsiDriver::enumMonitors(uint32_t index) {
return isDisplayValid(int32_t(index))
? toHmonitor(index)
: nullptr;
}
HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
HMONITOR GlfwWsiDriver::enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
return enumMonitors(index);
}
bool getDisplayName(
bool GlfwWsiDriver::getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -46,7 +46,7 @@ namespace dxvk::wsi {
}
bool getDesktopCoordinates(
bool GlfwWsiDriver::getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -97,7 +97,7 @@ namespace dxvk::wsi {
}
bool getDisplayMode(
bool GlfwWsiDriver::getDisplayMode(
HMONITOR hMonitor,
uint32_t ModeNumber,
WsiMode* pMode) {
@ -121,7 +121,7 @@ namespace dxvk::wsi {
}
bool getCurrentDisplayMode(
bool GlfwWsiDriver::getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -141,7 +141,7 @@ namespace dxvk::wsi {
}
bool getDesktopDisplayMode(
bool GlfwWsiDriver::getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -159,7 +159,7 @@ namespace dxvk::wsi {
return true;
}
std::vector<uint8_t> getMonitorEdid(HMONITOR hMonitor) {
std::vector<uint8_t> GlfwWsiDriver::getMonitorEdid(HMONITOR hMonitor) {
Logger::err("getMonitorEdid not implemented on this platform.");
return {};
}

6
src/wsi/glfw/wsi_platform_glfw.cpp
View File

@ -4,7 +4,7 @@
namespace dxvk::wsi {
std::vector<const char *> getInstanceExtensions() {
std::vector<const char *> GlfwWsiDriver::getInstanceExtensions() {
if (!glfwVulkanSupported())
throw DxvkError(str::format("GLFW WSI: Vulkan is not supported in any capacity!"));
@ -22,4 +22,8 @@ namespace dxvk::wsi {
return names;
}
WsiDriver* platformCreateWsiDriver() {
return new GlfwWsiDriver();
}
}

89
src/wsi/glfw/wsi_platform_glfw.h
View File

@ -3,14 +3,91 @@
#include "../../vulkan/vulkan_loader.h"
#include <GLFW/glfw3.h>
#include "../wsi_monitor.h"
#include "../wsi_platform.h"
namespace dxvk::wsi {
/**
* \brief Impl-dependent state
*/
struct DxvkWindowState {
class GlfwWsiDriver : public WsiDriver {
public:
// Platform
virtual std::vector<const char *> getInstanceExtensions();
// Monitor
virtual HMONITOR getDefaultMonitor();
virtual HMONITOR enumMonitors(uint32_t index);
virtual HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index);
virtual bool getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]);
virtual bool getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect);
virtual bool getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode);
virtual bool getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual bool getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual WsiEdidData getMonitorEdid(HMONITOR hMonitor);
// Window
virtual void getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pWeight);
virtual void resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
uint32_t weight);
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode);
virtual bool enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
[[maybe_unused]]
bool modeSwitch);
virtual bool leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates);
virtual bool restoreDisplayMode();
virtual HMONITOR getWindowMonitor(HWND hWindow);
virtual bool isWindow(HWND hWindow);
virtual void updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost);
virtual VkResult createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
VkSurfaceKHR* pSurface);
};
inline bool isDisplayValid(int32_t displayId) {
@ -20,4 +97,4 @@ namespace dxvk::wsi {
return displayId < displayCount && displayId >= 0;
}
}
}

22
src/wsi/glfw/wsi_window_glfw.cpp
View File

@ -12,7 +12,7 @@
namespace dxvk::wsi {
void getWindowSize(
void GlfwWsiDriver::getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pHeight) {
@ -29,7 +29,7 @@ namespace dxvk::wsi {
}
void resizeWindow(
void GlfwWsiDriver::resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t Width,
@ -40,7 +40,7 @@ namespace dxvk::wsi {
}
bool setWindowMode(
bool GlfwWsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& pMode) {
@ -67,7 +67,7 @@ namespace dxvk::wsi {
return true;
}
bool enterFullscreenMode(
bool GlfwWsiDriver::enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
@ -89,7 +89,7 @@ namespace dxvk::wsi {
}
bool leaveFullscreenMode(
bool GlfwWsiDriver::leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates) {
@ -103,13 +103,13 @@ namespace dxvk::wsi {
}
bool restoreDisplayMode() {
bool GlfwWsiDriver::restoreDisplayMode() {
// Don't need to do anything with GLFW here.
return true;
}
HMONITOR getWindowMonitor(HWND hWindow) {
HMONITOR GlfwWsiDriver::getWindowMonitor(HWND hWindow) {
// TODO: implement this with glfwGetWindowMonitor
// (or maybe not? glfwGetWindowMonitor only seems to reference *fullscreen* windows)
// GLFWwindow* window = fromHwnd(hWindow);
@ -119,19 +119,19 @@ namespace dxvk::wsi {
}
bool isWindow(HWND hWindow) {
bool GlfwWsiDriver::isWindow(HWND hWindow) {
GLFWwindow* window = fromHwnd(hWindow);
return window != nullptr;
}
void updateFullscreenWindow(
void GlfwWsiDriver::updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost) {
// Don't need to do anything with GLFW here.
}
VkResult createSurface(
VkResult GlfwWsiDriver::createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
@ -141,4 +141,4 @@ namespace dxvk::wsi {
return glfwCreateWindowSurface(instance, window, nullptr, pSurface);
}
}
}

18
src/wsi/sdl2/wsi_monitor_sdl2.cpp
View File

@ -12,22 +12,22 @@
namespace dxvk::wsi {
HMONITOR getDefaultMonitor() {
HMONITOR Sdl2WsiDriver::getDefaultMonitor() {
return enumMonitors(0);
}
HMONITOR enumMonitors(uint32_t index) {
HMONITOR Sdl2WsiDriver::enumMonitors(uint32_t index) {
return isDisplayValid(int32_t(index))
? toHmonitor(index)
: nullptr;
}
HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
HMONITOR Sdl2WsiDriver::enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
return enumMonitors(index);
}
bool getDisplayName(
bool Sdl2WsiDriver::getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -47,7 +47,7 @@ namespace dxvk::wsi {
}
bool getDesktopCoordinates(
bool Sdl2WsiDriver::getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -90,7 +90,7 @@ namespace dxvk::wsi {
}
bool getDisplayMode(
bool Sdl2WsiDriver::getDisplayMode(
HMONITOR hMonitor,
uint32_t ModeNumber,
WsiMode* pMode) {
@ -109,7 +109,7 @@ namespace dxvk::wsi {
}
bool getCurrentDisplayMode(
bool Sdl2WsiDriver::getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -129,7 +129,7 @@ namespace dxvk::wsi {
}
bool getDesktopDisplayMode(
bool Sdl2WsiDriver::getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
const int32_t displayId = fromHmonitor(hMonitor);
@ -148,7 +148,7 @@ namespace dxvk::wsi {
return true;
}
std::vector<uint8_t> getMonitorEdid(HMONITOR hMonitor) {
std::vector<uint8_t> Sdl2WsiDriver::getMonitorEdid(HMONITOR hMonitor) {
Logger::err("getMonitorEdid not implemented on this platform.");
return {};
}

6
src/wsi/sdl2/wsi_platform_sdl2.cpp
View File

@ -6,7 +6,7 @@
namespace dxvk::wsi {
std::vector<const char *> getInstanceExtensions() {
std::vector<const char *> Sdl2WsiDriver::getInstanceExtensions() {
SDL_Vulkan_LoadLibrary(nullptr);
uint32_t extensionCount = 0;
@ -20,4 +20,8 @@ namespace dxvk::wsi {
return extensionNames;
}
WsiDriver* platformCreateWsiDriver() {
return new Sdl2WsiDriver();
}
}

89
src/wsi/sdl2/wsi_platform_sdl2.h
View File

@ -2,14 +2,91 @@
#include <SDL2/SDL.h>
#include "../wsi_monitor.h"
#include "../wsi_platform.h"
namespace dxvk::wsi {
/**
* \brief Impl-dependent state
*/
struct DxvkWindowState {
class Sdl2WsiDriver : public WsiDriver {
public:
// Platform
virtual std::vector<const char *> getInstanceExtensions();
// Monitor
virtual HMONITOR getDefaultMonitor();
virtual HMONITOR enumMonitors(uint32_t index);
virtual HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index);
virtual bool getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]);
virtual bool getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect);
virtual bool getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode);
virtual bool getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual bool getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual WsiEdidData getMonitorEdid(HMONITOR hMonitor);
// Window
virtual void getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pWeight);
virtual void resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
uint32_t weight);
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode);
virtual bool enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
[[maybe_unused]]
bool modeSwitch);
virtual bool leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates);
virtual bool restoreDisplayMode();
virtual HMONITOR getWindowMonitor(HWND hWindow);
virtual bool isWindow(HWND hWindow);
virtual void updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost);
virtual VkResult createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
VkSurfaceKHR* pSurface);
};
inline bool isDisplayValid(int32_t displayId) {
@ -18,4 +95,4 @@ namespace dxvk::wsi {
return displayId < displayCount && displayId >= 0;
}
}
}

20
src/wsi/sdl2/wsi_window_sdl2.cpp
View File

@ -11,7 +11,7 @@
namespace dxvk::wsi {
void getWindowSize(
void Sdl2WsiDriver::getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pHeight) {
@ -28,7 +28,7 @@ namespace dxvk::wsi {
}
void resizeWindow(
void Sdl2WsiDriver::resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t Width,
@ -39,7 +39,7 @@ namespace dxvk::wsi {
}
bool setWindowMode(
bool Sdl2WsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& pMode) {
@ -73,7 +73,7 @@ namespace dxvk::wsi {
bool enterFullscreenMode(
bool Sdl2WsiDriver::enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
@ -99,7 +99,7 @@ namespace dxvk::wsi {
}
bool leaveFullscreenMode(
bool Sdl2WsiDriver::leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates) {
@ -114,13 +114,13 @@ namespace dxvk::wsi {
}
bool restoreDisplayMode() {
bool Sdl2WsiDriver::restoreDisplayMode() {
// Don't need to do anything with SDL2 here.
return true;
}
HMONITOR getWindowMonitor(HWND hWindow) {
HMONITOR Sdl2WsiDriver::getWindowMonitor(HWND hWindow) {
SDL_Window* window = fromHwnd(hWindow);
const int32_t displayId = SDL_GetWindowDisplayIndex(window);
@ -128,13 +128,13 @@ namespace dxvk::wsi {
}
bool isWindow(HWND hWindow) {
bool Sdl2WsiDriver::isWindow(HWND hWindow) {
SDL_Window* window = fromHwnd(hWindow);
return window != nullptr;
}
void updateFullscreenWindow(
void Sdl2WsiDriver::updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost) {
@ -142,7 +142,7 @@ namespace dxvk::wsi {
}
VkResult createSurface(
VkResult Sdl2WsiDriver::createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,

20
src/wsi/win32/wsi_monitor_win32.cpp
View File

@ -1,4 +1,4 @@
#include "../wsi_monitor.h"
#include "wsi_platform_win32.h"
#include "../../util/util_string.h"
#include "../../util/log/log.h"
@ -13,7 +13,7 @@
namespace dxvk::wsi {
HMONITOR getDefaultMonitor() {
HMONITOR Win32WsiDriver::getDefaultMonitor() {
return ::MonitorFromPoint({ 0, 0 }, MONITOR_DEFAULTTOPRIMARY);
}
@ -45,7 +45,7 @@ namespace dxvk::wsi {
return FALSE;
}
HMONITOR enumMonitors(uint32_t index) {
HMONITOR Win32WsiDriver::enumMonitors(uint32_t index) {
MonitorEnumInfo info;
info.iMonitorId = index;
info.oMonitor = nullptr;
@ -58,7 +58,7 @@ namespace dxvk::wsi {
return info.oMonitor;
}
HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
HMONITOR Win32WsiDriver::enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
if (!numLUIDs)
return enumMonitors(index);
@ -132,7 +132,7 @@ namespace dxvk::wsi {
}
bool getDisplayName(
bool Win32WsiDriver::getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]) {
// Query monitor info to get the device name
@ -150,7 +150,7 @@ namespace dxvk::wsi {
}
bool getDesktopCoordinates(
bool Win32WsiDriver::getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect) {
::MONITORINFOEXW monInfo;
@ -200,7 +200,7 @@ namespace dxvk::wsi {
}
bool getDisplayMode(
bool Win32WsiDriver::getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode) {
@ -208,14 +208,14 @@ namespace dxvk::wsi {
}
bool getCurrentDisplayMode(
bool Win32WsiDriver::getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
return retrieveDisplayMode(hMonitor, ENUM_CURRENT_SETTINGS, pMode);
}
bool getDesktopDisplayMode(
bool Win32WsiDriver::getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
return retrieveDisplayMode(hMonitor, ENUM_REGISTRY_SETTINGS, pMode);
@ -308,7 +308,7 @@ namespace dxvk::wsi {
wchar_t extraChars[MAX_DEVICE_ID_LEN];
};
WsiEdidData getMonitorEdid(HMONITOR hMonitor) {
WsiEdidData Win32WsiDriver::getMonitorEdid(HMONITOR hMonitor) {
static constexpr GUID GUID_DEVINTERFACE_MONITOR = { 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7 };
static auto pfnSetupDiGetClassDevsW = reinterpret_cast<decltype(SetupDiGetClassDevsW)*> (::GetProcAddress(::GetModuleHandleW(L"setupapi.dll"), "SetupDiGetClassDevsW"));
static auto pfnSetupDiEnumDeviceInterfaces = reinterpret_cast<decltype(SetupDiEnumDeviceInterfaces)*> (::GetProcAddress(::GetModuleHandleW(L"setupapi.dll"), "SetupDiEnumDeviceInterfaces"));

6
src/wsi/win32/wsi_platform_win32.cpp
View File

@ -2,8 +2,12 @@
namespace dxvk::wsi {
std::vector<const char *> getInstanceExtensions() {
std::vector<const char *> Win32WsiDriver::getInstanceExtensions() {
return { VK_KHR_WIN32_SURFACE_EXTENSION_NAME };
}
WsiDriver* platformCreateWsiDriver() {
return new Win32WsiDriver();
}
}

92
src/wsi/win32/wsi_platform_win32.h
View File

@ -2,15 +2,91 @@
#include <windows.h>
#include "../wsi_platform.h"
namespace dxvk::wsi {
/**
* \brief Impl-dependent state
*/
struct DxvkWindowState {
LONG style = 0;
LONG exstyle = 0;
RECT rect = { 0, 0, 0, 0 };
class Win32WsiDriver : public WsiDriver {
public:
// Platform
virtual std::vector<const char *> getInstanceExtensions();
// Monitor
virtual HMONITOR getDefaultMonitor();
virtual HMONITOR enumMonitors(uint32_t index);
virtual HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index);
virtual bool getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]);
virtual bool getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect);
virtual bool getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode);
virtual bool getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual bool getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode);
virtual WsiEdidData getMonitorEdid(HMONITOR hMonitor);
// Window
virtual void getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pWeight);
virtual void resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
uint32_t weight);
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode);
virtual bool enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
[[maybe_unused]]
bool modeSwitch);
virtual bool leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates);
virtual bool restoreDisplayMode();
virtual HMONITOR getWindowMonitor(HWND hWindow);
virtual bool isWindow(HWND hWindow);
virtual void updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost);
virtual VkResult createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
VkSurfaceKHR* pSurface);
};
}
}

23
src/wsi/win32/wsi_window_win32.cpp
View File

@ -1,5 +1,4 @@
#include "../wsi_window.h"
#include "../wsi_monitor.h"
#include "wsi_platform_win32.h"
#include "../../util/util_string.h"
#include "../../util/log/log.h"
@ -94,7 +93,7 @@ namespace dxvk::wsi {
}
void getWindowSize(
void Win32WsiDriver::getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pHeight) {
@ -109,7 +108,7 @@ namespace dxvk::wsi {
}
void resizeWindow(
void Win32WsiDriver::resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
@ -130,7 +129,7 @@ namespace dxvk::wsi {
}
bool setWindowMode(
bool Win32WsiDriver::setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode) {
@ -163,7 +162,7 @@ namespace dxvk::wsi {
}
bool enterFullscreenMode(
bool Win32WsiDriver::enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
@ -196,7 +195,7 @@ namespace dxvk::wsi {
}
bool leaveFullscreenMode(
bool Win32WsiDriver::leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates) {
@ -225,7 +224,7 @@ namespace dxvk::wsi {
}
bool restoreDisplayMode() {
bool Win32WsiDriver::restoreDisplayMode() {
bool success = true;
bool result = ::EnumDisplayMonitors(nullptr, nullptr,
&restoreDisplayModeCallback,
@ -235,7 +234,7 @@ namespace dxvk::wsi {
}
HMONITOR getWindowMonitor(HWND hWindow) {
HMONITOR Win32WsiDriver::getWindowMonitor(HWND hWindow) {
RECT windowRect = { 0, 0, 0, 0 };
::GetWindowRect(hWindow, &windowRect);
@ -248,12 +247,12 @@ namespace dxvk::wsi {
}
bool isWindow(HWND hWindow) {
bool Win32WsiDriver::isWindow(HWND hWindow) {
return ::IsWindow(hWindow);
}
void updateFullscreenWindow(
void Win32WsiDriver::updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost) {
@ -274,7 +273,7 @@ namespace dxvk::wsi {
}
VkResult createSurface(
VkResult Win32WsiDriver::createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,

135
src/wsi/wsi_platform.cpp
View File

@ -1,11 +1,146 @@
#include "wsi_platform.h"
#include "wsi_monitor.h"
#include "wsi_window.h"
#include "../util/util_error.h"
namespace dxvk::wsi {
static WsiDriver* s_driver = nullptr;
static int s_refcount = 0;
void init() {
if (s_refcount++ > 0)
return;
s_driver = platformCreateWsiDriver();
if (s_driver == nullptr)
throw DxvkError("Failed to initialize WSI.");
}
void quit() {
if (s_refcount == 0)
return;
s_refcount--;
if (s_refcount == 0) {
delete s_driver;
s_driver = nullptr;
}
}
std::vector<const char *> getInstanceExtensions() {
return s_driver->getInstanceExtensions();
}
void getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pHeight) {
s_driver->getWindowSize(hWindow, pWidth, pHeight);
}
void resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
uint32_t height) {
s_driver->resizeWindow(hWindow, pState, width, height);
}
bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode) {
return s_driver->setWindowMode(hMonitor, hWindow, mode);
}
bool enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
[[maybe_unused]]
bool modeSwitch) {
return s_driver->enterFullscreenMode(hMonitor, hWindow, pState, modeSwitch);
}
bool leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates) {
return s_driver->leaveFullscreenMode(hWindow, pState, restoreCoordinates);
}
bool restoreDisplayMode() {
return s_driver->restoreDisplayMode();
}
HMONITOR getWindowMonitor(HWND hWindow) {
return s_driver->getWindowMonitor(hWindow);
}
bool isWindow(HWND hWindow) {
return s_driver->isWindow(hWindow);
}
void updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost) {
s_driver->updateFullscreenWindow(hMonitor, hWindow, forceTopmost);
}
VkResult createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
VkSurfaceKHR* pSurface) {
return s_driver->createSurface(hWindow, pfnVkGetInstanceProcAddr, instance, pSurface);
}
HMONITOR getDefaultMonitor() {
return s_driver->getDefaultMonitor();
}
HMONITOR enumMonitors(uint32_t index) {
return s_driver->enumMonitors(index);
}
HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) {
return s_driver->enumMonitors(adapterLUID, numLUIDs, index);
}
bool getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]) {
return s_driver->getDisplayName(hMonitor, Name);
}
bool getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect) {
return s_driver->getDesktopCoordinates(hMonitor, pRect);
}
bool getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode) {
return s_driver->getDisplayMode(hMonitor, modeNumber, pMode);
}
bool getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
return s_driver->getCurrentDisplayMode(hMonitor, pMode);
}
bool getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) {
return s_driver->getDesktopDisplayMode(hMonitor, pMode);
}
WsiEdidData getMonitorEdid(HMONITOR hMonitor) {
return s_driver->getMonitorEdid(hMonitor);
}
}

95
src/wsi/wsi_platform.h
View File

@ -1,19 +1,100 @@
#pragma once
#if defined(DXVK_WSI_WIN32)
#include "win32/wsi_platform_win32.h"
#elif defined(DXVK_WSI_SDL2)
#include "sdl2/wsi_platform_sdl2.h"
#elif defined(DXVK_WSI_GLFW)
#include "glfw/wsi_platform_glfw.h"
#endif
#include "wsi_window.h"
#include <vector>
namespace dxvk::wsi {
class WsiDriver {
public:
virtual ~WsiDriver() {
}
// Platform
virtual std::vector<const char *> getInstanceExtensions() = 0;
// Monitor
virtual HMONITOR getDefaultMonitor() = 0;
virtual HMONITOR enumMonitors(uint32_t index) = 0;
virtual HMONITOR enumMonitors(const LUID *adapterLUID[], uint32_t numLUIDs, uint32_t index) = 0;
virtual bool getDisplayName(
HMONITOR hMonitor,
WCHAR (&Name)[32]) = 0;
virtual bool getDesktopCoordinates(
HMONITOR hMonitor,
RECT* pRect) = 0;
virtual bool getDisplayMode(
HMONITOR hMonitor,
uint32_t modeNumber,
WsiMode* pMode) = 0;
virtual bool getCurrentDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) = 0;
virtual bool getDesktopDisplayMode(
HMONITOR hMonitor,
WsiMode* pMode) = 0;
virtual WsiEdidData getMonitorEdid(HMONITOR hMonitor) = 0;
// Window
virtual void getWindowSize(
HWND hWindow,
uint32_t* pWidth,
uint32_t* pWeight) = 0;
virtual void resizeWindow(
HWND hWindow,
DxvkWindowState* pState,
uint32_t width,
uint32_t weight) = 0;
virtual bool setWindowMode(
HMONITOR hMonitor,
HWND hWindow,
const WsiMode& mode) = 0;
virtual bool enterFullscreenMode(
HMONITOR hMonitor,
HWND hWindow,
DxvkWindowState* pState,
[[maybe_unused]]
bool modeSwitch) = 0;
virtual bool leaveFullscreenMode(
HWND hWindow,
DxvkWindowState* pState,
bool restoreCoordinates) = 0;
virtual bool restoreDisplayMode() = 0;
virtual HMONITOR getWindowMonitor(HWND hWindow) = 0;
virtual bool isWindow(HWND hWindow) = 0;
virtual void updateFullscreenWindow(
HMONITOR hMonitor,
HWND hWindow,
bool forceTopmost) = 0;
virtual VkResult createSurface(
HWND hWindow,
PFN_vkGetInstanceProcAddr pfnVkGetInstanceProcAddr,
VkInstance instance,
VkSurfaceKHR* pSurface) = 0;
};
void init();
void quit();
std::vector<const char *> getInstanceExtensions();
WsiDriver* platformCreateWsiDriver();
}

12
src/wsi/wsi_window.h
View File

@ -3,12 +3,22 @@
#include <windows.h>
#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
*