fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-06 12:30:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: adopt wsi_common_get_memory
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35875>
This commit is contained in:
Yiwei Zhang 2025-07-01 21:51:16 -07:00 • committed by Marge Bot
parent 6f7dff3abf
commit ace49d9e52
3 changed files with 33 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/gallium/frontends/lavapipe/lvp_device.c
View file

@ -2364,66 +2364,46 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_BindImageMemory2(VkDevice _device,
LVP_FROM_HANDLE(lvp_device_memory, mem, bind_info->memory);
LVP_FROM_HANDLE(lvp_image, image, bind_info->image);
VkBindMemoryStatusKHR *status = (void*)vk_find_struct_const(&pBindInfos[i], BIND_MEMORY_STATUS_KHR);
bool did_bind = false;
#ifdef LVP_USE_WSI_PLATFORM
vk_foreach_struct_const(s, bind_info->pNext) {
switch (s->sType) {
case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR: {
const VkBindImageMemorySwapchainInfoKHR *swapchain_info =
(const VkBindImageMemorySwapchainInfoKHR *) s;
struct lvp_image *swapchain_image =
lvp_swapchain_get_image(swapchain_info->swapchain,
swapchain_info->imageIndex);
image->planes[0].pmem = swapchain_image->planes[0].pmem;
image->planes[0].memory_offset = swapchain_image->planes[0].memory_offset;
device->pscreen->resource_bind_backing(device->pscreen,
image->planes[0].bo,
image->planes[0].pmem,
0, 0,
image->planes[0].memory_offset);
did_bind = true;
if (status)
*status->pResult = VK_SUCCESS;
break;
}
default:
break;
}
}
if (!mem) {
#if DETECT_OS_ANDROID
/* TODO handle VkNativeBufferANDROID */
unreachable("VkBindImageMemoryInfo with no memory");
#else
const VkBindImageMemorySwapchainInfoKHR *swapchain_info =
vk_find_struct_const(bind_info->pNext,
BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR);
assert(swapchain_info && swapchain_info->swapchain != VK_NULL_HANDLE);
mem = lvp_device_memory_from_handle(wsi_common_get_memory(
swapchain_info->swapchain, swapchain_info->imageIndex));
#endif
}
if (!did_bind) {
if (!mem) {
continue;
}
uint64_t offset_B = 0;
VkResult result;
if (image->disjoint) {
const VkBindImagePlaneMemoryInfo *plane_info =
vk_find_struct_const(pBindInfos[i].pNext, BIND_IMAGE_PLANE_MEMORY_INFO);
uint8_t plane = lvp_image_aspects_to_plane(image, plane_info->planeAspect);
assert(mem);
uint64_t offset_B = 0;
VkResult result;
if (image->disjoint) {
const VkBindImagePlaneMemoryInfo *plane_info =
vk_find_struct_const(pBindInfos[i].pNext, BIND_IMAGE_PLANE_MEMORY_INFO);
uint8_t plane = lvp_image_aspects_to_plane(image, plane_info->planeAspect);
result = lvp_image_plane_bind(device, &image->planes[plane],
mem, bind_info->memoryOffset, &offset_B);
if (status)
*status->pResult = result;
if (result != VK_SUCCESS)
return result;
} else {
VkResult fail = VK_SUCCESS;
for (unsigned plane = 0; plane < image->plane_count; plane++) {
result = lvp_image_plane_bind(device, &image->planes[plane],
mem, bind_info->memoryOffset, &offset_B);
mem, bind_info->memoryOffset + image->offset, &offset_B);
if (status)
*status->pResult = result;
*status->pResult = res;
if (result != VK_SUCCESS)
return result;
} else {
VkResult fail = VK_SUCCESS;
for (unsigned plane = 0; plane < image->plane_count; plane++) {
result = lvp_image_plane_bind(device, &image->planes[plane],
mem, bind_info->memoryOffset + image->offset, &offset_B);
if (status)
*status->pResult = res;
if (result != VK_SUCCESS)
fail = result;
}
if (fail != VK_SUCCESS)
return fail;
fail = result;
}
if (fail != VK_SUCCESS)
return fail;
}
}
return res;

8
src/gallium/frontends/lavapipe/lvp_image.c
View file

@ -210,14 +210,6 @@ fail:
return result;
}
struct lvp_image *
lvp_swapchain_get_image(VkSwapchainKHR swapchain,
uint32_t index)
{
VkImage image = wsi_common_get_image(swapchain, index);
return lvp_image_from_handle(image);
}
VKAPI_ATTR VkResult VKAPI_CALL
lvp_CreateImage(VkDevice _device,
const VkImageCreateInfo *pCreateInfo,

2
src/gallium/frontends/lavapipe/lvp_private.h
View file

@ -728,8 +728,6 @@ VkResult lvp_execute_cmds(struct lvp_device *device,
struct lvp_cmd_buffer *cmd_buffer);
size_t
lvp_get_rendering_state_size(void);
struct lvp_image *lvp_swapchain_get_image(VkSwapchainKHR swapchain,
uint32_t index);
static inline enum pipe_format
lvp_vk_format_to_pipe_format(VkFormat format)