PolytreeDE
/
picom
mirror of https://github.com/yshui/picom.git
1
0
Fork 0
Code Releases Activity

backend: xrender: implement the new new new backend interface 

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2024-04-11 19:22:24 +01:00
parent 2a240f86bf
commit a6caf3f7ae
No known key found for this signature in database
GPG Key ID: D3A4405BE6CC17F4
4 changed files with 469 additions and 483 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

912
src/backend/xrender/xrender.c
View File

File diff suppressed because it is too large Load Diff

8
src/render.c
View File

@ -415,7 +415,7 @@ void paint_one(session_t *ps, struct managed_win *w, const region_t *reg_paint)
};
w->paint.pict = x_create_picture_with_pictfmt_and_pixmap(
&ps->c, w->pictfmt, draw, XCB_RENDER_CP_SUBWINDOW_MODE, &pa);
&ps->c, w->pictfmt->id, draw, XCB_RENDER_CP_SUBWINDOW_MODE, &pa);
}
// GLX: Build texture
@ -443,8 +443,8 @@ void paint_one(session_t *ps, struct managed_win *w, const region_t *reg_paint)
// Invert window color, if required
if (bkend_use_xrender(ps) && w->invert_color) {
xcb_render_picture_t newpict =
x_create_picture_with_pictfmt(&ps->c, wid, hei, w->pictfmt, 0, NULL);
xcb_render_picture_t newpict = x_create_picture_with_pictfmt(
&ps->c, wid, hei, w->pictfmt->id, w->pictfmt->depth, 0, NULL);
if (newpict) {
// Apply clipping region to save some CPU
if (reg_paint) {
@ -1252,7 +1252,7 @@ void paint_all(session_t *ps, struct managed_win *t) {
auto pictfmt = x_get_pictform_for_visual(
&ps->c, ps->c.screen_info->root_visual);
xcb_render_picture_t new_pict = x_create_picture_with_pictfmt(
&ps->c, rwidth, rheight, pictfmt, 0, NULL);
&ps->c, rwidth, rheight, pictfmt->id, pictfmt->depth, 0, NULL);
xcb_render_composite(ps->c.c, XCB_RENDER_PICT_OP_SRC,
ps->tgt_buffer.pict, XCB_NONE, new_pict, 0,
0, 0, 0, 0, 0, rwidth, rheight);

23
src/x.c
View File

@ -341,8 +341,7 @@ x_get_pictfmt_for_standard(struct x_connection *c, xcb_pict_standard_t std) {
}
xcb_render_picture_t
x_create_picture_with_pictfmt_and_pixmap(struct x_connection *c,
const xcb_render_pictforminfo_t *pictfmt,
x_create_picture_with_pictfmt_and_pixmap(struct x_connection *c, xcb_render_pictformat_t pictfmt,
xcb_pixmap_t pixmap, uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr) {
void *buf = NULL;
@ -355,13 +354,14 @@ x_create_picture_with_pictfmt_and_pixmap(struct x_connection *c,
}
xcb_render_picture_t tmp_picture = x_new_id(c);
xcb_generic_error_t *e = xcb_request_check(
c->c, xcb_render_create_picture_checked(c->c, tmp_picture, pixmap,
pictfmt->id, valuemask, buf));
xcb_generic_error_t *e =
xcb_request_check(c->c, xcb_render_create_picture_checked(
c->c, tmp_picture, pixmap, pictfmt, valuemask, buf));
free(buf);
if (e) {
log_error_x_error(e, "failed to create picture");
free(e);
abort();
return XCB_NONE;
}
return tmp_picture;
@ -372,7 +372,7 @@ x_create_picture_with_visual_and_pixmap(struct x_connection *c, xcb_visualid_t v
xcb_pixmap_t pixmap, uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr) {
const xcb_render_pictforminfo_t *pictfmt = x_get_pictform_for_visual(c, visual);
return x_create_picture_with_pictfmt_and_pixmap(c, pictfmt, pixmap, valuemask, attr);
return x_create_picture_with_pictfmt_and_pixmap(c, pictfmt->id, pixmap, valuemask, attr);
}
xcb_render_picture_t
@ -383,7 +383,7 @@ x_create_picture_with_standard_and_pixmap(struct x_connection *c, xcb_pict_stand
auto pictfmt = xcb_render_util_find_standard_format(g_pictfmts, standard);
assert(pictfmt);
return x_create_picture_with_pictfmt_and_pixmap(c, pictfmt, pixmap, valuemask, attr);
return x_create_picture_with_pictfmt_and_pixmap(c, pictfmt->id, pixmap, valuemask, attr);
}
xcb_render_picture_t
@ -394,7 +394,8 @@ x_create_picture_with_standard(struct x_connection *c, int w, int h,
auto pictfmt = xcb_render_util_find_standard_format(g_pictfmts, standard);
assert(pictfmt);
return x_create_picture_with_pictfmt(c, w, h, pictfmt, valuemask, attr);
return x_create_picture_with_pictfmt(c, w, h, pictfmt->id, pictfmt->depth,
valuemask, attr);
}
/**
@ -402,9 +403,8 @@ x_create_picture_with_standard(struct x_connection *c, int w, int h,
*/
xcb_render_picture_t
x_create_picture_with_pictfmt(struct x_connection *c, int w, int h,
const xcb_render_pictforminfo_t *pictfmt, uint32_t valuemask,
xcb_render_pictformat_t pictfmt, uint8_t depth, uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr) {
uint8_t depth = pictfmt->depth;
xcb_pixmap_t tmp_pixmap = x_create_pixmap(c, depth, w, h);
if (!tmp_pixmap) {
@ -424,7 +424,8 @@ x_create_picture_with_visual(struct x_connection *c, int w, int h, xcb_visualid_
uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr) {
auto pictfmt = x_get_pictform_for_visual(c, visual);
return x_create_picture_with_pictfmt(c, w, h, pictfmt, valuemask, attr);
return x_create_picture_with_pictfmt(c, w, h, pictfmt->id, pictfmt->depth,
valuemask, attr);
}
bool x_fetch_region(struct x_connection *c, xcb_xfixes_region_t r, pixman_region32_t *res) {

9
src/x.h
View File

@ -274,11 +274,10 @@ const xcb_render_pictforminfo_t *
x_get_pictform_for_visual(struct x_connection *, xcb_visualid_t);
xcb_render_picture_t
x_create_picture_with_pictfmt_and_pixmap(struct x_connection *,
const xcb_render_pictforminfo_t *pictfmt,
x_create_picture_with_pictfmt_and_pixmap(struct x_connection *, xcb_render_pictformat_t pictfmt,
xcb_pixmap_t pixmap, uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr)
attr_nonnull(1, 2);
attr_nonnull(1);
xcb_render_picture_t
x_create_picture_with_visual_and_pixmap(struct x_connection *, xcb_visualid_t visual,
@ -303,9 +302,9 @@ x_create_picture_with_standard(struct x_connection *c, int w, int h,
*/
xcb_render_picture_t
x_create_picture_with_pictfmt(struct x_connection *, int w, int h,
const xcb_render_pictforminfo_t *pictfmt, uint32_t valuemask,
xcb_render_pictformat_t pictfmt, uint8_t depth, uint32_t valuemask,
const xcb_render_create_picture_value_list_t *attr)
attr_nonnull(1, 4);
attr_nonnull(1);
xcb_render_picture_t
x_create_picture_with_visual(struct x_connection *, int w, int h, xcb_visualid_t visual,