Skip to content

Commit 1fea468

Browse files
committed
shiny/driver/gldriver: revert "update the open gl context after making it current"
This reverts CL 154461. [NSOpenGLContext update] must be called from the main thread if the context has a view. The makeCurrentContext function is not called from the main thread, so it is not thread safe to make a direct [ctx update]; call in it. Doing so causes gldriver to crash with a SIGILL signal when compiled with Xcode 11.1 or newer on macOS Catalina. Fixes golang/go#35177 Change-Id: I566c9526cddf31ed981312466f8843c2030d6692 Reviewed-on: https://go-review.googlesource.com/c/exp/+/212245 Reviewed-by: Nigel Tao <[email protected]>
1 parent 2f50522 commit 1fea468

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

shiny/driver/gldriver/cocoa.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
void makeCurrentContext(uintptr_t context) {
3535
NSOpenGLContext* ctx = (NSOpenGLContext*)context;
3636
[ctx makeCurrentContext];
37-
[ctx update];
3837
}
3938

4039
void flushContext(uintptr_t context) {

0 commit comments

Comments
 (0)