update x11/picom to 10.1
bugfix release: - fix a GL texture leak - fix crash when shadow radius is set to 0 - undefined symbol error (patch-src_backend_gl_egl_c)
This commit is contained in:
parent
72193d2546
commit
cc58550156
@ -2,7 +2,7 @@ COMMENT = lightweight compositor for X11
|
||||
|
||||
GH_ACCOUNT = yshui
|
||||
GH_PROJECT = picom
|
||||
GH_TAGNAME = v10
|
||||
GH_TAGNAME = v10.1
|
||||
|
||||
CATEGORIES = x11
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (picom-10.tar.gz) = 6EAwTDKfB5cgWWMwKJTFXhHXfPUaIsCnIINEzm/Qojg=
|
||||
SIZE (picom-10.tar.gz) = 286728
|
||||
SHA256 (picom-10.1.tar.gz) = kvMr/RT7qSWRiwhKttH4iIGzWG48jLcTYdCUjwz9NK0=
|
||||
SIZE (picom-10.1.tar.gz) = 286934
|
||||
|
@ -1,39 +0,0 @@
|
||||
don't assume glEGLImageTargetTexStorage exists. Backport of
|
||||
https://github.com/yshui/picom/commit/6bcda50170031ef95fa02bc1bf94f87947c66e44
|
||||
|
||||
Index: src/backend/gl/egl.c
|
||||
--- src/backend/gl/egl.c.orig
|
||||
+++ src/backend/gl/egl.c
|
||||
@@ -36,6 +36,8 @@ struct egl_data {
|
||||
EGLContext ctx;
|
||||
};
|
||||
|
||||
+static PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC glEGLImageTargetTexStorage = NULL;
|
||||
+
|
||||
/**
|
||||
* Free a glx_texture_t.
|
||||
*/
|
||||
@@ -202,6 +204,14 @@ static backend_t *egl_init(session_t *ps) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
+ glEGLImageTargetTexStorage =
|
||||
+ (PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC)eglGetProcAddress("glEGLImageTargetTexS"
|
||||
+ "torageEXT");
|
||||
+ if (glEGLImageTargetTexStorage == NULL) {
|
||||
+ log_error("Failed to get glEGLImageTargetTexStorageEXT.");
|
||||
+ goto end;
|
||||
+ }
|
||||
+
|
||||
gd->gl.decouple_texture_user_data = egl_decouple_user_data;
|
||||
gd->gl.release_user_data = egl_release_image;
|
||||
|
||||
@@ -270,7 +280,7 @@ egl_bind_pixmap(backend_t *base, xcb_pixmap_t pixmap,
|
||||
wd->dim = 0;
|
||||
wd->inner->refcount = 1;
|
||||
glBindTexture(GL_TEXTURE_2D, inner->texture);
|
||||
- glEGLImageTargetTexStorageEXT(GL_TEXTURE_2D, eglpixmap->image, NULL);
|
||||
+ glEGLImageTargetTexStorage(GL_TEXTURE_2D, eglpixmap->image, NULL);
|
||||
glBindTexture(GL_TEXTURE_2D, 0);
|
||||
|
||||
gl_check_err();
|
@ -1,17 +0,0 @@
|
||||
fix log_debug call. backport of
|
||||
https://github.com/yshui/picom/commit/5580f461dcf3465ce48dfce335b7c4661d67207b
|
||||
|
||||
Index: src/picom.c
|
||||
--- src/picom.c.orig
|
||||
+++ src/picom.c
|
||||
@@ -539,8 +539,8 @@ static bool initialize_backend(session_t *ps) {
|
||||
} else {
|
||||
shader->attributes = 0;
|
||||
}
|
||||
- log_debug("Shader %s has attributes %ld", shader->key,
|
||||
- shader->attributes);
|
||||
+ log_debug("Shader %s has attributes %"PRIu64,
|
||||
+ shader->key, shader->attributes);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user