TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: allow getting a GL 3.2+ context on macOS 10.7+ using gl-version

Browse Source
This commit is contained in:
rdb 2017-12-19 23:38:45 +01:00
parent 6faaabe034
commit 061e0c4862
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/cocoadisplay/cocoaGraphicsStateGuardian.mm
View File

@ -24,6 +24,10 @@
#define kCGLRendererIDMatchingMask 0x00FE7F00 #define kCGLRendererIDMatchingMask 0x00FE7F00
#endif #endif
#ifndef NSAppKitVersionNumber10_7
#define NSAppKitVersionNumber10_7 1138
#endif
TypeHandle CocoaGraphicsStateGuardian::_type_handle; TypeHandle CocoaGraphicsStateGuardian::_type_handle;
/** /**
@ -207,7 +211,8 @@ choose_pixel_format(const FrameBufferProperties &properties,
attribs.push_back(NSOpenGLPFAAccelerated); attribs.push_back(NSOpenGLPFAAccelerated);
} }
attribs.push_back(NSOpenGLPFAWindow); // This seems to cause getting a 3.2+ context to fail.
//attribs.push_back(NSOpenGLPFAWindow);
if (need_pbuffer) { if (need_pbuffer) {
attribs.push_back(NSOpenGLPFAPixelBuffer); attribs.push_back(NSOpenGLPFAPixelBuffer);
@ -217,6 +222,16 @@ choose_pixel_format(const FrameBufferProperties &properties,
attribs.push_back(NSOpenGLPFAScreenMask); attribs.push_back(NSOpenGLPFAScreenMask);
attribs.push_back(CGDisplayIDToOpenGLDisplayMask(display)); attribs.push_back(CGDisplayIDToOpenGLDisplayMask(display));
// Set OpenGL version if a minimum was requested.
if (gl_version.size() >= 1 && NSAppKitVersionNumber >= NSAppKitVersionNumber10_7) {
//NB. There is also NSOpenGLProfileVersion4_1Core, but this seems to cause
// a software implementation to be selected on my mac mini running 10.11.
if (gl_version[0] >= 4 || (gl_version.size() >= 2 && gl_version[0] == 3 && gl_version[1] >= 2)) {
attribs.push_back((NSOpenGLPixelFormatAttribute)99); // NSOpenGLPFAOpenGLProfile
attribs.push_back((NSOpenGLPixelFormatAttribute)0x3200); // NSOpenGLProfileVersion3_2Core
}
}
// End of the array // End of the array
attribs.push_back((NSOpenGLPixelFormatAttribute)0); attribs.push_back((NSOpenGLPixelFormatAttribute)0);