Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for OpenGL 3.2 context on OS X (close #84)

Browse Source 
The Graphics module is not compatible with a core profile on Mac. If
you plan to use it, use OpenGL 2.1 (default).
This commit is contained in:
Marco Antognini 2014-04-13 16:41:03 +02:00
parent b1c062d84f
commit 0a5f38157f
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/SFML/Window/OSX/SFContext.mm
View File

@ -90,7 +90,8 @@ m_window(0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SFContext::~SFContext() SFContext::~SFContext()
{ {
@autoreleasepool { @autoreleasepool
{
[m_context clearDrawable]; [m_context clearDrawable];
m_context = nil; m_context = nil;
@ -180,6 +181,26 @@ void SFContext::createContext(SFContext* shared,
attrs.push_back(NSOpenGLPFAAccelerated); attrs.push_back(NSOpenGLPFAAccelerated);
} }
// Support for OpenGL 3.2 on Mac OS X Lion and later:
// SFML 2 Graphics module uses some OpenGL features that are deprecated
// in OpenGL 3.2 and that are no more available with core context.
// Therefore the Graphics module won't work as expected.
// 2.x are mapped to 2.1 since Apple only support that legacy version.
// >=3.0 are mapped to a 3.2 core profile.
bool legacy = settings.majorVersion < 3;
if (legacy)
{
attrs.push_back(NSOpenGLPFAOpenGLProfile);
attrs.push_back(NSOpenGLProfileVersionLegacy);
}
else
{
attrs.push_back(NSOpenGLPFAOpenGLProfile);
attrs.push_back(NSOpenGLProfileVersion3_2Core);
}
attrs.push_back((NSOpenGLPixelFormatAttribute)0); // end of array attrs.push_back((NSOpenGLPixelFormatAttribute)0); // end of array
// Create the pixel format. // Create the pixel format.
@ -198,8 +219,17 @@ void SFContext::createContext(SFContext* shared,
m_context = [[NSOpenGLContext alloc] initWithFormat:pixFmt m_context = [[NSOpenGLContext alloc] initWithFormat:pixFmt
shareContext:sharedContext]; shareContext:sharedContext];
if (m_context == nil)
{
sf::err() << "Error. Unable to create the context. Retrying without shared context." << std::endl;
m_context = [[NSOpenGLContext alloc] initWithFormat:pixFmt
shareContext:nil];
if (m_context == nil) if (m_context == nil)
sf::err() << "Error. Unable to create the context." << std::endl; sf::err() << "Error. Unable to create the context." << std::endl;
else
sf::err() << "Warning. New context created without shared context." << std::endl;
}
// Save the settings. (OpenGL version is updated elsewhere.) // Save the settings. (OpenGL version is updated elsewhere.)
m_settings = settings; m_settings = settings;