1 files changed, 17 insertions, 6 deletions

diff --git a/platform/linuxbsd/x11/detect_prime_x11.cpp b/platform/linuxbsd/x11/detect_prime_x11.cpp
index 78a10fa2b0..ed046432d8 100644
--- a/platform/linuxbsd/x11/detect_prime_x11.cpp
+++ b/platform/linuxbsd/x11/detect_prime_x11.cpp
@@ -38,8 +38,9 @@
 
 #include <stdlib.h>
 
-#include <GL/gl.h>
-#include <GL/glx.h>
+#include "thirdparty/glad/glad/gl.h"
+#include "thirdparty/glad/glad/glx.h"
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
@@ -77,8 +78,6 @@ void create_context() {
 	Window x11_window;
 	GLXContext glx_context;
 
-	GLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB = (GLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress((const GLubyte *)"glXCreateContextAttribsARB");
-
 	static int visual_attribs[] = {
 		GLX_RENDER_TYPE, GLX_RGBA_BIT,
 		GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
@@ -101,7 +100,7 @@ void create_context() {
 
 	GLXFBConfig *fbc = glXChooseFBConfig(x11_display, DefaultScreen(x11_display), visual_attribs, &fbcount);
 	if (!fbc) {
-		exit(1);
+		quick_exit(1);
 	}
 
 	vi = glXGetVisualFromFBConfig(x11_display, fbc[0]);
@@ -122,7 +121,7 @@ void create_context() {
 	x11_window = XCreateWindow(x11_display, RootWindow(x11_display, vi->screen), 0, 0, 10, 10, 0, vi->depth, InputOutput, vi->visual, valuemask, &swa);
 
 	if (!x11_window) {
-		exit(1);
+		quick_exit(1);
 	}
 
 	glXMakeCurrent(x11_display, x11_window, glx_context);
@@ -189,8 +188,20 @@ int detect_prime() {
 			if (i) {
 				setenv("DRI_PRIME", "1", 1);
 			}
+
+			if (gladLoaderLoadGLX(NULL, 0) == 0) {
+				print_verbose("Unable to load GLX, GPU detection skipped.");
+				quick_exit(1);
+			}
+
 			create_context();
 
+			PFNGLGETSTRINGPROC glGetString = (PFNGLGETSTRINGPROC)glXGetProcAddressARB((GLubyte *)"glGetString");
+			if (!glGetString) {
+				print_verbose("Unable to get glGetString, GPU detection skipped.");
+				quick_exit(1);
+			}
+
 			const char *vendor = (const char *)glGetString(GL_VENDOR);
 			const char *renderer = (const char *)glGetString(GL_RENDERER);