From 6add0415135e3527a957a984ae1199236f7e484a Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 2 Feb 2024 10:24:18 -0500 Subject: [PATCH] vk/wsi/x11/sw: use swapchain depth for putimage this is otherwise broken for 32bit depth windows cc: mesa-stable Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 1e849b12f53350e9e5c4a4dab5b89559da4aa97d) --- .pick_status.json | 2 +- src/vulkan/wsi/wsi_common_x11.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index aaf935074f6..3f96ec39ffa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2354,7 +2354,7 @@ "description": "vk/wsi/x11/sw: use swapchain depth for putimage", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index b7724c028ea..f6d711297e3 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -1666,7 +1666,7 @@ x11_present_to_x11_sw(struct x11_swapchain *chain, uint32_t image_index, chain->gc, image->base.row_pitches[0] / 4, chain->extent.height, - 0,0,0,24, + 0,0,0,chain->depth, image->base.row_pitches[0] * chain->extent.height, image->base.cpu_map); xcb_discard_reply(chain->conn, cookie.sequence); @@ -1681,7 +1681,7 @@ x11_present_to_x11_sw(struct x11_swapchain *chain, uint32_t image_index, chain->gc, image->base.row_pitches[0] / 4, this_lines, - 0,y_start,0,24, + 0,y_start,0,chain->depth, this_lines * stride_b, (const uint8_t *)myptr + (y_start * stride_b)); xcb_discard_reply(chain->conn, cookie.sequence);