lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 18.0.1+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2017-04-19 21:54:15 +02:00
parent 6efda2859e
commit f2cf6cce50
1337 changed files with 41178 additions and 84670 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libobs-opengl/gl-subsystem.c
View file

@ -221,6 +221,14 @@ int device_create(gs_device_t **p_device, uint32_t adapter)
device_leave_context(device);
device->cur_swap = NULL;
#ifdef _WIN32
blog(LOG_INFO, "Warning: The OpenGL renderer is currently in use. "
"On windows, the OpenGL renderer can decrease "
"capture performance due to the lack of specific "
"features used to maximize capture performance. "
"The Direct3D 11 renderer is recommended instead.");
#endif
*p_device = device;
return GS_SUCCESS;
@ -447,7 +455,7 @@ void device_load_texture(gs_device_t *device, gs_texture_t *tex, int unit)
/* need a pixel shader to properly bind textures */
if (!device->cur_pixel_shader)
tex = NULL;
goto fail;
if (cur_tex == tex)
return;

7
libobs-opengl/gl-x11.c
View file

@ -587,7 +587,12 @@ extern void device_present(gs_device_t *device)
initialized = true;
}
/* TODO: Handle XCB events. */
xcb_connection_t *xcb_conn = XGetXCBConnection(display);
xcb_generic_event_t *xcb_event;
while((xcb_event = xcb_poll_for_event(xcb_conn))) {
/* TODO: Handle XCB events. */
free(xcb_event);
}
switch (swap_type) {
case SWAP_TYPE_EXT: glXSwapIntervalEXT(display, window, 0); break;