Module: Mesa Branch: main Commit: 06046a02f8396b250c5cdee8e6ede301db356f34 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06046a02f8396b250c5cdee8e6ede301db356f34
Author: Marcin Ślusarz <[email protected]> Date: Thu Jul 20 19:49:46 2023 +0200 anv: merge cases leading to the same code Added in: 688968e8880 ("anv: add support for direct descriptor in allocation/writes") Reviewed-by: Sagar Ghuge <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24260> --- src/intel/vulkan/anv_descriptor_set.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index 423186da853..248327e9848 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -78,10 +78,6 @@ anv_indirect_descriptor_data_for_type(VkDescriptorType type) case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: - data = ANV_DESCRIPTOR_BTI_SURFACE_STATE | - ANV_DESCRIPTOR_INDIRECT_SAMPLED_IMAGE; - break; - case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: data = ANV_DESCRIPTOR_BTI_SURFACE_STATE | ANV_DESCRIPTOR_INDIRECT_SAMPLED_IMAGE; @@ -148,22 +144,10 @@ anv_direct_descriptor_data_for_type(VkDescriptorType type) case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - data = ANV_DESCRIPTOR_BTI_SURFACE_STATE | - ANV_DESCRIPTOR_SURFACE; - break; - case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - data = ANV_DESCRIPTOR_BTI_SURFACE_STATE | - ANV_DESCRIPTOR_SURFACE; - break; - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: - data = ANV_DESCRIPTOR_BTI_SURFACE_STATE | - ANV_DESCRIPTOR_SURFACE; - break; - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: data = ANV_DESCRIPTOR_BTI_SURFACE_STATE |
