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_image_plane

Browse Source 
Nothing actually needs the pointer to the memory object so it's better
to not even include it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-07-19 17:03:30 -05:00
committed by Marge Bot
parent ad37394dfe
commit f0a165799c
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nouveau/vulkan/nvk_image.c
View File

@@ -610,14 +610,11 @@ nvk_image_plane_bind(struct nvk_image_plane *plane,
*offset_B = ALIGN_POT(*offset_B, plane->nil.align_B);
if (mem->dedicated_image_plane == plane) {
assert(*offset_B == 0);
plane->mem = mem;
plane->offset = 0;
plane->addr = mem->bo->offset;
} else if (plane->internal != NULL) {
plane->mem = plane->internal;
plane->offset = 0;
plane->addr = plane->internal->bo->offset;
} else {
plane->mem = mem;
plane->offset = *offset_B;
plane->addr = mem->bo->offset + *offset_B;
}
*offset_B += plane->nil.size_B;
}

7
src/nouveau/vulkan/nvk_image.h
View File

@@ -14,15 +14,14 @@ VkFormatFeatureFlags2
nvk_get_image_format_features(struct nvk_physical_device *pdevice,
VkFormat format, VkImageTiling tiling);
struct nvk_image_plane {
struct nil_image nil;
struct nvk_device_memory *mem;
VkDeviceSize offset;
uint64_t addr;
/* Used for internal dedicated allocations */
struct nvk_device_memory *internal;
};
struct nvk_image {
struct vk_image vk;
@@ -49,7 +48,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_image, vk.base, VkImage, VK_OBJECT_TYPE_IMAGE
static inline uint64_t
nvk_image_plane_base_address(const struct nvk_image_plane *plane)
{
return plane->mem->bo->offset + plane->offset;
return plane->addr;
}
static inline uint64_t