Skip to content

Commit

Permalink
backend: xrender: cache the present region
Browse files Browse the repository at this point in the history
to avoid creating and destroying it every frame
  • Loading branch information
absolutelynothelix committed Jan 28, 2024
1 parent efb7a14 commit 5a1990b
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions src/backend/xrender/xrender.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ typedef struct _xrender_data {
int target_width, target_height;

xcb_special_event_t *present_event;

/// Cache an X region to avoid creating and destroying it every frame. A
/// workaround for yshui/picom#1166.
xcb_xfixes_region_t present_region;
} xrender_data;

struct _xrender_blur_context {
Expand Down Expand Up @@ -597,6 +601,7 @@ static void deinit(backend_t *backend_data) {
xcb_free_pixmap(xd->base.c->c, xd->back_pixmap[i]);
}
}
x_destroy_region(xd->base.c, xd->present_region);

Check warning on line 604 in src/backend/xrender/xrender.c

View check run for this annotation

Codecov / codecov/patch

src/backend/xrender/xrender.c#L604

Added line #L604 was not covered by tests
if (xd->present_event) {
xcb_unregister_for_special_event(xd->base.c->c, xd->present_event);
}
Expand Down Expand Up @@ -624,16 +629,15 @@ static void present(backend_t *base, const region_t *region) {
XCB_NONE, xd->back[xd->curr_back], orig_x, orig_y, 0,
0, orig_x, orig_y, region_width, region_height);

auto xregion = x_create_region(base->c, region);

// Make sure we got reply from PresentPixmap before waiting for events,
// to avoid deadlock
auto e = xcb_request_check(
base->c->c, xcb_present_pixmap_checked(
xd->base.c->c, xd->target_win,
xd->back_pixmap[xd->curr_back], 0, XCB_NONE, xregion, 0,
0, XCB_NONE, XCB_NONE, XCB_NONE, 0, 0, 0, 0, 0, NULL));
x_destroy_region(base->c, xregion);
base->c->c,

Check warning on line 635 in src/backend/xrender/xrender.c

View check run for this annotation

Codecov / codecov/patch

src/backend/xrender/xrender.c#L635

Added line #L635 was not covered by tests
xcb_present_pixmap_checked(
base->c->c, xd->target_win, xd->back_pixmap[xd->curr_back], 0, XCB_NONE,
x_set_region(base->c, xd->present_region, region) ? xd->present_region

Check warning on line 638 in src/backend/xrender/xrender.c

View check run for this annotation

Codecov / codecov/patch

src/backend/xrender/xrender.c#L637-L638

Added lines #L637 - L638 were not covered by tests
: XCB_NONE,
0, 0, XCB_NONE, XCB_NONE, XCB_NONE, 0, 0, 0, 0, 0, NULL));
if (e) {
log_error("Failed to present pixmap");
free(e);
Expand Down Expand Up @@ -929,6 +933,10 @@ static backend_t *backend_xrender_init(session_t *ps, xcb_window_t target) {
xd->vsync = false;
}

if (xd->vsync) {
xd->present_region = x_create_region(&ps->c, &ps->screen_reg);

Check warning on line 937 in src/backend/xrender/xrender.c

View check run for this annotation

Codecov / codecov/patch

src/backend/xrender/xrender.c#L936-L937

Added lines #L936 - L937 were not covered by tests
}

// We might need to do double buffering for vsync, and buffer 0 and 1 are for
// double buffering.
int first_buffer_index = xd->vsync ? 0 : 2;
Expand Down

0 comments on commit 5a1990b

Please sign in to comment.