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

nvk: Add internal helpers for device memory allocation

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-01-30 20:11:54 -06:00 • committed by Marge Bot
parent ac8bbb355a
commit ba70017f68
2 changed files with 56 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/nouveau/vulkan/nvk_device_memory.c
View file

@ -69,14 +69,12 @@ zero_vram(struct nvk_device *dev, struct nouveau_ws_bo *bo)
return VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL
nvk_AllocateMemory(
VkDevice _device,
const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator,
VkDeviceMemory *pMem)
VkResult
nvk_allocate_memory(struct nvk_device *device,
const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator,
struct nvk_device_memory **mem_out)
{
VK_FROM_HANDLE(nvk_device, device, _device);
VkMemoryType *type = &device->pdev->mem_types[pAllocateInfo->memoryTypeIndex];
struct nvk_device_memory *mem;
@ -122,7 +120,7 @@ nvk_AllocateMemory(
list_addtail(&mem->link, &device->memory_objects);
simple_mtx_unlock(&device->memory_objects_lock);
*pMem = nvk_device_memory_to_handle(mem);
*mem_out = mem;
return VK_SUCCESS;
@ -132,20 +130,13 @@ fail_bo:
return result;
}
VKAPI_ATTR void VKAPI_CALL
nvk_FreeMemory(
VkDevice _device,
VkDeviceMemory _mem,
const VkAllocationCallbacks *pAllocator)
void
nvk_free_memory(struct nvk_device *device,
struct nvk_device_memory *mem,
const VkAllocationCallbacks *pAllocator)
{
VK_FROM_HANDLE(nvk_device, device, _device);
VK_FROM_HANDLE(nvk_device_memory, mem, _mem);
if (!mem)
return;
if (mem->map)
nvk_UnmapMemory(_device, _mem);
munmap(mem->map, mem->bo->size);
simple_mtx_lock(&device->memory_objects_lock);
list_del(&mem->link);
@ -156,6 +147,40 @@ nvk_FreeMemory(
vk_object_free(&device->vk, pAllocator, mem);
}
VKAPI_ATTR VkResult VKAPI_CALL
nvk_AllocateMemory(
VkDevice _device,
const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator,
VkDeviceMemory *pMem)
{
VK_FROM_HANDLE(nvk_device, device, _device);
struct nvk_device_memory *mem;
VkResult result;
result = nvk_allocate_memory(device, pAllocateInfo, pAllocator, &mem);
if (result != VK_SUCCESS)
return result;
*pMem = nvk_device_memory_to_handle(mem);
return VK_SUCCESS;
}
VKAPI_ATTR void VKAPI_CALL
nvk_FreeMemory(VkDevice _device,
VkDeviceMemory _mem,
const VkAllocationCallbacks *pAllocator)
{
VK_FROM_HANDLE(nvk_device, device, _device);
VK_FROM_HANDLE(nvk_device_memory, mem, _mem);
if (!mem)
return;
nvk_free_memory(device, mem, pAllocator);
}
VKAPI_ATTR VkResult VKAPI_CALL
nvk_MapMemory(
VkDevice _device,

11
src/nouveau/vulkan/nvk_device_memory.h
View file

@ -5,6 +5,8 @@
#include "util/list.h"
struct nvk_device;
struct nvk_device_memory {
struct vk_object_base base;
@ -17,4 +19,13 @@ struct nvk_device_memory {
VK_DEFINE_HANDLE_CASTS(nvk_device_memory, base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY)
VkResult nvk_allocate_memory(struct nvk_device *device,
const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator,
struct nvk_device_memory **mem_out);
void nvk_free_memory(struct nvk_device *device,
struct nvk_device_memory *mem,
const VkAllocationCallbacks *pAllocator);
#endif