summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2023-05-03 16:34:11 -0400
committerMarge Bot <emma+marge@anholt.net>2023-05-16 00:11:12 +0000
commitb88006fb9f615fd1e6782415ee0244c6f3953da3 (patch)
tree8fcd1b116d1af08570a34a4dd1b08f94028501fc
parent38fab8a1da34167f1e2b71d5d127c80bee6855d9 (diff)
downloadmesa-b88006fb9f615fd1e6782415ee0244c6f3953da3.tar.gz
zink: slightly simplify bda allocation chaining
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22855>
-rw-r--r--src/gallium/drivers/zink/zink_bo.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c
index a69a050f323..adcaa71134c 100644
--- a/src/gallium/drivers/zink/zink_bo.c
+++ b/src/gallium/drivers/zink/zink_bo.c
@@ -265,13 +265,12 @@ bo_create_internal(struct zink_screen *screen,
ai.pNext = pNext;
ai.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR;
ai.deviceMask = 0;
+ if (screen->info.have_KHR_buffer_device_address)
+ pNext = &ai;
VkMemoryAllocateInfo mai;
mai.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
- if (screen->info.have_KHR_buffer_device_address)
- mai.pNext = &ai;
- else
- mai.pNext = pNext;
+ mai.pNext = pNext;
mai.allocationSize = size;
mai.memoryTypeIndex = mem_type_idx;
if (screen->info.mem_props.memoryTypes[mai.memoryTypeIndex].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) {