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

nvk: Add an addr field to nvk_buffer

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:53 -06:00
committed by Marge Bot
parent 5b10446a9b
commit b0d007e7de
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nouveau/vulkan/nvk_buffer.c
View File

@@ -75,7 +75,7 @@ nvk_BindBufferMemory2(VkDevice _device,
VK_FROM_HANDLE(nvk_buffer, buffer, pBindInfos[i].buffer); VK_FROM_HANDLE(nvk_buffer, buffer, pBindInfos[i].buffer);
buffer->mem = mem; buffer->mem = mem;
buffer->offset = pBindInfos[i].memoryOffset; buffer->addr = mem->bo->offset + pBindInfos[i].memoryOffset;
} }
return VK_SUCCESS; return VK_SUCCESS;
} }

4
src/nouveau/vulkan/nvk_buffer.h
View File

@@ -13,7 +13,7 @@ struct nvk_device_memory;
struct nvk_buffer { struct nvk_buffer {
struct vk_buffer vk; struct vk_buffer vk;
struct nvk_device_memory *mem; struct nvk_device_memory *mem;
VkDeviceSize offset; uint64_t addr;
}; };
VK_DEFINE_HANDLE_CASTS(nvk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER) VK_DEFINE_HANDLE_CASTS(nvk_buffer, vk.base, VkBuffer, VK_OBJECT_TYPE_BUFFER)
@@ -29,7 +29,7 @@ nvk_push_buffer_ref(struct nouveau_ws_push *push,
static inline uint64_t static inline uint64_t
nvk_buffer_address(const struct nvk_buffer *buffer, uint64_t offset) nvk_buffer_address(const struct nvk_buffer *buffer, uint64_t offset)
{ {
return buffer->mem->bo->offset + buffer->offset + offset; return buffer->addr + offset;
} }
#endif #endif