Module: Mesa Branch: main Commit: 344be4405c0bb67237f46cc8799c13a4e5dab064 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=344be4405c0bb67237f46cc8799c13a4e5dab064
Author: Yiwei Zhang <[email protected]> Date: Mon Feb 13 23:23:28 2023 -0800 venus: clean up memoryResourceAllocationSize Signed-off-by: Yiwei Zhang <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21379> --- src/virtio/vulkan/vn_device_memory.c | 15 ++++----------- src/virtio/vulkan/vn_physical_device.c | 3 +-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/virtio/vulkan/vn_device_memory.c b/src/virtio/vulkan/vn_device_memory.c index 5aa4d963801..4644f1cd1f9 100644 --- a/src/virtio/vulkan/vn_device_memory.c +++ b/src/virtio/vulkan/vn_device_memory.c @@ -679,11 +679,10 @@ vn_get_memory_dma_buf_properties(struct vn_device *dev, uint32_t *out_mem_type_bits) { VkDevice device = vn_device_to_handle(dev); - struct vn_renderer_bo *bo = NULL; - VkResult result = VK_SUCCESS; - result = vn_renderer_bo_create_from_dma_buf(dev->renderer, 0 /* size */, - fd, 0 /* flags */, &bo); + struct vn_renderer_bo *bo; + VkResult result = vn_renderer_bo_create_from_dma_buf( + dev->renderer, 0 /* size */, fd, 0 /* flags */, &bo); if (result != VK_SUCCESS) return result; @@ -692,16 +691,10 @@ vn_get_memory_dma_buf_properties(struct vn_device *dev, VkMemoryResourceAllocationSizeProperties100000MESA alloc_size_props = { .sType = VK_STRUCTURE_TYPE_MEMORY_RESOURCE_ALLOCATION_SIZE_PROPERTIES_100000_MESA, - .pNext = NULL, - .allocationSize = 0, }; VkMemoryResourcePropertiesMESA props = { .sType = VK_STRUCTURE_TYPE_MEMORY_RESOURCE_PROPERTIES_MESA, - .pNext = - dev->instance->experimental.memoryResourceAllocationSize == VK_TRUE - ? &alloc_size_props - : NULL, - .memoryTypeBits = 0, + .pNext = &alloc_size_props, }; result = vn_call_vkGetMemoryResourcePropertiesMESA(dev->instance, device, bo->res_id, &props); diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c index c3b5078b1b6..2365627eafe 100644 --- a/src/virtio/vulkan/vn_physical_device.c +++ b/src/virtio/vulkan/vn_physical_device.c @@ -947,8 +947,7 @@ vn_physical_device_get_native_extensions( #ifdef ANDROID if (can_external_mem && renderer_exts->EXT_image_drm_format_modifier && - renderer_exts->EXT_queue_family_foreign && - instance->experimental.memoryResourceAllocationSize == VK_TRUE) { + renderer_exts->EXT_queue_family_foreign) { exts->ANDROID_external_memory_android_hardware_buffer = true; exts->ANDROID_native_buffer = true; }
