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

lavapipe: report out-of-memory when binding

Browse Source 
This isn't the perfect error-code, but we don't really have anything
better, it seems.

The ideal fix here would be to fix LLVMpipe to support larger textures,
but this is probably as far as I'm interested in chasing down this path
for now.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10689>
This commit is contained in:
Erik Faye-Lund
2021-05-07 13:34:52 +02:00
committed by Marge Bot
parent 6012dec550
commit e10618f6f5
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/llvmpipe/lp_texture.c
View File

@@ -852,10 +852,12 @@ static bool llvmpipe_resource_bind_backing(struct pipe_screen *screen,
if (!lpr->backable)
return FALSE;
if (llvmpipe_resource_is_texture(&lpr->base)) {
if (lpr->size_required > LP_MAX_TEXTURE_SIZE)
return FALSE;
if (llvmpipe_resource_is_texture(&lpr->base))
lpr->tex_data = (char *)pmem + offset;
else
} else
lpr->data = (char *)pmem + offset;
lpr->backing_offset = offset;

14
src/gallium/frontends/lavapipe/lvp_device.c
View File

@@ -1629,12 +1629,18 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_BindImageMemory2(VkDevice _device,
}
if (!did_bind) {
image->pmem = mem->pmem;
image->memory_offset = bind_info->memoryOffset;
device->pscreen->resource_bind_backing(device->pscreen,
if (!device->pscreen->resource_bind_backing(device->pscreen,
image->bo,
mem->pmem,
bind_info->memoryOffset);
bind_info->memoryOffset)) {
/* This is probably caused by the texture being too large, so let's
* report this as the *closest* allowed error-code. It's not ideal,
* but it's unlikely that anyone will care too much.
*/
return vk_error(device->instance, VK_ERROR_OUT_OF_DEVICE_MEMORY);
}
image->pmem = mem->pmem;
image->memory_offset = bind_info->memoryOffset;
}
}
return VK_SUCCESS;