admin/SDL
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocoa: Patched to compile on macOS SDK < 10.10.

Browse Source 
Fixes #6586.

(cherry picked from commit fa5adcafd5)
This commit is contained in:
Ryan C. Gordon committed 2022-11-26 14:00:59 -05:00
1 parent 859cb13ef8
commit 5edd6846db
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/video/cocoa/SDL_cocoaopengl.h
+3
View File
@@ -59,6 +59,9 @@ struct SDL_GLDriverData
- (SDL_Window*)window; - (SDL_Window*)window;
- (void)explicitUpdate; - (void)explicitUpdate;
- (void)dealloc; - (void)dealloc;
@property (retain, nonatomic) NSOpenGLPixelFormat* openglPixelFormat; // macOS 10.10 has -[NSOpenGLContext pixelFormat] but this handles older OS releases.
@end @end
/* OpenGL functions */ /* OpenGL functions */
src/video/cocoa/SDL_cocoaopengl.m
+2 -1
View File
@@ -76,6 +76,7 @@ DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp* now, const
{ {
self = [super initWithFormat:format shareContext:share]; self = [super initWithFormat:format shareContext:share];
if (self) { if (self) {
self.openglPixelFormat = format;
SDL_AtomicSet(&self->dirty, 0); SDL_AtomicSet(&self->dirty, 0);
self->window = NULL; self->window = NULL;
SDL_AtomicSet(&self->swapIntervalSetting, 0); SDL_AtomicSet(&self->swapIntervalSetting, 0);
@@ -100,7 +101,7 @@ DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp* now, const
- (void)movedToNewScreen - (void)movedToNewScreen
{ {
if (self->displayLink) { if (self->displayLink) {
CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(self->displayLink, [self CGLContextObj], [[self pixelFormat] CGLPixelFormatObj]); CVDisplayLinkSetCurrentCGDisplayFromOpenGLContext(self->displayLink, [self CGLContextObj], [[self openglPixelFormat] CGLPixelFormatObj]);
} }
} }