From d8448a4938e213726893df0364bd885463bd0570 Mon Sep 17 00:00:00 2001 From: laurentgom Date: Tue, 13 Oct 2009 19:03:49 +0000 Subject: [PATCH] Experimenting a fix for the GLX issue with ATI cards, put OpenGL 3 contexts handling back git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1235 4e206d99-4929-0410-ac5d-dfc041789085 --- src/SFML/Window/Linux/ContextGLX.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SFML/Window/Linux/ContextGLX.cpp b/src/SFML/Window/Linux/ContextGLX.cpp index d9f308b7..2b56933c 100644 --- a/src/SFML/Window/Linux/ContextGLX.cpp +++ b/src/SFML/Window/Linux/ContextGLX.cpp @@ -63,7 +63,7 @@ myOwnsWindow(true) CreateContext(shared, VideoMode::GetDesktopMode().BitsPerPixel, ContextSettings(0, 0, 0)); // Activate the context - if (shared) + //if (shared) SetActive(true); } @@ -87,7 +87,7 @@ myOwnsWindow(false) CreateContext(shared, bitsPerPixel, settings); // Activate the context - if (shared) + //if (shared) SetActive(true); } @@ -275,7 +275,7 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co GLXContext toShare = shared ? shared->myContext : NULL; // Create the context -- first try an OpenGL 3.0 context if it is supported - /*const GLubyte* name = reinterpret_cast("glXCreateContextAttribsARB"); + const GLubyte* name = reinterpret_cast("glXCreateContextAttribsARB"); PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = reinterpret_cast(glXGetProcAddress(name)); if (glXCreateContextAttribsARB) { @@ -295,7 +295,7 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co 0, 0 }; myContext = glXCreateContextAttribsARB(myDisplay, configs[0], toShare, true, attributes); - }*/ + } // If the OpenGL 3.0 context failed, create a regular OpenGL 1.x context if (!myContext)