fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl/x11: split large put image requests to avoid server destroy

Browse source 
wezterm in fullscreen 4k was exceeding the xcb max request size
on the put image with llvmpipe. This fixes it to send sub-images,
the Xlib put image used in glx does this internally, but not
the xcb one, so just do it in sections here.

Cc: mesa-stable
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17155>
(cherry picked from commit e6082ac62e)
This commit is contained in:
Dave Airlie 2022-06-21 10:59:32 +10:00 • committed by Dylan Baker
parent c49c481ca6
commit 350afae947
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -634,7 +634,7 @@
"description": "egl/x11: split large put image requests to avoid server destroy",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

24
src/egl/drivers/dri2/platform_x11.c
View file

@ -153,6 +153,10 @@ swrastPutImage(__DRIdrawable * draw, int op,
{
struct dri2_egl_surface *dri2_surf = loaderPrivate;
struct dri2_egl_display *dri2_dpy = dri2_egl_display(dri2_surf->base.Resource.Display);
size_t hdr_len = sizeof(xcb_put_image_request_t);
int stride_b = dri2_surf->bytes_per_pixel * w;
size_t size = (hdr_len + stride_b * h) >> 2;
uint64_t max_req_len = xcb_get_maximum_request_length(dri2_dpy->conn);
xcb_gcontext_t gc;
@ -167,9 +171,23 @@ swrastPutImage(__DRIdrawable * draw, int op,
return;
}
xcb_put_image(dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable,
gc, w, h, x, y, 0, dri2_surf->depth,
w*h*dri2_surf->bytes_per_pixel, (const uint8_t *)data);
if (size < max_req_len) {
xcb_put_image(dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable,
gc, w, h, x, y, 0, dri2_surf->depth,
h * stride_b, (const uint8_t *)data);
} else {
int num_lines = ((max_req_len << 2) - hdr_len) / stride_b;
int y_start = 0;
int y_todo = h;
while (y_todo) {
int this_lines = MIN2(num_lines, y_todo);
xcb_put_image(dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable,
gc, w, this_lines, x, y_start, 0, dri2_surf->depth,
this_lines * stride_b, ((const uint8_t *)data + y_start * stride_b));
y_start += this_lines;
y_todo -= this_lines;
}
}
}
static void