mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cocoa: Make sure GL context destruction happens on the main thread. 

Fixes #10900.
This commit is contained in:
Ryan C. Gordon 2024-10-24 14:53:16 -04:00
parent dcd4ddb043
commit 344546b4ea
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/cocoa/SDL_cocoaopengl.m
View File

@ -523,13 +523,31 @@ bool Cocoa_GL_SwapWindow(SDL_VideoDevice *_this, SDL_Window *window)
} }
} }
bool Cocoa_GL_DestroyContext(SDL_VideoDevice *_this, SDL_GLContext context) static void DispatchedDestroyContext(SDL_GLContext context)
{ {
@autoreleasepool { @autoreleasepool {
SDL3OpenGLContext *nscontext = (__bridge SDL3OpenGLContext *)context; SDL3OpenGLContext *nscontext = (__bridge SDL3OpenGLContext *)context;
[nscontext cleanup]; [nscontext cleanup];
CFRelease(context); CFRelease(context);
} }
}
bool Cocoa_GL_DestroyContext(SDL_VideoDevice *_this, SDL_GLContext context)
{
if ([NSThread isMainThread]) {
DispatchedDestroyContext(context);
} else {
if (SDL_opengl_async_dispatch) {
dispatch_async(dispatch_get_main_queue(), ^{
DispatchedDestroyContext(context);
});
} else {
dispatch_sync(dispatch_get_main_queue(), ^{
DispatchedDestroyContext(context);
});
}
}
return true; return true;
} }