OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/x11/sw: Implement swapbuffers with damage

Browse Source 
Co-authored-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29910>
This commit is contained in:
Lucas Fryzek
2024-06-20 16:54:40 +01:00
committed by Marge Bot
parent fb5afd804e
commit be050e34a7
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/egl/drivers/dri2/platform_x11.c
View File

@@ -150,14 +150,14 @@ swrastGetDrawableInfo(__DRIdrawable *draw, int *x, int *y, int *w, int *h,
} }
static void static void
swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h, swrastPutImage2(__DRIdrawable *draw, int op, int x, int y, int w, int h,
char *data, void *loaderPrivate) int stride, char *data, void *loaderPrivate)
{ {
struct dri2_egl_surface *dri2_surf = loaderPrivate; struct dri2_egl_surface *dri2_surf = loaderPrivate;
struct dri2_egl_display *dri2_dpy = struct dri2_egl_display *dri2_dpy =
dri2_egl_display(dri2_surf->base.Resource.Display); 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; int stride_b = dri2_surf->bytes_per_pixel * w;
size_t hdr_len = sizeof(xcb_put_image_request_t);
size_t size = (hdr_len + stride_b * h) >> 2; size_t size = (hdr_len + stride_b * h) >> 2;
uint64_t max_req_len = xcb_get_maximum_request_length(dri2_dpy->conn); uint64_t max_req_len = xcb_get_maximum_request_length(dri2_dpy->conn);
@@ -177,9 +177,20 @@ swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h,
/* clamp to drawable size */ /* clamp to drawable size */
if (y + h > dri2_surf->base.Height) if (y + h > dri2_surf->base.Height)
h = dri2_surf->base.Height - y; h = dri2_surf->base.Height - y;
/* y-invert */
y = dri2_surf->base.Height - y - h; /* If stride of pixels to copy is different from the surface stride
if (size < max_req_len) { * then we need to copy lines one by one.
*/
if (stride_b != stride) {
for (unsigned i = 0; i < h; i++) {
cookie = xcb_put_image(
dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable, gc, w,
1, x, y+i, 0, dri2_surf->depth, stride_b, (uint8_t*)data);
xcb_discard_reply(dri2_dpy->conn, cookie.sequence);
data += stride;
}
} else if (size < max_req_len) {
cookie = xcb_put_image( cookie = xcb_put_image(
dri2_dpy->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, dri2_surf->drawable, gc, w, 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); h, x, y, 0, dri2_surf->depth, h * stride_b, (const uint8_t *)data);
@@ -200,13 +211,16 @@ swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h,
y_todo -= this_lines; y_todo -= this_lines;
} }
} }
xcb_flush(dri2_dpy->conn);
} }
static void static void
swrastPutImage2(__DRIdrawable *draw, int op, int x, int y, int w, int h, swrastPutImage(__DRIdrawable *draw, int op, int x, int y, int w, int h,
int stride, char *data, void *loaderPrivate) char *data, void *loaderPrivate)
{ {
swrastPutImage(draw, op, x, y, w, h, data, loaderPrivate); struct dri2_egl_surface *dri2_surf = loaderPrivate;
int stride_b = dri2_surf->bytes_per_pixel * w;
swrastPutImage2(draw, op, x, y, w, h, stride_b, data, loaderPrivate);
} }
static void static void
@@ -1638,6 +1652,8 @@ dri2_initialize_x11_swrast(_EGLDisplay *disp)
if (dri2_dpy->multibuffers_available) if (dri2_dpy->multibuffers_available)
dri2_set_WL_bind_wayland_display(disp); dri2_set_WL_bind_wayland_display(disp);
#endif #endif
} else {
disp->Extensions.EXT_swap_buffers_with_damage = EGL_TRUE;
} }
disp->Extensions.EXT_buffer_age = EGL_TRUE; disp->Extensions.EXT_buffer_age = EGL_TRUE;
disp->Extensions.ANGLE_sync_control_rate = EGL_TRUE; disp->Extensions.ANGLE_sync_control_rate = EGL_TRUE;