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

Experimenting a fix for the GLX issue with ATI cards, put OpenGL 3 contexts handling back

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1235 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2009-10-13 19:03:49 +00:00
parent c049196149
commit d8448a4938
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SFML/Window/Linux/ContextGLX.cpp
View File

@ -63,7 +63,7 @@ myOwnsWindow(true)
CreateContext(shared, VideoMode::GetDesktopMode().BitsPerPixel, ContextSettings(0, 0, 0)); CreateContext(shared, VideoMode::GetDesktopMode().BitsPerPixel, ContextSettings(0, 0, 0));
// Activate the context // Activate the context
if (shared) //if (shared)
SetActive(true); SetActive(true);
} }
@ -87,7 +87,7 @@ myOwnsWindow(false)
CreateContext(shared, bitsPerPixel, settings); CreateContext(shared, bitsPerPixel, settings);
// Activate the context // Activate the context
if (shared) //if (shared)
SetActive(true); SetActive(true);
} }
@ -275,7 +275,7 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co
GLXContext toShare = shared ? shared->myContext : NULL; GLXContext toShare = shared ? shared->myContext : NULL;
// Create the context -- first try an OpenGL 3.0 context if it is supported // Create the context -- first try an OpenGL 3.0 context if it is supported
/*const GLubyte* name = reinterpret_cast<const GLubyte*>("glXCreateContextAttribsARB"); const GLubyte* name = reinterpret_cast<const GLubyte*>("glXCreateContextAttribsARB");
PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = reinterpret_cast<PFNGLXCREATECONTEXTATTRIBSARBPROC>(glXGetProcAddress(name)); PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = reinterpret_cast<PFNGLXCREATECONTEXTATTRIBSARBPROC>(glXGetProcAddress(name));
if (glXCreateContextAttribsARB) if (glXCreateContextAttribsARB)
{ {
@ -295,7 +295,7 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co
0, 0 0, 0
}; };
myContext = glXCreateContextAttribsARB(myDisplay, configs[0], toShare, true, attributes); myContext = glXCreateContextAttribsARB(myDisplay, configs[0], toShare, true, attributes);
}*/ }
// If the OpenGL 3.0 context failed, create a regular OpenGL 1.x context // If the OpenGL 3.0 context failed, create a regular OpenGL 1.x context
if (!myContext) if (!myContext)