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

nvk/nvkmd: Don't inline nvkmd_mem_[un]map()

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31004>
This commit is contained in:
Faith Ekstrand
2024-09-03 11:23:24 -05:00
committed by Marge Bot
parent 37bbb47e86
commit a2c813a6d3
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nouveau/vulkan/nvkmd/nvkmd.c
View File

@@ -212,3 +212,30 @@ nvkmd_mem_unref(struct nvkmd_mem *mem)
mem->ops->free(mem);
}
VkResult
nvkmd_mem_map(struct nvkmd_mem *mem, struct vk_object_base *log_obj,
enum nvkmd_mem_map_flags flags, void *fixed_addr,
void **map_out)
{
assert(mem->map == NULL);
void *map = NULL;
VkResult result = mem->ops->map(mem, log_obj, flags, fixed_addr, &map);
if (result != VK_SUCCESS)
return result;
mem->map = map;
if (map_out != NULL)
*map_out = map;
return VK_SUCCESS;
}
void
nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags)
{
assert(mem->map != NULL);
mem->ops->unmap(mem, flags, mem->map);
mem->map = NULL;
}

26
src/nouveau/vulkan/nvkmd/nvkmd.h
View File

@@ -456,32 +456,12 @@ nvkmd_mem_ref(struct nvkmd_mem *mem)
void nvkmd_mem_unref(struct nvkmd_mem *mem);
static inline VkResult MUST_CHECK
VkResult MUST_CHECK
nvkmd_mem_map(struct nvkmd_mem *mem, struct vk_object_base *log_obj,
enum nvkmd_mem_map_flags flags, void *fixed_addr,
void **map_out)
{
assert(mem->map == NULL);
void **map_out);
void *map = NULL;
VkResult result = mem->ops->map(mem, log_obj, flags, fixed_addr, &map);
if (result != VK_SUCCESS)
return result;
mem->map = map;
if (map_out != NULL)
*map_out = map;
return VK_SUCCESS;
}
static inline void
nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags)
{
assert(mem->map != NULL);
mem->ops->unmap(mem, flags, mem->map);
mem->map = NULL;
}
void nvkmd_mem_unmap(struct nvkmd_mem *mem, enum nvkmd_mem_map_flags flags);
static inline VkResult MUST_CHECK
nvkmd_mem_overmap(struct nvkmd_mem *mem, struct vk_object_base *log_obj,