Forgot to remove temporary code in ContextGLX.cpp :)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1262 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
8e4c61dd19
commit
0f8b8d6c0f
@ -246,29 +246,6 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co
|
|||||||
// Get the context to share display lists with
|
// Get the context to share display lists with
|
||||||
GLXContext toShare = shared ? shared->myContext : NULL;
|
GLXContext toShare = shared ? shared->myContext : NULL;
|
||||||
|
|
||||||
// Create the OpenGL context -- first try an OpenGL 3.0 context if it is requested
|
|
||||||
if (settings.MajorVersion >= 3)
|
|
||||||
{
|
|
||||||
PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = reinterpret_cast<PFNWGLCREATECONTEXTATTRIBSARBPROC>(wglGetProcAddress("wglCreateContextAttribsARB"));
|
|
||||||
if (wglCreateContextAttribsARB)
|
|
||||||
{
|
|
||||||
int attributes[] =
|
|
||||||
{
|
|
||||||
WGL_CONTEXT_MAJOR_VERSION_ARB, settings.MajorVersion,
|
|
||||||
WGL_CONTEXT_MINOR_VERSION_ARB, settings.MinorVersion,
|
|
||||||
0, 0
|
|
||||||
};
|
|
||||||
myContext = wglCreateContextAttribsARB(myDeviceContext, sharedContext, attributes);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we couldn't create an OpenGL 3 context, adjust the settings
|
|
||||||
if (!myContext)
|
|
||||||
{
|
|
||||||
mySettings.MajorVersion = 2;
|
|
||||||
mySettings.MinorVersion = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create the OpenGL context -- first try an OpenGL 3.0 context if it is requested
|
// Create the OpenGL context -- first try an OpenGL 3.0 context if it is requested
|
||||||
if (settings.MajorVersion >= 3)
|
if (settings.MajorVersion >= 3)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user