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

nvk: Rip out old UAPI support

Browse Source 
This was mostly generated by

    unifdef -DNVK_NEW_UAPI=1 -m src/nouveau/**/*.h

with a few manual fixups for device features and to remove includes and
strip out the meson bits.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25357>
This commit is contained in:
Faith Ekstrand
2023-09-23 10:55:23 -05:00
committed by Marge Bot
parent 31883b1f5e
commit 6af617095b
24 changed files with 6 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,6 @@ nvk_CreateBuffer(VkDevice device,
if (!buffer)
return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
#if NVK_NEW_UAPI == 1
if (buffer->vk.create_flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT) {
const uint32_t alignment =
nvk_get_buffer_alignment(&nvk_device_physical(dev)->info,
@@ -61,7 +60,6 @@ nvk_CreateBuffer(VkDevice device,
buffer->addr = nouveau_ws_alloc_vma(dev->ws_dev, buffer->vma_size_B,
alignment, sparse_residency);
}
#endif
*pBuffer = nvk_buffer_to_handle(buffer);
@@ -79,7 +77,6 @@ nvk_DestroyBuffer(VkDevice device,
if (!buffer)
return;
#if NVK_NEW_UAPI == 1
if (buffer->vma_size_B > 0) {
const bool sparse_residency =
buffer->vk.create_flags & VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT;
@@ -88,7 +85,6 @@ nvk_DestroyBuffer(VkDevice device,
nouveau_ws_free_vma(dev->ws_dev, buffer->addr, buffer->vma_size_B,
sparse_residency);
}
#endif
vk_buffer_destroy(&dev->vk, pAllocator, &buffer->vk);
}
@@ -182,7 +178,6 @@ nvk_BindBufferMemory2(VkDevice device,
VK_FROM_HANDLE(nvk_buffer, buffer, pBindInfos[i].buffer);
buffer->is_local = !(mem->bo->flags & NOUVEAU_WS_BO_GART);
#if NVK_NEW_UAPI == 1
if (buffer->vma_size_B) {
VK_FROM_HANDLE(nvk_device, dev, device);
nouveau_ws_bo_bind_vma(dev->ws_dev,
@@ -194,10 +189,6 @@ nvk_BindBufferMemory2(VkDevice device,
} else {
buffer->addr = mem->bo->offset + pBindInfos[i].memoryOffset;
}
#else
buffer->mem = mem;
buffer->addr = mem->bo->offset + pBindInfos[i].memoryOffset;
#endif
}
return VK_SUCCESS;
}