X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fglx%2Fglcontext.cpp;h=ad63350283c223cc3a92aec699f316e5b8ad471c;hb=HEAD;hp=54541e969802216d19b51fe79ee40d05555c0471;hpb=5dde3e3ca938df53f0fbd0ee5cc4576684e1dbaf;p=libs%2Fgui.git

diff --git a/source/graphics/glx/glcontext.cpp b/source/graphics/glx/glcontext.cpp
index 54541e9..ad63350 100644
--- a/source/graphics/glx/glcontext.cpp
+++ b/source/graphics/glx/glcontext.cpp
@@ -1,9 +1,10 @@
+#include "glcontext.h"
 #include <set>
 #include <vector>
 #include <GL/glx.h>
 #include <GL/glxext.h>
+#include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
-#include "glcontext.h"
 #include "display_private.h"
 #include "window_private.h"
 
@@ -16,10 +17,10 @@ typedef GLXContext ContextHandle;
 
 struct GLContext::Private
 {
-	ContextHandle context;
+	ContextHandle context = nullptr;
 	// We need to create a window with the chosen visual
-	WindowHandle subwnd;
-	GLXWindow glxwnd;
+	WindowHandle subwnd = None;
+	GLXWindow glxwnd = None;
 };
 
 
@@ -96,13 +97,34 @@ void GLContext::platform_init(const GLOptions &opts)
 		priv->subwnd = XCreateWindow(dpy, window.get_private().window, 0, 0, window.get_width(), window.get_height(), 0, vi->depth, InputOutput, vi->visual, CWColormap, &attr);
 		XMapWindow(dpy, priv->subwnd);
 
-		priv->glxwnd = glXCreateWindow(dpy, fb_configs[0], priv->subwnd, 0);
+		priv->glxwnd = glXCreateWindow(dpy, fb_configs[0], priv->subwnd, nullptr);
 
-		if(opts.forward_compatible || opts.gl_version_major)
+		if(opts.forward_compatible || opts.gl_version_major!=GLOptions::DEFAULT_VERSION)
 		{
 			if(!extensions.count("GLX_ARB_create_context") || !extensions.count("GLX_ARB_get_proc_address"))
 				throw unsupported_gl_mode(opts);
 
+			unsigned gl_version_major = opts.gl_version_major;
+			unsigned gl_version_minor = opts.gl_version_minor;
+			if(opts.gl_version_major==GLOptions::LATEST_VERSION)
+			{
+				ContextHandle probe_context = glXCreateNewContext(dpy, fb_configs[0], GLX_RGBA_TYPE, nullptr, true);
+				glXMakeContextCurrent(dpy, priv->glxwnd, priv->glxwnd, probe_context);
+
+				const char *gl_ver_ptr = reinterpret_cast<const char *>(glGetString(GL_VERSION));
+				if(!gl_ver_ptr)
+					throw unsupported_gl_mode(opts);
+
+				string gl_ver = gl_ver_ptr;
+				vector<string> parts = split(gl_ver.substr(0, gl_ver.find(' ')), '.');
+
+				gl_version_major = lexical_cast<unsigned>(parts[0]);
+				gl_version_minor = lexical_cast<unsigned>(parts[1]);
+
+				glXMakeContextCurrent(dpy, None, None, nullptr);
+				glXDestroyContext(dpy, probe_context);
+			}
+
 			vector<int> ctx_attribs;
 
 			ctx_attribs.push_back(GLX_RENDER_TYPE);
@@ -114,22 +136,28 @@ void GLContext::platform_init(const GLOptions &opts)
 				ctx_attribs.push_back(GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB);
 			}
 
+			if(opts.core_profile)
+			{
+				ctx_attribs.push_back(GLX_CONTEXT_PROFILE_MASK_ARB);
+				ctx_attribs.push_back(GLX_CONTEXT_CORE_PROFILE_BIT_ARB);
+			}
+
 			if(opts.gl_version_major)
 			{
 				ctx_attribs.push_back(GLX_CONTEXT_MAJOR_VERSION_ARB);
-				ctx_attribs.push_back(opts.gl_version_major);
+				ctx_attribs.push_back(gl_version_major);
 				ctx_attribs.push_back(GLX_CONTEXT_MINOR_VERSION_ARB);
-				ctx_attribs.push_back(opts.gl_version_minor);
+				ctx_attribs.push_back(gl_version_minor);
 			}
 
 			ctx_attribs.push_back(0);
 
 			const GLubyte *name = reinterpret_cast<const GLubyte *>("glXCreateContextAttribsARB");
 			PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs = reinterpret_cast<PFNGLXCREATECONTEXTATTRIBSARBPROC>(glXGetProcAddressARB(name));
-			priv->context = glXCreateContextAttribs(dpy, fb_configs[0], 0, true, &ctx_attribs[0]);
+			priv->context = glXCreateContextAttribs(dpy, fb_configs[0], nullptr, true, &ctx_attribs[0]);
 		}
 		else
-			priv->context = glXCreateNewContext(dpy, fb_configs[0], GLX_RGBA_TYPE, 0, true);
+			priv->context = glXCreateNewContext(dpy, fb_configs[0], GLX_RGBA_TYPE, nullptr, true);
 
 		XFree(vi);
 		XFree(fb_configs);
@@ -177,7 +205,7 @@ void GLContext::platform_init(const GLOptions &opts)
 
 		priv = new Private;
 		priv->glxwnd = 0;
-		priv->context = glXCreateContext(dpy, vi, 0, true);
+		priv->context = glXCreateContext(dpy, vi, nullptr, true);
 
 		XSetWindowAttributes attr;
 		attr.colormap = XCreateColormap(dpy, DefaultRootWindow(dpy), vi->visual, AllocNone);
@@ -197,11 +225,11 @@ GLContext::~GLContext()
 
 	if(priv->glxwnd)
 	{
-		glXMakeContextCurrent(dpy, 0, 0, 0);
+		glXMakeContextCurrent(dpy, None, None, nullptr);
 		glXDestroyWindow(dpy, priv->glxwnd);
 	}
 	else
-		glXMakeCurrent(dpy, 0, 0);
+		glXMakeCurrent(dpy, None, nullptr);
 	glXDestroyContext(dpy, priv->context);
 	XDestroyWindow(dpy, priv->subwnd);