From 87146b215889d4ec5b3d35c375fea7246a023aee Mon Sep 17 00:00:00 2001 From: Julia Tatz Date: Mon, 16 Jan 2023 13:18:40 -0500 Subject: [PATCH] zink: trival renames heap_idx -> memoryTypeIndex Trival renames to correctly identify vulkan memory type indices aren't the same as zink heaps Part-of: (cherry picked from commit e20e8f22438b619e1700753ab37e8ae9170b931e) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.c | 8 ++++---- src/gallium/drivers/zink/zink_bo.h | 4 ++-- src/gallium/drivers/zink/zink_resource.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b28681cb4bf..099ebce3954 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2641,7 +2641,7 @@ "description": "zink: trival renames heap_idx -> memoryTypeIndex", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index 7682bab0988..f7cfbc6dc66 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -560,7 +560,7 @@ error_alloc_commitments: } struct pb_buffer * -zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, enum zink_heap heap, enum zink_alloc_flag flags, unsigned heap_idx, const void *pNext) +zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, enum zink_heap heap, enum zink_alloc_flag flags, unsigned mem_type_idx, const void *pNext) { struct zink_bo *bo; /* pull in sparse flag */ @@ -609,7 +609,7 @@ zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, en unsigned low_bound = 128 * 1024 * 1024; //128MB is a very small BAR if (screen->info.driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY) low_bound *= 2; //nvidia has fat textures or something - unsigned vk_heap_idx = screen->info.mem_props.memoryTypes[heap_idx].heapIndex; + unsigned vk_heap_idx = screen->info.mem_props.memoryTypes[mem_type_idx].heapIndex; reclaim_all = screen->info.mem_props.memoryHeaps[vk_heap_idx].size <= low_bound; } entry = pb_slab_alloc_reclaimed(slabs, alloc_size, heap, reclaim_all); @@ -657,12 +657,12 @@ no_slab: } /* Create a new one. */ - bo = bo_create_internal(screen, size, alignment, heap, heap_idx, flags, pNext); + bo = bo_create_internal(screen, size, alignment, heap, mem_type_idx, flags, pNext); if (!bo) { /* Clean up buffer managers and try again. */ clean_up_buffer_managers(screen); - bo = bo_create_internal(screen, size, alignment, heap, heap_idx, flags, pNext); + bo = bo_create_internal(screen, size, alignment, heap, mem_type_idx, flags, pNext); if (!bo) return NULL; } diff --git a/src/gallium/drivers/zink/zink_bo.h b/src/gallium/drivers/zink/zink_bo.h index b58c6c2576c..42b1fc6437e 100644 --- a/src/gallium/drivers/zink/zink_bo.h +++ b/src/gallium/drivers/zink/zink_bo.h @@ -94,7 +94,7 @@ zink_heap_from_domain_flags(VkMemoryPropertyFlags domains, enum zink_alloc_flag } static inline unsigned -zink_heap_idx_from_bits(struct zink_screen *screen, enum zink_heap heap, uint32_t bits) +zink_mem_type_idx_from_bits(struct zink_screen *screen, enum zink_heap heap, uint32_t bits) { for (unsigned i = 0; i < screen->heap_count[heap]; i++) { if (bits & BITFIELD_BIT(screen->heap_map[heap][i])) { @@ -111,7 +111,7 @@ void zink_bo_deinit(struct zink_screen *screen); struct pb_buffer * -zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, enum zink_heap heap, enum zink_alloc_flag flags, unsigned heap_idx, const void *pNext); +zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, enum zink_heap heap, enum zink_alloc_flag flags, unsigned mem_type_idx, const void *pNext); bool zink_bo_get_kms_handle(struct zink_screen *screen, struct zink_bo *bo, int fd, uint32_t *handle); diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index c0d7dcef2da..eb7bb894c7b 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -953,7 +953,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t mai.pNext = NULL; mai.allocationSize = reqs.size; enum zink_heap heap = zink_heap_from_domain_flags(flags, aflags); - mai.memoryTypeIndex = zink_heap_idx_from_bits(screen, heap, reqs.memoryTypeBits); + mai.memoryTypeIndex = zink_mem_type_idx_from_bits(screen, heap, reqs.memoryTypeBits); if (mai.memoryTypeIndex == UINT32_MAX) { /* not valid based on reqs; demote to more compatible type */ switch (heap) { @@ -966,7 +966,7 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t default: break; } - mai.memoryTypeIndex = zink_heap_idx_from_bits(screen, heap, reqs.memoryTypeBits); + mai.memoryTypeIndex = zink_mem_type_idx_from_bits(screen, heap, reqs.memoryTypeBits); assert(mai.memoryTypeIndex != UINT32_MAX); } assert(reqs.memoryTypeBits & BITFIELD_BIT(mai.memoryTypeIndex));