From 5298328cb175a17eb9ea534a9d07dc57b42d2d42 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 15 Apr 2017 19:23:19 -0700 Subject: [PATCH 1/3] Add headless support on macOS --- CMakeLists.txt | 8 ++- Source/Core/Common/GL/GLInterface/AGL.mm | 70 ++++++++++--------- Source/Core/DolphinNoGUI/MainNoGUI.cpp | 2 +- .../ControllerInterface/OSX/OSX.mm | 14 +++- .../ControllerInterface/Quartz/Quartz.mm | 3 + 5 files changed, 59 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 342119b24b..52a218acb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -414,9 +414,13 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() if(ENABLE_HEADLESS) - message(STATUS "Enabling Headless! Disabling GUI, force enabling EGL!") + if(APPLE) + message(STATUS "Enabling Headless! Disabling GUI.") + else() + message(STATUS "Enabling Headless! Disabling GUI, force enabling EGL!") + set(USE_EGL 1) + endif() set(USE_X11 0) - set(USE_EGL 1) set(DISABLE_WX 1) set(ENABLE_QT2 0) add_definitions(-DUSE_HEADLESS) diff --git a/Source/Core/Common/GL/GLInterface/AGL.mm b/Source/Core/Common/GL/GLInterface/AGL.mm index 78b2db2ea4..594a854f31 100644 --- a/Source/Core/Common/GL/GLInterface/AGL.mm +++ b/Source/Core/Common/GL/GLInterface/AGL.mm @@ -14,22 +14,6 @@ void cInterfaceAGL::Swap() // Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() bool cInterfaceAGL::Create(void* window_handle, bool core) { - cocoaWin = reinterpret_cast(window_handle); - NSSize size = [cocoaWin frame].size; - - // Enable high-resolution display support. - [cocoaWin setWantsBestResolutionOpenGLSurface:YES]; - - NSWindow* window = [cocoaWin window]; - - float scale = [window backingScaleFactor]; - size.width *= scale; - size.height *= scale; - - // Control window size and picture scaling - s_backbuffer_width = size.width; - s_backbuffer_height = size.height; - NSOpenGLPixelFormatAttribute attr[] = {NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, core ? NSOpenGLProfileVersion3_2Core : NSOpenGLProfileVersionLegacy, @@ -49,15 +33,34 @@ bool cInterfaceAGL::Create(void* window_handle, bool core) return false; } - if (cocoaWin == nil) + if (window_handle) { - ERROR_LOG(VIDEO, "failed to create window"); - return false; - } + cocoaWin = reinterpret_cast(window_handle); + NSSize size = [cocoaWin frame].size; - [window makeFirstResponder:cocoaWin]; - [cocoaCtx setView:cocoaWin]; - [window makeKeyAndOrderFront:nil]; + // Enable high-resolution display support. + [cocoaWin setWantsBestResolutionOpenGLSurface:YES]; + + NSWindow* window = [cocoaWin window]; + + float scale = [window backingScaleFactor]; + size.width *= scale; + size.height *= scale; + + // Control window size and picture scaling + s_backbuffer_width = size.width; + s_backbuffer_height = size.height; + + if (cocoaWin == nil) + { + ERROR_LOG(VIDEO, "failed to create window"); + return false; + } + + [window makeFirstResponder:cocoaWin]; + [cocoaCtx setView:cocoaWin]; + [window makeKeyAndOrderFront:nil]; + } return true; } @@ -84,18 +87,21 @@ void cInterfaceAGL::Shutdown() void cInterfaceAGL::Update() { - NSWindow* window = [cocoaWin window]; - NSSize size = [cocoaWin frame].size; + if (cocoaWin) + { + NSWindow* window = [cocoaWin window]; + NSSize size = [cocoaWin frame].size; - float scale = [window backingScaleFactor]; - size.width *= scale; - size.height *= scale; + float scale = [window backingScaleFactor]; + size.width *= scale; + size.height *= scale; - if (s_backbuffer_width == size.width && s_backbuffer_height == size.height) - return; + if (s_backbuffer_width == size.width && s_backbuffer_height == size.height) + return; - s_backbuffer_width = size.width; - s_backbuffer_height = size.height; + s_backbuffer_width = size.width; + s_backbuffer_height = size.height; + } [cocoaCtx update]; } diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp index d9293a0faa..f5860e2dca 100644 --- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp +++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp @@ -370,7 +370,7 @@ class PlatformX11 : public Platform static Platform* GetPlatform() { -#if defined(USE_EGL) && defined(USE_HEADLESS) +#if defined(USE_HEADLESS) return new Platform(); #elif HAVE_X11 return new PlatformX11(); diff --git a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm index 900fc29a70..948e2b85fa 100644 --- a/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm +++ b/Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm @@ -173,13 +173,21 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS // Add a device if it's of a type we want if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Keyboard)) - g_controller_interface.AddDevice(std::make_shared(inIOHIDDeviceRef, name, g_window)); + { + if (g_window) + g_controller_interface.AddDevice( + std::make_shared(inIOHIDDeviceRef, name, g_window)); + } #if 0 else if (IOHIDDeviceConformsTo(inIOHIDDeviceRef, kHIDPage_GenericDesktop, kHIDUsage_GD_Mouse)) + { g_controller_interface.AddDevice(new Mouse(inIOHIDDeviceRef, name)); + } #endif else + { g_controller_interface.AddDevice(std::make_shared(inIOHIDDeviceRef, name)); + } NOTICE_LOG(SERIALINTERFACE, "Added device: %s", name.c_str()); g_controller_interface.InvokeHotplugCallbacks(); @@ -187,12 +195,12 @@ static void DeviceMatchingCallback(void* inContext, IOReturn inResult, void* inS void Init(void* window) { + g_window = window; + HIDManager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); if (!HIDManager) ERROR_LOG(SERIALINTERFACE, "Failed to create HID Manager reference"); - g_window = window; - IOHIDManagerSetDeviceMatching(HIDManager, nullptr); if (IOHIDManagerOpen(HIDManager, kIOHIDOptionsTypeNone) != kIOReturnSuccess) ERROR_LOG(SERIALINTERFACE, "Failed to open HID Manager"); diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm index a090b421a5..30802182a8 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/Quartz.mm @@ -12,6 +12,9 @@ namespace Quartz { void PopulateDevices(void* window) { + if (!window) + return; + g_controller_interface.AddDevice(std::make_shared(window)); } From 4770e668116b9809f0ba3d9f29625401790d33fa Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 15 Apr 2017 20:43:22 -0700 Subject: [PATCH 2/3] AGL: refactor some functions --- Source/Core/Common/GL/GLInterface/AGL.mm | 92 ++++++++++++------------ 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/Source/Core/Common/GL/GLInterface/AGL.mm b/Source/Core/Common/GL/GLInterface/AGL.mm index 594a854f31..51d00ad04d 100644 --- a/Source/Core/Common/GL/GLInterface/AGL.mm +++ b/Source/Core/Common/GL/GLInterface/AGL.mm @@ -5,6 +5,45 @@ #include "Common/GL/GLInterface/AGL.h" #include "Common/Logging/Log.h" +static bool UpdateCachedDimensions(NSView* view, u32* width, u32* height) +{ + NSWindow* window = [view window]; + NSSize size = [view frame].size; + + float scale = [window backingScaleFactor]; + size.width *= scale; + size.height *= scale; + + if (*width == size.width && *height == size.height) + return false; + + *width = size.width; + *height = size.height; + + return true; +} + +static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* width, u32* height) +{ + // Enable high-resolution display support. + [view setWantsBestResolutionOpenGLSurface:YES]; + + NSWindow* window = [view window]; + if (window == nil) + { + ERROR_LOG(VIDEO, "failed to get NSWindow"); + return false; + } + + (void)UpdateCachedDimensions(view, width, height); + + [window makeFirstResponder:view]; + [context setView:view]; + [window makeKeyAndOrderFront:nil]; + + return true; +} + void cInterfaceAGL::Swap() { [cocoaCtx flushBuffer]; @@ -33,36 +72,11 @@ bool cInterfaceAGL::Create(void* window_handle, bool core) return false; } - if (window_handle) - { - cocoaWin = reinterpret_cast(window_handle); - NSSize size = [cocoaWin frame].size; + if (!window_handle) + return true; - // Enable high-resolution display support. - [cocoaWin setWantsBestResolutionOpenGLSurface:YES]; - - NSWindow* window = [cocoaWin window]; - - float scale = [window backingScaleFactor]; - size.width *= scale; - size.height *= scale; - - // Control window size and picture scaling - s_backbuffer_width = size.width; - s_backbuffer_height = size.height; - - if (cocoaWin == nil) - { - ERROR_LOG(VIDEO, "failed to create window"); - return false; - } - - [window makeFirstResponder:cocoaWin]; - [cocoaCtx setView:cocoaWin]; - [window makeKeyAndOrderFront:nil]; - } - - return true; + cocoaWin = static_cast(window_handle); + return AttachContextToView(cocoaCtx, cocoaWin, &s_backbuffer_width, &s_backbuffer_height); } bool cInterfaceAGL::MakeCurrent() @@ -87,23 +101,11 @@ void cInterfaceAGL::Shutdown() void cInterfaceAGL::Update() { - if (cocoaWin) - { - NSWindow* window = [cocoaWin window]; - NSSize size = [cocoaWin frame].size; + if (!cocoaWin) + return; - float scale = [window backingScaleFactor]; - size.width *= scale; - size.height *= scale; - - if (s_backbuffer_width == size.width && s_backbuffer_height == size.height) - return; - - s_backbuffer_width = size.width; - s_backbuffer_height = size.height; - } - - [cocoaCtx update]; + if (UpdateCachedDimensions(cocoaWin, &s_backbuffer_width, &s_backbuffer_height)) + [cocoaCtx update]; } void cInterfaceAGL::SwapInterval(int interval) From c63925dc218aaa116328716e57af576eb39178bf Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sat, 15 Apr 2017 20:49:00 -0700 Subject: [PATCH 3/3] AGL: small style fixes --- Source/Core/Common/GL/GLInterface/AGL.h | 8 ++++---- Source/Core/Common/GL/GLInterface/AGL.mm | 26 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Source/Core/Common/GL/GLInterface/AGL.h b/Source/Core/Common/GL/GLInterface/AGL.h index fa5e872f41..f3c3bd47cf 100644 --- a/Source/Core/Common/GL/GLInterface/AGL.h +++ b/Source/Core/Common/GL/GLInterface/AGL.h @@ -15,10 +15,6 @@ struct NSView; class cInterfaceAGL : public cInterfaceBase { -private: - NSView* cocoaWin; - NSOpenGLContext* cocoaCtx; - public: void Swap() override; bool Create(void* window_handle, bool core) override; @@ -27,4 +23,8 @@ public: void Shutdown() override; void Update() override; void SwapInterval(int interval) override; + +private: + NSView* m_view; + NSOpenGLContext* m_context; }; diff --git a/Source/Core/Common/GL/GLInterface/AGL.mm b/Source/Core/Common/GL/GLInterface/AGL.mm index 51d00ad04d..37fec99440 100644 --- a/Source/Core/Common/GL/GLInterface/AGL.mm +++ b/Source/Core/Common/GL/GLInterface/AGL.mm @@ -46,7 +46,7 @@ static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* wid void cInterfaceAGL::Swap() { - [cocoaCtx flushBuffer]; + [m_context flushBuffer]; } // Create rendering window. @@ -64,9 +64,9 @@ bool cInterfaceAGL::Create(void* window_handle, bool core) return false; } - cocoaCtx = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:nil]; + m_context = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:nil]; [fmt release]; - if (cocoaCtx == nil) + if (m_context == nil) { ERROR_LOG(VIDEO, "failed to create context"); return false; @@ -75,13 +75,13 @@ bool cInterfaceAGL::Create(void* window_handle, bool core) if (!window_handle) return true; - cocoaWin = static_cast(window_handle); - return AttachContextToView(cocoaCtx, cocoaWin, &s_backbuffer_width, &s_backbuffer_height); + m_view = static_cast(window_handle); + return AttachContextToView(m_context, m_view, &s_backbuffer_width, &s_backbuffer_height); } bool cInterfaceAGL::MakeCurrent() { - [cocoaCtx makeCurrentContext]; + [m_context makeCurrentContext]; return true; } @@ -94,21 +94,21 @@ bool cInterfaceAGL::ClearCurrent() // Close backend void cInterfaceAGL::Shutdown() { - [cocoaCtx clearDrawable]; - [cocoaCtx release]; - cocoaCtx = nil; + [m_context clearDrawable]; + [m_context release]; + m_context = nil; } void cInterfaceAGL::Update() { - if (!cocoaWin) + if (!m_view) return; - if (UpdateCachedDimensions(cocoaWin, &s_backbuffer_width, &s_backbuffer_height)) - [cocoaCtx update]; + if (UpdateCachedDimensions(m_view, &s_backbuffer_width, &s_backbuffer_height)) + [m_context update]; } void cInterfaceAGL::SwapInterval(int interval) { - [cocoaCtx setValues:(GLint*)&interval forParameter:NSOpenGLCPSwapInterval]; + [m_context setValues:static_cast(&interval) forParameter:NSOpenGLCPSwapInterval]; }