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

turnip: Convert tu_device_memory to use vk_device_memory

Browse source 
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29090>
This commit is contained in:
tarsin 2023-09-27 09:18:45 +08:00 • committed by Marge Bot
parent 1373b0966c
commit ecd9ece9c1
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/freedreno/vulkan/tu_device.cc
View file

@ -2768,17 +2768,15 @@ tu_AllocateMemory(VkDevice _device,
if (mem_heap_used > mem_heap->size)
return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY);
mem = (struct tu_device_memory *) vk_object_alloc(
&device->vk, pAllocator, sizeof(*mem), VK_OBJECT_TYPE_DEVICE_MEMORY);
mem = (struct tu_device_memory *) vk_device_memory_create(
&device->vk, pAllocateInfo, pAllocator, sizeof(*mem));
if (mem == NULL)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
const VkImportMemoryFdInfoKHR *fd_info =
vk_find_struct_const(pAllocateInfo->pNext, IMPORT_MEMORY_FD_INFO_KHR);
if (fd_info && !fd_info->handleType)
fd_info = NULL;
if (fd_info) {
if (fd_info && fd_info->handleType) {
assert(fd_info->handleType ==
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT ||
fd_info->handleType ==
@ -2837,7 +2835,7 @@ tu_AllocateMemory(VkDevice _device,
}
if (result != VK_SUCCESS) {
vk_object_free(&device->vk, pAllocator, mem);
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
return result;
}
@ -2885,7 +2883,7 @@ tu_FreeMemory(VkDevice _device,
p_atomic_add(&device->physical_device->heap.used, -mem->bo->size);
tu_bo_finish(device, mem->bo);
vk_object_free(&device->vk, pAllocator, mem);
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
}
VKAPI_ATTR VkResult VKAPI_CALL

5
src/freedreno/vulkan/tu_device.h
View file

@ -13,6 +13,7 @@
#include "tu_common.h"
#include "vk_buffer.h"
#include "vk_device_memory.h"
#include "tu_autotune.h"
#include "tu_pass.h"
@ -409,14 +410,14 @@ VK_DEFINE_HANDLE_CASTS(tu_device, vk.base, VkDevice, VK_OBJECT_TYPE_DEVICE)
struct tu_device_memory
{
struct vk_object_base base;
struct vk_device_memory vk;
struct tu_bo *bo;
/* for dedicated allocations */
struct tu_image *image;
};
VK_DEFINE_NONDISP_HANDLE_CASTS(tu_device_memory, base, VkDeviceMemory,
VK_DEFINE_NONDISP_HANDLE_CASTS(tu_device_memory, vk.base, VkDeviceMemory,
VK_OBJECT_TYPE_DEVICE_MEMORY)
struct tu_buffer