BitHeaven/picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new glx: implement dim

Browse Source 
Also removed a bunch of unused functions and macros. Fixed a memory leak
of gl_texture::refcount.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui
2019-03-10 02:25:41 +00:00
parent a72fb0c755
commit 5f22b4b31c
3 changed files with 24 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/gl/glx.c
View File

@@ -178,7 +178,8 @@ void glx_release_image(backend_t *base, void *image_data) {
wd->glpixmap = 0;
}
gl_delete_texture(wd->texture.texture);
glDeleteTextures(1, &wd->texture.texture);
free(wd->texture.refcount);
// Free structure itself
free(wd);
@@ -255,7 +256,6 @@ static backend_t *glx_init(session_t *ps) {
goto end;
}
// Ensure GLX_EXT_texture_from_pixmap exists
if (!glxext.has_GLX_EXT_texture_from_pixmap) {
log_error("GLX_EXT_texture_from_pixmap is not supported by your driver");
goto end;
@@ -311,17 +311,6 @@ static backend_t *glx_init(session_t *ps) {
goto end;
}
#ifdef DEBUG_GLX_DEBUG_CONTEXT
f_DebugMessageCallback p_DebugMessageCallback =
(f_DebugMessageCallback)glXGetProcAddress((const GLubyte *)"glDebugMessageCal"
"lback");
if (!p_DebugMessageCallback) {
log_error("Failed to get glDebugMessageCallback(0.");
goto glx_init_end;
}
p_DebugMessageCallback(glx_debug_msg_callback, ps);
#endif
if (!gl_init(&gd->gl, ps)) {
log_error("Failed to setup OpenGL");
goto end;
@@ -411,6 +400,7 @@ glx_bind_pixmap(backend_t *base, xcb_pixmap_t pixmap, struct xvisual_info fmt, b
wd->texture.opacity = 1;
wd->texture.depth = fmt.visual_depth;
wd->texture.color_inverted = false;
wd->texture.dim = 0;
wd->texture.has_alpha = fmt.alpha_size != 0;
wd->texture.refcount = ccalloc(1, int);
*wd->texture.refcount = 1;