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

nvk: Use vk_device_memory

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-03-31 11:07:36 -05:00 • committed by Marge Bot
parent 0dd4237896
commit fc368b2b90
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,8 +77,8 @@ nvk_allocate_memory(struct nvk_device *device,
VkMemoryType *type = &device->pdev->mem_types[pAllocateInfo->memoryTypeIndex];
struct nvk_device_memory *mem;
mem = vk_object_alloc(&device->vk, pAllocator, sizeof(*mem),
VK_OBJECT_TYPE_DEVICE_MEMORY);
mem = vk_device_memory_create(&device->vk, pAllocateInfo,
pAllocator, sizeof(*mem));
if (!mem)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
@ -135,7 +135,7 @@ nvk_allocate_memory(struct nvk_device *device,
fail_bo:
nouveau_ws_bo_destroy(mem->bo);
vk_object_free(&device->vk, pAllocator, mem);
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
return result;
}
@ -153,7 +153,7 @@ nvk_free_memory(struct nvk_device *device,
nouveau_ws_bo_destroy(mem->bo);
vk_object_free(&device->vk, pAllocator, mem);
vk_device_memory_destroy(&device->vk, pAllocator, &mem->vk);
}
VKAPI_ATTR VkResult VKAPI_CALL
@ -205,8 +205,7 @@ nvk_MapMemory(VkDevice _device,
return VK_SUCCESS;
}
if (size == VK_WHOLE_SIZE)
size = mem->bo->size - offset;
size = vk_device_memory_range(&mem->vk, offset, size);
/* From the Vulkan spec version 1.0.32 docs for MapMemory:
*

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

@ -3,12 +3,14 @@
#include "nvk_private.h"
#include "vk_device_memory.h"
#include "util/list.h"
struct nvk_device;
struct nvk_device_memory {
struct vk_object_base base;
struct vk_device_memory vk;
struct list_head link;
@ -17,7 +19,7 @@ struct nvk_device_memory {
void *map;
};
VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_device_memory, base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY)
VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_device_memory, vk.base, VkDeviceMemory, VK_OBJECT_TYPE_DEVICE_MEMORY)
struct nvk_memory_tiling_info {
uint16_t tile_mode;