diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-12-20 10:28:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-20 10:28:16 +0100 |
| commit | 51c5fa48abee5daa19f6b849aa6c3291bd295573 (patch) | |
| tree | e45968019a0068a1e837c8ee90d27dc9b1c8c678 | |
| parent | 1e3d896d1948e524a1d3ee8e09b34df9dd317acc (diff) | |
| parent | 3c198aecaa9970ba7f8a87fa9400ee6a79f1f35c (diff) | |
Merge pull request #56039 from Rubonnek/update-detect-prime-formatting-master
| -rw-r--r-- | platform/linuxbsd/detect_prime_x11.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/platform/linuxbsd/detect_prime_x11.cpp b/platform/linuxbsd/detect_prime_x11.cpp index c775546f15..5bcfc44f12 100644 --- a/platform/linuxbsd/detect_prime_x11.cpp +++ b/platform/linuxbsd/detect_prime_x11.cpp @@ -91,7 +91,7 @@ void create_context() { }; int fbcount; - GLXFBConfig fbconfig = 0; + GLXFBConfig fbconfig = nullptr; XVisualInfo *vi = nullptr; XSetWindowAttributes swa; @@ -100,8 +100,9 @@ void create_context() { unsigned long valuemask = CWBorderPixel | CWColormap | CWEventMask; GLXFBConfig *fbc = glXChooseFBConfig(x11_display, DefaultScreen(x11_display), visual_attribs, &fbcount); - if (!fbc) + if (!fbc) { exit(1); + } vi = glXGetVisualFromFBConfig(x11_display, fbc[0]); @@ -120,8 +121,9 @@ void create_context() { swa.colormap = XCreateColormap(x11_display, RootWindow(x11_display, vi->screen), vi->visual, AllocNone); 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) + if (!x11_window) { exit(1); + } glXMakeCurrent(x11_display, x11_window, glx_context); XFree(vi); @@ -179,8 +181,9 @@ int detect_prime() { close(fdset[0]); - if (i) + if (i) { setenv("DRI_PRIME", "1", 1); + } create_context(); const char *vendor = (const char *)glGetString(GL_VENDOR); |