We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] dispatch GL context updates to main thread

cocoa.patch (text/plain), 2.96 KB, created by Tim McDaniel on 2020-01-08 20:31:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim McDaniel

Created: 2020-01-08 20:31:59 UTC

Size: 2.96 KB

patch

obsolete

>--- src/video/cocoa/SDL_cocoaopengl#head.h	2020-01-08 14:08:06.000000000 
>+++ src/video/cocoa/SDL_cocoaopengl.h	2020-01-08 14:03:04.000000000 
>@@ -46,12 +46,15 @@
> 
> - (id)initWithFormat:(NSOpenGLPixelFormat *)format
>         shareContext:(NSOpenGLContext *)share;
> - (void)scheduleUpdate;
> - (void)updateIfNeeded;
> - (void)setWindow:(SDL_Window *)window;
>+- (SDL_Window*)window;
>+- (void)explicitUpdate;
>+
> 
> @end
> 
> /* OpenGL functions */
> extern int Cocoa_GL_LoadLibrary(_THIS, const char *path);
> extern void *Cocoa_GL_GetProcAddress(_THIS, const char *proc);
>
>--- src/video/cocoa/SDL_cocoaopengl#head.m	2020-01-08 14:08:34.000000000 
>+++ src/video/cocoa/SDL_cocoaopengl.m	2020-01-08 14:03:04.000000000 
>@@ -63,13 +63,13 @@
> /* This should only be called on the thread on which a user is using the context. */
> - (void)updateIfNeeded
> {
>     int value = SDL_AtomicSet(&self->dirty, 0);
>     if (value > 0) {
>         /* We call the real underlying update here, since -[SDLOpenGLContext update] just calls us. */
>-        [super update];
>+        [self explicitUpdate];
>     }
> }
> 
> /* This should only be called on the thread on which a user is using the context. */
> - (void)update
> {
>@@ -112,26 +112,43 @@
>         NSMutableArray *contexts = windowdata->nscontexts;
>         @synchronized (contexts) {
>             [contexts addObject:self];
>         }
> 
>         if ([self view] != contentview) {
>-            [self setView:contentview];
>+            if ([NSThread isMainThread]) {
>+                [self setView:contentview];
>+            } else {
>+                dispatch_sync(dispatch_get_main_queue(), ^{ [self setView:contentview]; });
>+            }
>             if (self == [NSOpenGLContext currentContext]) {
>-                [self update];
>+                [self explicitUpdate];
>             } else {
>                 [self scheduleUpdate];
>             }
>         }
>     } else {
>         [self clearDrawable];
>         if (self == [NSOpenGLContext currentContext]) {
>-            [self update];
>+            [self explicitUpdate];
>         } else {
>             [self scheduleUpdate];
>         }
>+    }
>+}
>+
>+- (SDL_Window*)window
>+{
>+    return self->window;
>+}
>+- (void)explicitUpdate
>+{
>+    if ([NSThread isMainThread]) {
>+        [super update];
>+    } else {
>+        dispatch_sync(dispatch_get_main_queue(), ^{ [super update]; });
>     }
> }
> 
> @end
> 
> 
>@@ -345,14 +362,16 @@
> int
> Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
> { @autoreleasepool
> {
>     if (context) {
>         SDLOpenGLContext *nscontext = (SDLOpenGLContext *)context;
>-        [nscontext setWindow:window];
>-        [nscontext updateIfNeeded];
>+        if ([nscontext window] != window) {
>+            [nscontext setWindow:window];
>+            [nscontext updateIfNeeded];
>+        }
>         [nscontext makeCurrentContext];
>     } else {
>         [NSOpenGLContext clearCurrentContext];
>     }
> 
>     return 0;

Actions: View | Diff

Attachments on bug 4932: 4155

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.