jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1495 from SingularityAzure/linux-capture-xcompcap-singularity 

linux-capture: Fix repeated color-swapping and improve robustness further
master
Jim 2018-09-24 14:55:09 -07:00 committed by GitHub
parent 2f51abf994 c286f0c202
commit 2a08f1d144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/linux-capture/xcompcap-main.cpp
View File

@ -357,7 +357,9 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
}
if (cf == GS_BGRX) {
p->swapRedBlue = !p->swapRedBlue;
if (settings) {
p->swapRedBlue = !p->swapRedBlue;
}
p->draw_opaque = true;
}
@ -444,13 +446,14 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
GLXFBConfig config;
bool found = false;
for (int i = 0; i < nelem; i++) {
int visual;
config = configs[i];
glXGetFBConfigAttrib(xdisp, config, GLX_VISUAL_ID, &visual);
if ((int)attr.visual->visualid == visual) {
XVisualInfo *visual = glXGetVisualFromFBConfig(xdisp, config);
if (attr.visual->visualid == visual->visualid) {
found = true;
XFree(visual);
break;
}
XFree(visual);
}
if (!found) {
@ -488,7 +491,7 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
None
};
const int *attribs = has_alpha ? attribs_alpha : attribs_no_alpha;
const int *attribs = cf == GS_RGBA ? attribs_alpha : attribs_no_alpha;
p->glxpixmap = glXCreatePixmap(xdisp, config, p->pixmap, attribs);