From 96b324c1564c34979ba1a418ff89fb9e84254d43 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Fri, 18 Oct 2024 21:56:55 +0200 Subject: [PATCH] vkd3d: Move descriptor sets backing the SRV-UAV-CBV heap at the end. So that when mutable descriptors are in use we can avoid putting the other descriptor sets backing the SRV-UAV-CBV descriptor heap in the pipeline layout altogether. --- libs/vkd3d/vkd3d_private.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 412380cf..3048b075 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -772,15 +772,15 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev enum vkd3d_vk_descriptor_set_index { - VKD3D_SET_INDEX_UNIFORM_BUFFER = 0, + VKD3D_SET_INDEX_SAMPLER, + VKD3D_SET_INDEX_UAV_COUNTER, + VKD3D_SET_INDEX_UNIFORM_BUFFER, VKD3D_SET_INDEX_MUTABLE = VKD3D_SET_INDEX_UNIFORM_BUFFER, - VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER = 1, - VKD3D_SET_INDEX_SAMPLED_IMAGE = 2, - VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER = 3, - VKD3D_SET_INDEX_STORAGE_IMAGE = 4, - VKD3D_SET_INDEX_SAMPLER = 5, - VKD3D_SET_INDEX_UAV_COUNTER = 6, - VKD3D_SET_INDEX_COUNT = 7 + VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER, + VKD3D_SET_INDEX_SAMPLED_IMAGE, + VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER, + VKD3D_SET_INDEX_STORAGE_IMAGE, + VKD3D_SET_INDEX_COUNT }; extern const enum vkd3d_vk_descriptor_set_index vk_descriptor_set_index_table[];