2020-09-19 07:38:13 +00:00
|
|
|
From f686f95d5577e39d1e230992db9667263a50b056 Mon Sep 17 00:00:00 2001
|
2020-08-09 11:22:33 +00:00
|
|
|
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
|
|
|
|
|
Date: Tue, 7 Apr 2020 23:17:02 -0300
|
2020-09-01 10:47:53 +00:00
|
|
|
Subject: [PATCH 09/24] UI: Set the Unix platform on startup
|
2020-08-09 11:22:33 +00:00
|
|
|
|
|
|
|
|
Move the OBS_USE_EGL environment variable check to obs-app.cpp,
|
|
|
|
|
and set the OBS platform to be either OBS_NIX_PLATFORM_X11_GLX
|
|
|
|
|
or OBS_NIX_PLATFORM_X11_EGL.
|
|
|
|
|
---
|
|
|
|
|
UI/obs-app.cpp | 4 ++++
|
|
|
|
|
libobs-opengl/gl-nix.c | 10 ++++++----
|
|
|
|
|
libobs-opengl/gl-nix.h | 2 ++
|
|
|
|
|
3 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
|
|
|
|
|
index cf9ecabf..c62ba1da 100644
|
|
|
|
|
--- a/UI/obs-app.cpp
|
|
|
|
|
+++ b/UI/obs-app.cpp
|
|
|
|
|
@@ -1354,6 +1354,10 @@ bool OBSApp::OBSInit()
|
|
|
|
|
#if !defined(_WIN32) && !defined(__APPLE__)
|
|
|
|
|
obs_set_nix_platform(OBS_NIX_PLATFORM_X11_GLX);
|
|
|
|
|
if (QApplication::platformName() == "xcb") {
|
|
|
|
|
+ if (getenv("OBS_USE_EGL")) {
|
|
|
|
|
+ blog(LOG_INFO, "Using EGL/X11");
|
|
|
|
|
+ obs_set_nix_platform(OBS_NIX_PLATFORM_X11_EGL);
|
|
|
|
|
+ }
|
|
|
|
|
obs_set_nix_platform_display(QX11Info::display());
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
diff --git a/libobs-opengl/gl-nix.c b/libobs-opengl/gl-nix.c
|
|
|
|
|
index 4b616ef1..9ed3d198 100644
|
|
|
|
|
--- a/libobs-opengl/gl-nix.c
|
|
|
|
|
+++ b/libobs-opengl/gl-nix.c
|
|
|
|
|
@@ -25,11 +25,13 @@ static void init_winsys(void)
|
|
|
|
|
{
|
|
|
|
|
assert(gl_vtable == NULL);
|
|
|
|
|
|
|
|
|
|
- if (getenv("OBS_USE_EGL")) {
|
|
|
|
|
- gl_vtable = gl_x11_egl_get_winsys_vtable();
|
|
|
|
|
- blog(LOG_INFO, "Using EGL/X11");
|
|
|
|
|
- } else {
|
|
|
|
|
+ switch (obs_get_nix_platform()) {
|
|
|
|
|
+ case OBS_NIX_PLATFORM_X11_GLX:
|
|
|
|
|
gl_vtable = gl_x11_glx_get_winsys_vtable();
|
|
|
|
|
+ break;
|
|
|
|
|
+ case OBS_NIX_PLATFORM_X11_EGL:
|
|
|
|
|
+ gl_vtable = gl_x11_egl_get_winsys_vtable();
|
|
|
|
|
+ break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert(gl_vtable != NULL);
|
|
|
|
|
diff --git a/libobs-opengl/gl-nix.h b/libobs-opengl/gl-nix.h
|
|
|
|
|
index 209cc308..f5532719 100644
|
|
|
|
|
--- a/libobs-opengl/gl-nix.h
|
|
|
|
|
+++ b/libobs-opengl/gl-nix.h
|
|
|
|
|
@@ -17,6 +17,8 @@
|
|
|
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
|
|
|
|
|
+#include <obs-nix-platform.h>
|
|
|
|
|
+
|
|
|
|
|
#include "gl-subsystem.h"
|
|
|
|
|
|
|
|
|
|
struct gl_winsys_vtable {
|
|
|
|
|
--
|
|
|
|
|
2.28.0
|
|
|
|
|
|
