ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8544 from gtalusan/master 

MacOS: Dispatch GL calls to main thread to prevent crashes on Catalina
This commit is contained in:
Connor McLaughlin 2020-01-02 14:43:21 +10:00 committed by GitHub
parent 7a6a4510f6 b1a6cbc3b4
commit a04d4982b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/GL/GLInterface/AGL.mm
View File

@ -36,10 +36,12 @@ static bool AttachContextToView(NSOpenGLContext* context, NSView* view, u32* wid
(void)UpdateCachedDimensions(view, width, height); (void)UpdateCachedDimensions(view, width, height);
// the following calls can crash if not called from the main thread on macOS 10.15
dispatch_sync(dispatch_get_main_queue(), ^{
[window makeFirstResponder:view]; [window makeFirstResponder:view];
[context setView:view]; [context setView:view];
[window makeKeyAndOrderFront:nil]; [window makeKeyAndOrderFront:nil];
});
return true; return true;
} }
@ -140,7 +142,10 @@ void GLContextAGL::Update()
return; return;
if (UpdateCachedDimensions(m_view, &m_backbuffer_width, &m_backbuffer_height)) if (UpdateCachedDimensions(m_view, &m_backbuffer_width, &m_backbuffer_height))
// the following calls can crash if not called from the main thread on macOS 10.15
dispatch_sync(dispatch_get_main_queue(), ^{
[m_context update]; [m_context update];
});
} }
void GLContextAGL::SwapInterval(int interval) void GLContextAGL::SwapInterval(int interval)