Browse Source

Use Qt provided display with GLX functions for consistency.
Remove unneeded assignment from previous code.

Zachary Lund 11 years ago
parent
commit
ee9ff9cfb9
1 changed files with 1 additions and 2 deletions
  1. 1 2
      libobs-opengl/gl-x11.c

+ 1 - 2
libobs-opengl/gl-x11.c

@@ -100,7 +100,7 @@ struct gl_platform *gl_platform_create(device_t device,
 {
 {
 	int num_configs = 0;
 	int num_configs = 0;
 	int error_base = 0, event_base = 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));
 	struct gl_platform *plat = bzalloc(sizeof(struct gl_platform));
 	GLXFBConfig* configs;
 	GLXFBConfig* configs;
 
 
@@ -176,7 +176,6 @@ struct gl_platform *gl_platform_create(device_t device,
 	plat->swap.device = device;
 	plat->swap.device = device;
 	plat->swap.info	  = *info;
 	plat->swap.info	  = *info;
 	plat->swap.wi     = gl_windowinfo_create(info);
 	plat->swap.wi     = gl_windowinfo_create(info);
-	plat->swap.wi->display = display;
 
 
 	XFree(configs);
 	XFree(configs);
 	XSync(display, False);
 	XSync(display, False);