mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-18 06:34:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

vulkan/wsi: Update sw x11 wsi to only copy damage regions

Browse Source 
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-25 14:32:32 +01:00 committed by Marge Bot
parent be050e34a7
commit 71a97b2047
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/vulkan/wsi/wsi_common_x11.c
View File

@ -76,6 +76,8 @@
#define XCB_PRESENT_CAPABILITY_ASYNC_MAY_TEAR 8 #define XCB_PRESENT_CAPABILITY_ASYNC_MAY_TEAR 8
#endif #endif
#define MAX_DAMAGE_RECTS 64
struct wsi_x11_connection { struct wsi_x11_connection {
bool has_dri3; bool has_dri3;
bool has_dri3_modifiers; bool has_dri3_modifiers;
@ -1062,6 +1064,8 @@ struct x11_image {
uint8_t * shmaddr; uint8_t * shmaddr;
uint64_t present_id; uint64_t present_id;
VkPresentModeKHR present_mode; VkPresentModeKHR present_mode;
xcb_rectangle_t rects[MAX_DAMAGE_RECTS];
int rectangle_count;
/* In IMMEDIATE and MAILBOX modes, we can have multiple pending presentations per image. /* In IMMEDIATE and MAILBOX modes, we can have multiple pending presentations per image.
* We need to keep track of them when considering present ID. */ * We need to keep track of them when considering present ID. */
@ -1480,7 +1484,24 @@ x11_present_to_x11_sw(struct x11_swapchain *chain, uint32_t image_index)
size_t size = (hdr_len + stride_b * chain->extent.height) >> 2; size_t size = (hdr_len + stride_b * chain->extent.height) >> 2;
uint64_t max_req_len = xcb_get_maximum_request_length(chain->conn); uint64_t max_req_len = xcb_get_maximum_request_length(chain->conn);
if (size < max_req_len) { if (image->rectangle_count > 0) {
for (int i = 0; i < image->rectangle_count; i++) {
xcb_rectangle_t rect = chain->images[image_index].rects[i];
const uint8_t *data = (const uint8_t*)myptr + (rect.y * stride_b) + (rect.x * 4);
for (int j = 0; j < rect.height; j++) {
cookie = xcb_put_image(chain->conn, XCB_IMAGE_FORMAT_Z_PIXMAP,
chain->window, chain->gc,
rect.width,
1,
rect.x, rect.y + j,
0, chain->depth,
rect.width * 4,
data);
xcb_discard_reply(chain->conn, cookie.sequence);
data += stride_b;
}
}
} else if (size < max_req_len) {
cookie = xcb_put_image(chain->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, cookie = xcb_put_image(chain->conn, XCB_IMAGE_FORMAT_Z_PIXMAP,
chain->window, chain->window,
chain->gc, chain->gc,
@ -1755,8 +1776,6 @@ x11_acquire_next_image(struct wsi_swapchain *anv_chain,
return result; return result;
} }
#define MAX_DAMAGE_RECTS 64
/** /**
* Queue a new presentation of an image that was previously acquired by the * Queue a new presentation of an image that was previously acquired by the
* consumer. * consumer.
@ -1780,7 +1799,7 @@ x11_queue_present(struct wsi_swapchain *anv_chain,
if (damage && damage->pRectangles && damage->rectangleCount > 0 && if (damage && damage->pRectangles && damage->rectangleCount > 0 &&
damage->rectangleCount <= MAX_DAMAGE_RECTS) { damage->rectangleCount <= MAX_DAMAGE_RECTS) {
xcb_rectangle_t rects[MAX_DAMAGE_RECTS]; xcb_rectangle_t *rects = chain->images[image_index].rects;
update_area = chain->images[image_index].update_region; update_area = chain->images[image_index].update_region;
for (unsigned i = 0; i < damage->rectangleCount; i++) { for (unsigned i = 0; i < damage->rectangleCount; i++) {
@ -1792,6 +1811,9 @@ x11_queue_present(struct wsi_swapchain *anv_chain,
rects[i].height = rect->extent.height; rects[i].height = rect->extent.height;
} }
xcb_xfixes_set_region(chain->conn, update_area, damage->rectangleCount, rects); xcb_xfixes_set_region(chain->conn, update_area, damage->rectangleCount, rects);
chain->images[image_index].rectangle_count = damage->rectangleCount;
} else {
chain->images[image_index].rectangle_count = 0;
} }
chain->images[image_index].update_area = update_area; chain->images[image_index].update_area = update_area;
chain->images[image_index].present_id = present_id; chain->images[image_index].present_id = present_id;