From 2389a2fe536aeb2b982bc8955fabda165364a70b Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 23 Apr 2022 16:26:59 +0200 Subject: [PATCH] Platform/WindowManager: Rename to WindowBackend --- include/Nazara/Platform/WindowHandle.hpp | 4 ++-- src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp | 13 +++++-------- .../Wrapper/Linux/EGLContextWayland.cpp | 2 +- .../OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp | 2 +- .../OpenGLRenderer/Wrapper/WGL/WGLContext.cpp | 2 +- .../Wrapper/Win32/EGLContextWin32.cpp | 4 ++-- src/Nazara/Platform/SDL2/WindowImpl.cpp | 8 ++++---- src/Nazara/VulkanRenderer/VulkanSurface.cpp | 6 +++--- 8 files changed, 19 insertions(+), 22 deletions(-) diff --git a/include/Nazara/Platform/WindowHandle.hpp b/include/Nazara/Platform/WindowHandle.hpp index 1bac1489f..e9609c952 100644 --- a/include/Nazara/Platform/WindowHandle.hpp +++ b/include/Nazara/Platform/WindowHandle.hpp @@ -12,7 +12,7 @@ namespace Nz { - enum class WindowManager + enum class WindowBackend { Invalid, @@ -24,7 +24,7 @@ namespace Nz struct WindowHandle { - WindowManager type = WindowManager::Invalid; + WindowBackend type = WindowBackend::Invalid; union { diff --git a/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp b/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp index edd6cbea5..a2fa64fee 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/EGL/EGLLoader.cpp @@ -30,10 +30,7 @@ namespace Nz::GL template bool Load(Func& func, const char* funcName, bool mandatory, bool implementFallback = true) { - FuncType funcPtr = LoadRaw(funcName); - if (funcPtr) - func = funcPtr; - + func = LoadRaw(funcName); if (!func) { if (!implementFallback || (!loader.ImplementFallback(funcName) && !func)) //< double-check @@ -151,22 +148,22 @@ namespace Nz::GL std::unique_ptr context; switch (handle.type) { - case WindowManager::Invalid: + case WindowBackend::Invalid: break; - case WindowManager::X11: + case WindowBackend::X11: #ifdef NAZARA_PLATFORM_LINUX context = std::make_unique(device, *this); #endif break; - case WindowManager::Windows: + case WindowBackend::Windows: #ifdef NAZARA_PLATFORM_WINDOWS context = std::make_unique(device, *this); #endif break; - case WindowManager::Wayland: + case WindowBackend::Wayland: #ifdef NAZARA_PLATFORM_LINUX context = std::make_unique(device, *this); #endif diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.cpp index 89a15615f..efadf539b 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextWayland.cpp @@ -10,7 +10,7 @@ namespace Nz::GL { bool EGLContextWayland::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext) { - assert(window.type == WindowManager::Wayland); + assert(window.type == WindowBackend::Wayland); NazaraError("Wayland is not yet supported"); return false; diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp index 59a1f0909..ed27fc5b8 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Linux/EGLContextX11.cpp @@ -10,7 +10,7 @@ namespace Nz::GL { bool EGLContextX11::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext) { - assert(window.type == WindowManager::X11); + assert(window.type == WindowBackend::X11); Destroy(); //< In case a previous display or surface hasn't been released diff --git a/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp index 54339c365..d3ef15db0 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/WGL/WGLContext.cpp @@ -47,7 +47,7 @@ namespace Nz::GL bool WGLContext::Create(const WGLContext* baseContext, const ContextParams& params, WindowHandle window, const WGLContext* shareContext) { - NazaraAssert(window.type == WindowManager::Windows, "expected Windows window"); + NazaraAssert(window.type == WindowBackend::Windows, "expected Windows window"); Destroy(); diff --git a/src/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.cpp b/src/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.cpp index 64accdfb5..4bccd70f7 100644 --- a/src/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.cpp +++ b/src/Nazara/OpenGLRenderer/Wrapper/Win32/EGLContextWin32.cpp @@ -21,7 +21,7 @@ namespace Nz::GL ::ShowWindow(window.get(), FALSE); WindowHandle windowHandle; - windowHandle.type = WindowManager::Windows; + windowHandle.type = WindowBackend::Windows; windowHandle.windows.window = window.get(); if (!Create(params, windowHandle, shareContext)) @@ -34,7 +34,7 @@ namespace Nz::GL bool EGLContextWin32::Create(const ContextParams& params, WindowHandle window, const EGLContextBase* shareContext) { - assert(window.type == WindowManager::Windows); + assert(window.type == WindowBackend::Windows); Destroy(); //< In case a previous display or surface hasn't been released diff --git a/src/Nazara/Platform/SDL2/WindowImpl.cpp b/src/Nazara/Platform/SDL2/WindowImpl.cpp index b28e7dda6..f4732be25 100644 --- a/src/Nazara/Platform/SDL2/WindowImpl.cpp +++ b/src/Nazara/Platform/SDL2/WindowImpl.cpp @@ -204,7 +204,7 @@ namespace Nz #if defined(SDL_VIDEO_DRIVER_COCOA) case SDL_SYSWM_COCOA: { - handle.type = WindowManager::Cocoa; + handle.type = WindowBackend::Cocoa; handle.cocoa.window = wmInfo.info.cocoa.window; break; } @@ -212,7 +212,7 @@ namespace Nz #if defined(SDL_VIDEO_DRIVER_X11) case SDL_SYSWM_X11: { - handle.type = WindowManager::X11; + handle.type = WindowBackend::X11; handle.x11.display = wmInfo.info.x11.display; handle.x11.window = wmInfo.info.x11.window; break; @@ -221,7 +221,7 @@ namespace Nz #if defined(SDL_VIDEO_DRIVER_WAYLAND) case SDL_SYSWM_WAYLAND: { - handle.type = WindowManager::Wayland; + handle.type = WindowBackend::Wayland; handle.wayland.display = wmInfo.info.wl.display; handle.wayland.surface = wmInfo.info.wl.surface; handle.wayland.shellSurface = wmInfo.info.wl.shell_surface; @@ -231,7 +231,7 @@ namespace Nz #if defined(SDL_VIDEO_DRIVER_WINDOWS) case SDL_SYSWM_WINDOWS: { - handle.type = WindowManager::Windows; + handle.type = WindowBackend::Windows; handle.windows.window = wmInfo.info.win.window; break; } diff --git a/src/Nazara/VulkanRenderer/VulkanSurface.cpp b/src/Nazara/VulkanRenderer/VulkanSurface.cpp index efd66e7f1..80b186e56 100644 --- a/src/Nazara/VulkanRenderer/VulkanSurface.cpp +++ b/src/Nazara/VulkanRenderer/VulkanSurface.cpp @@ -19,7 +19,7 @@ namespace Nz bool success = false; #if defined(NAZARA_PLATFORM_WINDOWS) { - NazaraAssert(handle.type == WindowManager::Windows, "expected Windows window"); + NazaraAssert(handle.type == WindowBackend::Windows, "expected Windows window"); HWND winHandle = reinterpret_cast(handle.windows.window); HINSTANCE instance = reinterpret_cast(GetWindowLongPtrW(winHandle, GWLP_HINSTANCE)); @@ -31,7 +31,7 @@ namespace Nz switch (handle.type) { #ifdef VK_USE_PLATFORM_WAYLAND_KHR - case WindowManager::Wayland: + case WindowBackend::Wayland: { wl_display* display = static_cast(handle.wayland.display); wl_surface* surface = static_cast(handle.wayland.surface); @@ -42,7 +42,7 @@ namespace Nz #endif #ifdef VK_USE_PLATFORM_XLIB_KHR - case WindowManager::X11: + case WindowBackend::X11: { Display* display = static_cast(handle.x11.display); ::Window window = static_cast<::Window>(handle.x11.window);