mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-14 23:34:08 +00:00
Merge pull request #1934 from kkartaltepe/alpha-linux
linux-capture: Correct XCompCap glxFBConfigs alpha check
This commit is contained in:
commit
0546d18855
|
@ -17,6 +17,50 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
static char *gl_error_to_str(GLenum errorcode)
|
||||
{
|
||||
static void *err_to_str[][2] = {
|
||||
{
|
||||
GL_INVALID_ENUM,
|
||||
"GL_INVALID_ENUM",
|
||||
},
|
||||
{
|
||||
GL_INVALID_VALUE,
|
||||
"GL_INVALID_VALUE",
|
||||
},
|
||||
{
|
||||
GL_INVALID_OPERATION,
|
||||
"GL_INVALID_OPERATION",
|
||||
},
|
||||
{
|
||||
GL_INVALID_FRAMEBUFFER_OPERATION,
|
||||
"GL_INVALID_FRAMEBUFFER_OPERATION",
|
||||
},
|
||||
{
|
||||
GL_OUT_OF_MEMORY,
|
||||
"GL_OUT_OF_MEMORY",
|
||||
},
|
||||
{
|
||||
GL_STACK_UNDERFLOW,
|
||||
"GL_STACK_UNDERFLOW",
|
||||
},
|
||||
{
|
||||
GL_STACK_OVERFLOW,
|
||||
"GL_STACK_OVERFLOW",
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
"Unknown",
|
||||
},
|
||||
};
|
||||
int i = 0;
|
||||
while ((GLenum)err_to_str[i][0] != errorcode ||
|
||||
err_to_str[i][0] == NULL) {
|
||||
i += 2;
|
||||
}
|
||||
return err_to_str[i][1];
|
||||
}
|
||||
|
||||
/*
|
||||
* Okay, so GL error handling is.. unclean to work with. I don't want
|
||||
* to have to keep typing out the same stuff over and over again do I'll just
|
||||
|
@ -29,8 +73,9 @@ static inline bool gl_success(const char *funcname)
|
|||
if (errorcode != GL_NO_ERROR) {
|
||||
int attempts = 8;
|
||||
do {
|
||||
blog(LOG_ERROR, "%s failed, glGetError returned 0x%X",
|
||||
funcname, errorcode);
|
||||
blog(LOG_ERROR,
|
||||
"%s failed, glGetError returned %s(0x%X)",
|
||||
funcname, gl_error_to_str(errorcode), errorcode);
|
||||
errorcode = glGetError();
|
||||
|
||||
--attempts;
|
||||
|
|
|
@ -41,6 +41,8 @@ static inline GLenum convert_gs_format(enum gs_color_format format)
|
|||
return GL_RED;
|
||||
case GS_RGBA:
|
||||
return GL_RGBA;
|
||||
case GS_RGBX:
|
||||
return GL_RGBA;
|
||||
case GS_BGRX:
|
||||
return GL_BGRA;
|
||||
case GS_BGRA:
|
||||
|
@ -87,6 +89,8 @@ static inline GLenum convert_gs_internal_format(enum gs_color_format format)
|
|||
return GL_R8;
|
||||
case GS_RGBA:
|
||||
return GL_RGBA;
|
||||
case GS_RGBX:
|
||||
return GL_RGB;
|
||||
case GS_BGRX:
|
||||
return GL_RGB;
|
||||
case GS_BGRA:
|
||||
|
@ -133,6 +137,8 @@ static inline GLenum get_gl_format_type(enum gs_color_format format)
|
|||
return GL_UNSIGNED_BYTE;
|
||||
case GS_RGBA:
|
||||
return GL_UNSIGNED_BYTE;
|
||||
case GS_RGBX:
|
||||
return GL_UNSIGNED_BYTE;
|
||||
case GS_BGRX:
|
||||
return GL_UNSIGNED_BYTE;
|
||||
case GS_BGRA:
|
||||
|
|
|
@ -106,6 +106,26 @@ gs_texture_t *device_texture_create(gs_device_t *device, uint32_t width,
|
|||
goto fail;
|
||||
if (!upload_texture_2d(tex, data))
|
||||
goto fail;
|
||||
} else {
|
||||
if (!gl_bind_texture(GL_TEXTURE_2D, tex->base.texture))
|
||||
goto fail;
|
||||
|
||||
uint32_t row_size =
|
||||
tex->width * gs_get_format_bpp(tex->base.format);
|
||||
uint32_t tex_size = tex->height * row_size / 8;
|
||||
bool compressed = gs_is_compressed_format(tex->base.format);
|
||||
bool did_init = gl_init_face(GL_TEXTURE_2D, tex->base.gl_type,
|
||||
1, tex->base.gl_format,
|
||||
tex->base.gl_internal_format,
|
||||
compressed, tex->width,
|
||||
tex->height, tex_size, NULL);
|
||||
did_init =
|
||||
gl_tex_param_i(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
|
||||
|
||||
bool did_unbind =
|
||||
gl_bind_texture(GL_TEXTURE_2D, tex->base.texture);
|
||||
if (!did_init || !did_unbind)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
return (gs_texture_t *)tex;
|
||||
|
|
|
@ -58,6 +58,7 @@ enum gs_color_format {
|
|||
GS_A8,
|
||||
GS_R8,
|
||||
GS_RGBA,
|
||||
GS_RGBX,
|
||||
GS_BGRX,
|
||||
GS_BGRA,
|
||||
GS_R10G10B10A2,
|
||||
|
@ -894,6 +895,8 @@ static inline uint32_t gs_get_format_bpp(enum gs_color_format format)
|
|||
return 8;
|
||||
case GS_RGBA:
|
||||
return 32;
|
||||
case GS_RGBX:
|
||||
return 32;
|
||||
case GS_BGRX:
|
||||
return 32;
|
||||
case GS_BGRA:
|
||||
|
|
|
@ -250,23 +250,40 @@ static Window getWindowFromString(std::string wstr)
|
|||
static void xcc_cleanup(XCompcapMain_private *p)
|
||||
{
|
||||
PLock lock(&p->lock);
|
||||
XDisplayLock xlock;
|
||||
XErrorLock xlock;
|
||||
|
||||
if (p->gltex) {
|
||||
GLuint gltex = *(GLuint *)gs_texture_get_obj(p->gltex);
|
||||
glBindTexture(GL_TEXTURE_2D, gltex);
|
||||
glXReleaseTexImageEXT(xdisp, p->glxpixmap, GLX_FRONT_LEFT_EXT);
|
||||
if (p->glxpixmap) {
|
||||
glXReleaseTexImageEXT(xdisp, p->glxpixmap,
|
||||
GLX_FRONT_LEFT_EXT);
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR,
|
||||
"cleanup glXReleaseTexImageEXT failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
xlock.resetError();
|
||||
}
|
||||
glXDestroyPixmap(xdisp, p->glxpixmap);
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR,
|
||||
"cleanup glXDestroyPixmap failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
xlock.resetError();
|
||||
}
|
||||
p->glxpixmap = 0;
|
||||
}
|
||||
gs_texture_destroy(p->gltex);
|
||||
p->gltex = 0;
|
||||
}
|
||||
|
||||
if (p->glxpixmap) {
|
||||
glXDestroyPixmap(xdisp, p->glxpixmap);
|
||||
p->glxpixmap = 0;
|
||||
}
|
||||
|
||||
if (p->pixmap) {
|
||||
XFreePixmap(xdisp, p->pixmap);
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR, "cleanup glXDestroyPixmap failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
xlock.resetError();
|
||||
}
|
||||
p->pixmap = 0;
|
||||
}
|
||||
|
||||
|
@ -276,12 +293,56 @@ static void xcc_cleanup(XCompcapMain_private *p)
|
|||
XSelectInput(xdisp, p->win, 0);
|
||||
p->win = 0;
|
||||
}
|
||||
|
||||
if (p->tex) {
|
||||
gs_texture_destroy(p->tex);
|
||||
p->tex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static gs_color_format gs_format_from_tex()
|
||||
{
|
||||
GLint iformat = 0;
|
||||
// we can probably fix the intel swapped texture by querying via
|
||||
// GL_ARB_internalformat_query
|
||||
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT,
|
||||
&iformat);
|
||||
switch (iformat) {
|
||||
case GL_RGB:
|
||||
return GS_RGBX;
|
||||
case GL_RGBA:
|
||||
return GS_RGBA;
|
||||
default:
|
||||
return GS_RGBA;
|
||||
}
|
||||
}
|
||||
|
||||
// from libobs-opengl/gl-subsystem.h because we need to handle GLX modifying textures outside libobs.
|
||||
struct fb_info;
|
||||
|
||||
struct gs_texture {
|
||||
gs_device_t *device;
|
||||
enum gs_texture_type type;
|
||||
enum gs_color_format format;
|
||||
GLenum gl_format;
|
||||
GLenum gl_target;
|
||||
GLenum gl_internal_format;
|
||||
GLenum gl_type;
|
||||
GLuint texture;
|
||||
uint32_t levels;
|
||||
bool is_dynamic;
|
||||
bool is_render_target;
|
||||
bool is_dummy;
|
||||
bool gen_mipmaps;
|
||||
|
||||
gs_samplerstate_t *cur_sampler;
|
||||
struct fbo_info *fbo;
|
||||
};
|
||||
// End shitty hack.
|
||||
|
||||
void XCompcapMain::updateSettings(obs_data_t *settings)
|
||||
{
|
||||
PLock lock(&p->lock);
|
||||
XErrorLock xlock;
|
||||
ObsGsContextHolder obsctx;
|
||||
|
||||
blog(LOG_DEBUG, "Settings updating");
|
||||
|
@ -312,12 +373,10 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
p->win = prevWin;
|
||||
}
|
||||
|
||||
xlock.resetError();
|
||||
|
||||
XErrorLock xlock;
|
||||
if (p->win)
|
||||
XCompositeRedirectWindow(xdisp, p->win,
|
||||
CompositeRedirectAutomatic);
|
||||
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR, "XCompositeRedirectWindow failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
|
@ -347,71 +406,22 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
xcursor_offset(p->cursor, x, y);
|
||||
}
|
||||
|
||||
gs_color_format cf = GS_RGBA;
|
||||
|
||||
if (p->exclude_alpha) {
|
||||
cf = GS_BGRX;
|
||||
}
|
||||
|
||||
bool has_alpha = true;
|
||||
|
||||
const int attrs[] = {GLX_BIND_TO_TEXTURE_RGBA_EXT,
|
||||
GL_TRUE,
|
||||
GLX_DRAWABLE_TYPE,
|
||||
GLX_PIXMAP_BIT,
|
||||
GLX_BIND_TO_TEXTURE_TARGETS_EXT,
|
||||
GLX_TEXTURE_2D_BIT_EXT,
|
||||
GLX_ALPHA_SIZE,
|
||||
8,
|
||||
GLX_DOUBLEBUFFER,
|
||||
GL_FALSE,
|
||||
None};
|
||||
|
||||
const int config_attrs[] = {GLX_BIND_TO_TEXTURE_RGBA_EXT,
|
||||
GL_TRUE,
|
||||
GLX_DRAWABLE_TYPE,
|
||||
GLX_PIXMAP_BIT,
|
||||
GLX_BIND_TO_TEXTURE_TARGETS_EXT,
|
||||
GLX_TEXTURE_2D_BIT_EXT,
|
||||
GLX_DOUBLEBUFFER,
|
||||
GL_FALSE,
|
||||
None};
|
||||
int nelem = 0;
|
||||
GLXFBConfig *configs = glXGetFBConfigs(
|
||||
xdisp, XCompcap::getRootWindowScreen(attr.root), &nelem);
|
||||
GLXFBConfig *configs = glXChooseFBConfig(
|
||||
xdisp, XCompcap::getRootWindowScreen(attr.root), config_attrs,
|
||||
&nelem);
|
||||
|
||||
if (nelem <= 0) {
|
||||
blog(LOG_ERROR, "no fb configs available");
|
||||
p->win = 0;
|
||||
p->height = 0;
|
||||
p->width = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
GLXFBConfig config;
|
||||
for (int i = 0; i < nelem; i++) {
|
||||
config = configs[i];
|
||||
XVisualInfo *visual = glXGetVisualFromFBConfig(xdisp, config);
|
||||
if (!visual)
|
||||
continue;
|
||||
|
||||
if (attr.visual->visualid != visual->visualid) {
|
||||
XFree(visual);
|
||||
continue;
|
||||
}
|
||||
XFree(visual);
|
||||
|
||||
int value;
|
||||
glXGetFBConfigAttrib(xdisp, config, GLX_ALPHA_SIZE, &value);
|
||||
if (value != 8)
|
||||
has_alpha = false;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
XFree(configs);
|
||||
configs = glXChooseFBConfig(
|
||||
xdisp, XCompcap::getRootWindowScreen(attr.root), attrs, &nelem);
|
||||
|
||||
if (nelem <= 0) {
|
||||
blog(LOG_ERROR, "no matching fb config found");
|
||||
p->win = 0;
|
||||
p->height = 0;
|
||||
p->width = 0;
|
||||
return;
|
||||
}
|
||||
bool found = false;
|
||||
GLXFBConfig config;
|
||||
for (int i = 0; i < nelem; i++) {
|
||||
config = configs[i];
|
||||
XVisualInfo *visual = glXGetVisualFromFBConfig(xdisp, config);
|
||||
|
@ -426,10 +436,16 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
found = true;
|
||||
break;
|
||||
}
|
||||
if (!found)
|
||||
config = configs[0];
|
||||
if (!found) {
|
||||
blog(LOG_ERROR, "no matching fb config found");
|
||||
p->win = 0;
|
||||
p->height = 0;
|
||||
p->width = 0;
|
||||
XFree(configs);
|
||||
return;
|
||||
}
|
||||
|
||||
if (cf == GS_BGRX || !has_alpha) {
|
||||
if (p->exclude_alpha || attr.depth != 32) {
|
||||
p->draw_opaque = true;
|
||||
}
|
||||
|
||||
|
@ -463,31 +479,10 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
p->cur_cut_right = 0;
|
||||
}
|
||||
|
||||
if (p->tex)
|
||||
gs_texture_destroy(p->tex);
|
||||
|
||||
uint8_t *texData = new uint8_t[width() * height() * 4];
|
||||
|
||||
memset(texData, 0, width() * height() * 4);
|
||||
|
||||
const uint8_t *texDataArr[] = {texData, 0};
|
||||
|
||||
p->tex = gs_texture_create(width(), height(), cf, 1, texDataArr, 0);
|
||||
|
||||
delete[] texData;
|
||||
|
||||
if (p->swapRedBlue) {
|
||||
GLuint tex = *(GLuint *)gs_texture_get_obj(p->tex);
|
||||
glBindTexture(GL_TEXTURE_2D, tex);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
}
|
||||
|
||||
// Precautionary since we dont error check every GLX call above.
|
||||
xlock.resetError();
|
||||
|
||||
p->pixmap = XCompositeNameWindowPixmap(xdisp, p->win);
|
||||
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR, "XCompositeNameWindowPixmap failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
|
@ -496,19 +491,12 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
return;
|
||||
}
|
||||
|
||||
const int attribs_alpha[] = {GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
|
||||
GLX_TEXTURE_FORMAT_EXT,
|
||||
GLX_TEXTURE_FORMAT_RGBA_EXT, None};
|
||||
|
||||
const int attribs_no_alpha[] = {GLX_TEXTURE_TARGET_EXT,
|
||||
GLX_TEXTURE_2D_EXT,
|
||||
GLX_TEXTURE_FORMAT_EXT,
|
||||
GLX_TEXTURE_FORMAT_RGB_EXT, None};
|
||||
|
||||
const int *attribs = cf == GS_RGBA ? attribs_alpha : attribs_no_alpha;
|
||||
|
||||
p->glxpixmap = glXCreatePixmap(xdisp, config, p->pixmap, attribs);
|
||||
// Should be consistent format with config we are using. Since we searched on RGBA lets use RGBA here.
|
||||
const int pixmap_attrs[] = {GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
|
||||
GLX_TEXTURE_FORMAT_EXT,
|
||||
GLX_TEXTURE_FORMAT_RGBA_EXT, None};
|
||||
|
||||
p->glxpixmap = glXCreatePixmap(xdisp, config, p->pixmap, pixmap_attrs);
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR, "glXCreatePixmap failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
|
@ -518,33 +506,53 @@ void XCompcapMain::updateSettings(obs_data_t *settings)
|
|||
p->glxpixmap = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
XFree(configs);
|
||||
|
||||
p->gltex = gs_texture_create(p->width, p->height, cf, 1, 0,
|
||||
// Build an OBS texture to bind the pixmap to.
|
||||
p->gltex = gs_texture_create(p->width, p->height, GS_RGBA, 1, 0,
|
||||
GS_GL_DUMMYTEX);
|
||||
|
||||
GLuint gltex = *(GLuint *)gs_texture_get_obj(p->gltex);
|
||||
glBindTexture(GL_TEXTURE_2D, gltex);
|
||||
glXBindTexImageEXT(xdisp, p->glxpixmap, GLX_FRONT_LEFT_EXT, NULL);
|
||||
if (xlock.gotError()) {
|
||||
blog(LOG_ERROR, "glXBindTexImageEXT failed: %s",
|
||||
xlock.getErrorText().c_str());
|
||||
XFreePixmap(xdisp, p->pixmap);
|
||||
XFree(configs);
|
||||
p->pixmap = 0;
|
||||
p->glxpixmap = 0;
|
||||
return;
|
||||
}
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
||||
// glxBindTexImageEXT might modify the textures format.
|
||||
gs_color_format format = gs_format_from_tex();
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
// sync OBS texture format based on any glxBindTexImageEXT changes
|
||||
p->gltex->format = format;
|
||||
|
||||
// Create a pure OBS texture to use for rendering. Using the same
|
||||
// format so we can copy instead of drawing from the source gltex.
|
||||
if (p->tex)
|
||||
gs_texture_destroy(p->tex);
|
||||
p->tex = gs_texture_create(width(), height(), format, 1, 0,
|
||||
GS_GL_DUMMYTEX);
|
||||
if (p->swapRedBlue) {
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_R, GL_BLUE);
|
||||
}
|
||||
|
||||
if (!p->windowName.empty()) {
|
||||
blog(LOG_INFO,
|
||||
"[window-capture: '%s'] update settings:\n"
|
||||
"\ttitle: %s\n"
|
||||
"\tclass: %s\n"
|
||||
"\tHas alpha: %s\n"
|
||||
"\tFound proper GLXFBConfig: %s\n",
|
||||
"\tBit depth: %i\n"
|
||||
"\tFound proper GLXFBConfig (in %i): %s\n",
|
||||
obs_source_get_name(p->source),
|
||||
XCompcap::getWindowName(p->win).c_str(),
|
||||
XCompcap::getWindowClass(p->win).c_str(),
|
||||
has_alpha ? "yes" : "no", found ? "yes" : "no");
|
||||
blog(LOG_DEBUG,
|
||||
"\n"
|
||||
"\tid: %s",
|
||||
std::to_string((long long)p->win).c_str());
|
||||
XCompcap::getWindowClass(p->win).c_str(), attr.depth,
|
||||
nelem, found ? "yes" : "no");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -592,6 +600,7 @@ void XCompcapMain::tick(float seconds)
|
|||
obs_enter_graphics();
|
||||
|
||||
if (p->lockX) {
|
||||
// XDisplayLock is still live so we should already be locked.
|
||||
XLockDisplay(xdisp);
|
||||
XSync(xdisp, 0);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue