From 92446a2dccc35e55453b96a91981587c41c486c4 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 19 Nov 2024 12:31:09 +0100 Subject: [PATCH] radv: remove VK_VALVE_descriptor_set_host_mapping This extension was only enabled for vkd3d-proton and it's obsolete since VK_EXT_descriptor_buffer, which landed in September 2022. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_descriptor_set.c | 21 --------------------- src/amd/vulkan/radv_device.c | 3 +-- src/amd/vulkan/radv_physical_device.c | 8 -------- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index ed17c99c667..fc0e5229eb5 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -1655,27 +1655,6 @@ radv_UpdateDescriptorSetWithTemplate(VkDevice _device, VkDescriptorSet descripto radv_update_descriptor_set_with_template_impl(device, NULL, set, descriptorUpdateTemplate, pData); } -VKAPI_ATTR void VKAPI_CALL -radv_GetDescriptorSetLayoutHostMappingInfoVALVE(VkDevice _device, - const VkDescriptorSetBindingReferenceVALVE *pBindingReference, - VkDescriptorSetLayoutHostMappingInfoVALVE *pHostMapping) -{ - struct radv_descriptor_set_layout *set_layout = - radv_descriptor_set_layout_from_handle(pBindingReference->descriptorSetLayout); - - const struct radv_descriptor_set_binding_layout *binding_layout = set_layout->binding + pBindingReference->binding; - - pHostMapping->descriptorOffset = binding_layout->offset; - pHostMapping->descriptorSize = binding_layout->size; -} - -VKAPI_ATTR void VKAPI_CALL -radv_GetDescriptorSetHostMappingVALVE(VkDevice _device, VkDescriptorSet descriptorSet, void **ppData) -{ - VK_FROM_HANDLE(radv_descriptor_set, set, descriptorSet); - *ppData = set->header.mapped_ptr; -} - /* VK_EXT_descriptor_buffer */ VKAPI_ATTR void VKAPI_CALL radv_GetDescriptorSetLayoutSizeEXT(VkDevice device, VkDescriptorSetLayout layout, VkDeviceSize *pLayoutSizeInBytes) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index ff3a3a8d00e..acfdbd9f96f 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1172,8 +1172,7 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr device->vk.enabled_extensions.EXT_buffer_device_address || device->vk.enabled_extensions.KHR_buffer_device_address || device->vk.enabled_extensions.KHR_ray_tracing_pipeline || - device->vk.enabled_extensions.KHR_acceleration_structure || - device->vk.enabled_extensions.VALVE_descriptor_set_host_mapping; + device->vk.enabled_extensions.KHR_acceleration_structure; radv_init_shader_arenas(device); diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 3c6b90f00a2..945337f8582 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -757,11 +757,6 @@ radv_physical_device_get_supported_extensions(const struct radv_physical_device .INTEL_shader_integer_functions2 = true, .MESA_image_alignment_control = pdev->info.gfx_level >= GFX9 && pdev->info.gfx_level <= GFX11_5, .NV_compute_shader_derivatives = true, - /* Undocumented extension purely for vkd3d-proton. This check is to prevent anyone else from - * using it. - */ - .VALVE_descriptor_set_host_mapping = - pdev->vk.instance->app_info.engine_name && strcmp(pdev->vk.instance->app_info.engine_name, "vkd3d") == 0, .VALVE_mutable_descriptor_type = true, }; *out_ext = ext; @@ -1103,9 +1098,6 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc .primitiveFragmentShadingRateMeshShader = taskmesh_en, .meshShaderQueries = false, - /* VK_VALVE_descriptor_set_host_mapping */ - .descriptorSetHostMapping = true, - /* VK_EXT_depth_clip_control */ .depthClipControl = true,