From ee9ff9cfb928430e5ce1a8d9bcf55a71e1c2af54 Mon Sep 17 00:00:00 2001 From: Zachary Lund Date: Thu, 3 Apr 2014 17:36:01 -0500 Subject: [PATCH] Use Qt provided display with GLX functions for consistency. Remove unneeded assignment from previous code. --- libobs-opengl/gl-x11.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libobs-opengl/gl-x11.c b/libobs-opengl/gl-x11.c index f82adf619..63ca344cb 100644 --- a/libobs-opengl/gl-x11.c +++ b/libobs-opengl/gl-x11.c @@ -100,7 +100,7 @@ struct gl_platform *gl_platform_create(device_t device, { int num_configs = 0; int error_base = 0, event_base = 0; - Display *display = XOpenDisplay(NULL); /* Open default screen */ + Display *display = info->window.display; struct gl_platform *plat = bzalloc(sizeof(struct gl_platform)); GLXFBConfig* configs; @@ -176,7 +176,6 @@ struct gl_platform *gl_platform_create(device_t device, plat->swap.device = device; plat->swap.info = *info; plat->swap.wi = gl_windowinfo_create(info); - plat->swap.wi->display = display; XFree(configs); XSync(display, False);