fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: add vn_image_create

Browse source 
A helper called from vn_CreateImage to allocate and initialize vn_image.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10294>
This commit is contained in:
Chia-I Wu 2021-04-16 12:26:21 -07:00
parent e1787ec77d
commit b7db6598df
2 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/virtio/vulkan/vn_image.c
View file

@ -99,6 +99,36 @@ vn_image_init_memory_requirements(struct vn_image *img,
}
}
VkResult
vn_image_create(struct vn_device *dev,
const VkImageCreateInfo *create_info,
const VkAllocationCallbacks *alloc,
struct vn_image **out_img)
{
struct vn_image *img = vk_zalloc(alloc, sizeof(*img), VN_DEFAULT_ALIGN,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!img)
return VK_ERROR_OUT_OF_HOST_MEMORY;
vn_object_base_init(&img->base, VK_OBJECT_TYPE_IMAGE, &dev->base);
VkDevice dev_handle = vn_device_to_handle(dev);
VkImage img_handle = vn_image_to_handle(img);
/* TODO async */
VkResult result = vn_call_vkCreateImage(dev->instance, dev_handle,
create_info, NULL, &img_handle);
if (result != VK_SUCCESS) {
vk_free(alloc, img);
return result;
}
vn_image_init_memory_requirements(img, dev, create_info);
*out_img = img;
return VK_SUCCESS;
}
/* image commands */
VkResult
@ -126,26 +156,12 @@ vn_CreateImage(VkDevice device,
pCreateInfo = &local_create_info;
}
struct vn_image *img = vk_zalloc(alloc, sizeof(*img), VN_DEFAULT_ALIGN,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!img)
return vn_error(dev->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
vn_object_base_init(&img->base, VK_OBJECT_TYPE_IMAGE, &dev->base);
VkImage img_handle = vn_image_to_handle(img);
/* TODO async */
VkResult result = vn_call_vkCreateImage(dev->instance, device, pCreateInfo,
NULL, &img_handle);
if (result != VK_SUCCESS) {
vk_free(alloc, img);
struct vn_image *img;
VkResult result = vn_image_create(dev, pCreateInfo, alloc, &img);
if (result != VK_SUCCESS)
return vn_error(dev->instance, result);
}
vn_image_init_memory_requirements(img, dev, pCreateInfo);
*pImage = img_handle;
*pImage = vn_image_to_handle(img);
return VK_SUCCESS;
}

6
src/virtio/vulkan/vn_image.h
View file

@ -48,4 +48,10 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(vn_sampler_ycbcr_conversion,
VkSamplerYcbcrConversion,
VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION)
VkResult
vn_image_create(struct vn_device *dev,
const VkImageCreateInfo *create_info,
const VkAllocationCallbacks *alloc,
struct vn_image **out_img);
#endif /* VN_IMAGE_H */