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

New upstream version 22.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libobs-opengl/gl-shaderparser.c
View file

@ -108,6 +108,10 @@ static void gl_write_var(struct gl_shader_parser *glsp, struct shader_var *var)
dstr_cat(&glsp->gl_string, "uniform ");
else if (var->var_type == SHADER_VAR_CONST)
dstr_cat(&glsp->gl_string, "const ");
else if (var->var_type == SHADER_VAR_INOUT)
dstr_cat(&glsp->gl_string, "inout ");
else if (var->var_type == SHADER_VAR_OUT)
dstr_cat(&glsp->gl_string, "out ");
gl_write_type(glsp, var->type);
dstr_cat(&glsp->gl_string, " ");

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

@ -323,10 +323,16 @@ error:
static int x_error_handler(Display *display, XErrorEvent *error)
{
char str[512];
XGetErrorText(display, error->error_code, str, sizeof(str));
char str1[512];
char str2[512];
char str3[512];
XGetErrorText(display, error->error_code, str1, sizeof(str1));
XGetErrorText(display, error->request_code, str2, sizeof(str2));
XGetErrorText(display, error->minor_code, str3, sizeof(str3));
blog(LOG_ERROR, "X Error: %s", str);
blog(LOG_ERROR, "X Error: %s, Major opcode: %s, "
"Minor opcode: %s, Serial: %lu",
str1, str2, str3, error->serial);
return 0;
}
@ -514,8 +520,10 @@ extern void gl_getclientsize(const struct gs_swap_chain *swap,
xcb_window_t window = swap->wi->window;
xcb_get_geometry_reply_t *geometry = get_window_geometry(xcb_conn, window);
*width = geometry->width;
*height = geometry->height;
if (geometry) {
*width = geometry->width;
*height = geometry->height;
}
free(geometry);
}