1 files changed, 60 insertions, 4 deletions

diff --git a/platform/x11/context_gl_x11.cpp b/platform/x11/context_gl_x11.cpp
index 9f987e1376..39b704d2c4 100644
--- a/platform/x11/context_gl_x11.cpp
+++ b/platform/x11/context_gl_x11.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -34,7 +34,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
+#include <GL/glxext.h>
 
 #define GLX_CONTEXT_MAJOR_VERSION_ARB		0x2091
 #define GLX_CONTEXT_MINOR_VERSION_ARB		0x2092
@@ -74,12 +76,19 @@ static GLWrapperFuncPtr wrapper_get_proc_address(const char* p_function) {
 
 }*/
 
+static bool ctxErrorOccurred = false;
+static int ctxErrorHandler( Display *dpy, XErrorEvent *ev )
+{
+    ctxErrorOccurred = true;
+    return 0;
+}
+
 Error ContextGL_X11::initialize() {
 
 
 	GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = NULL;
 
-//	const char *extensions = glXQueryExtensionsString(x11_display, DefaultScreen(x11_display));
+	//const char *extensions = glXQueryExtensionsString(x11_display, DefaultScreen(x11_display));
 
 	glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB");
 
@@ -131,20 +140,31 @@ Error ContextGL_X11::initialize() {
 		//};
 
 
+	int (*oldHandler)(Display*, XErrorEvent*) =
+		     XSetErrorHandler(&ctxErrorHandler);
+
+
 	if (!opengl_3_context) {
 		//oldstyle context:
 		p->glx_context = glXCreateContext(x11_display, vi, 0, GL_TRUE);
 	} else {
 		static int context_attribs[] = {
 			GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-			GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+			GLX_CONTEXT_MINOR_VERSION_ARB, 3,
+			GLX_CONTEXT_FLAGS_ARB        , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB/*|GLX_CONTEXT_DEBUG_BIT_ARB*/,
 			None
 		};
 
 		p->glx_context = glXCreateContextAttribsARB(x11_display, fbc[0], NULL, true, context_attribs);
-		ERR_FAIL_COND_V(!p->glx_context,ERR_UNCONFIGURED);
+		ERR_EXPLAIN("Could not obtain an OpenGL 3.3 context!");
+		ERR_FAIL_COND_V(ctxErrorOccurred || !p->glx_context,ERR_UNCONFIGURED);
 	}
 
+	XSync( x11_display, False );
+	XSetErrorHandler( oldHandler );
+
+	print_line("ALL IS GOOD");
+
 	glXMakeCurrent(x11_display, x11_window, p->glx_context);
 
 	/*
@@ -176,6 +196,41 @@ int ContextGL_X11::get_window_height() {
 	return xwa.height;
 }
 
+void ContextGL_X11::set_use_vsync(bool p_use) {
+	static bool setup = false;
+	static PFNGLXSWAPINTERVALEXTPROC glXSwapIntervalEXT = NULL;
+	static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalMESA = NULL;
+	static PFNGLXSWAPINTERVALSGIPROC glXSwapIntervalSGI = NULL;
+
+	if (!setup) {
+		setup = true;
+		String extensions = glXQueryExtensionsString(x11_display, DefaultScreen(x11_display));
+		if (extensions.find("GLX_EXT_swap_control") != -1)
+			glXSwapIntervalEXT  = (PFNGLXSWAPINTERVALEXTPROC) glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalEXT");
+		if (extensions.find("GLX_MESA_swap_control") != -1)
+			glXSwapIntervalMESA = (PFNGLXSWAPINTERVALSGIPROC) glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalMESA");
+		if (extensions.find("GLX_SGI_swap_control") != -1)
+			glXSwapIntervalSGI  = (PFNGLXSWAPINTERVALSGIPROC) glXGetProcAddressARB((const GLubyte*)"glXSwapIntervalSGI");
+	}
+	int val = p_use ? 1:0;
+	if (glXSwapIntervalMESA) {
+		glXSwapIntervalMESA(val);
+	}
+	else if (glXSwapIntervalSGI) {
+		glXSwapIntervalSGI(val);
+	}
+	else if (glXSwapIntervalEXT) {
+		GLXDrawable drawable = glXGetCurrentDrawable();
+		glXSwapIntervalEXT(x11_display, drawable, val);
+	}
+	else return;
+	use_vsync = p_use;
+}
+bool ContextGL_X11::is_using_vsync() const {
+
+	return use_vsync;
+}
+
 
 ContextGL_X11::ContextGL_X11(::Display *p_x11_display,::Window &p_x11_window,const OS::VideoMode& p_default_video_mode,bool p_opengl_3_context) : x11_window(p_x11_window) {
 
@@ -189,6 +244,7 @@ ContextGL_X11::ContextGL_X11(::Display *p_x11_display,::Window &p_x11_window,con
 	glx_minor=glx_major=0;
 	p = memnew( ContextGL_X11_Private );
 	p->glx_context=0;
+	use_vsync=false;
 }