Mirror of obs-studio-wayland which has been taken down from the AUR for whatever reason
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 

50 lines
1.7 KiB

From f867ce062bd6033291a7f1168804439f88929de5 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 11 Apr 2020 23:32:16 -0300
Subject: [PATCH 12/25] libobs-opengl: Try to use the platform display if
available
We need to ensure we're running all X11 code on the same display.
---
libobs-opengl/gl-x11-egl.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/libobs-opengl/gl-x11-egl.c b/libobs-opengl/gl-x11-egl.c
index 5b413995..47b8e420 100644
--- a/libobs-opengl/gl-x11-egl.c
+++ b/libobs-opengl/gl-x11-egl.c
@@ -324,14 +324,19 @@ static void gl_x11_egl_windowinfo_destroy(struct gl_windowinfo *info)
bfree(info);
}
-static Display *open_windowless_display(void)
+static Display *open_windowless_display(Display *platform_display)
{
- Display *display = XOpenDisplay(NULL);
+ Display *display;
xcb_connection_t *xcb_conn;
xcb_screen_iterator_t screen_iterator;
xcb_screen_t *screen;
int screen_num;
+ if (platform_display)
+ display = platform_display;
+ else
+ display = XOpenDisplay(NULL);
+
if (!display) {
blog(LOG_ERROR, "Unable to open new X connection!");
return NULL;
@@ -392,7 +397,8 @@ static struct gl_platform *gl_x11_egl_platform_create(gs_device_t *device,
For an explanation see here: http://xcb.freedesktop.org/MixingCalls/
Essentially, EGL requires Xlib. Everything else we use xcb. */
struct gl_platform *plat = bmalloc(sizeof(struct gl_platform));
- Display *display = open_windowless_display();
+ Display *platform_display = obs_get_nix_platform_display();
+ Display *display = open_windowless_display(platform_display);
if (!display) {
goto fail_display_open;
--
2.28.0