Module: Mesa Branch: main Commit: fc96bc9b58731b160452cd5c54adb762b588bbd7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc96bc9b58731b160452cd5c54adb762b588bbd7
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 hasvk: update symbols that have become aliases for newer ones All of these have been renamed in the spec (usually by being promoted); renamed them in our code too. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26491> --- src/intel/vulkan_hasvk/anv_cmd_buffer.c | 2 +- src/intel/vulkan_hasvk/anv_descriptor_set.c | 46 ++++++++++++++--------------- src/intel/vulkan_hasvk/anv_device.c | 2 +- src/intel/vulkan_hasvk/anv_image.c | 4 +-- src/intel/vulkan_hasvk/anv_pipeline.c | 4 +-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/intel/vulkan_hasvk/anv_cmd_buffer.c b/src/intel/vulkan_hasvk/anv_cmd_buffer.c index c49ebceb4f1..f67bc7231c2 100644 --- a/src/intel/vulkan_hasvk/anv_cmd_buffer.c +++ b/src/intel/vulkan_hasvk/anv_cmd_buffer.c @@ -339,7 +339,7 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, * * "Each element of pDescriptorSets must not have been allocated from a * VkDescriptorPool with the - * VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE flag set" + * VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT flag set" */ assert(!set->pool || !set->pool->host_only); diff --git a/src/intel/vulkan_hasvk/anv_descriptor_set.c b/src/intel/vulkan_hasvk/anv_descriptor_set.c index 951aba8ce88..97d72a42eb2 100644 --- a/src/intel/vulkan_hasvk/anv_descriptor_set.c +++ b/src/intel/vulkan_hasvk/anv_descriptor_set.c @@ -118,7 +118,7 @@ anv_descriptor_data_for_type(const struct anv_physical_device *device, static enum anv_descriptor_data anv_descriptor_data_for_mutable_type(const struct anv_physical_device *device, - const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info, + const VkMutableDescriptorTypeCreateInfoEXT *mutable_info, int binding) { enum anv_descriptor_data desc_data = 0; @@ -136,7 +136,7 @@ anv_descriptor_data_for_mutable_type(const struct anv_physical_device *device, return desc_data; } - const VkMutableDescriptorTypeListVALVE *type_list = + const VkMutableDescriptorTypeListEXT *type_list = &mutable_info->pMutableDescriptorTypeLists[binding]; for (uint32_t i = 0; i < type_list->descriptorTypeCount; i++) { desc_data |= @@ -204,7 +204,7 @@ anv_descriptor_size(const struct anv_descriptor_set_binding_layout *layout) /** Returns size in bytes of the biggest descriptor in the given layout */ static unsigned anv_descriptor_size_for_mutable_type(const struct anv_physical_device *device, - const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info, + const VkMutableDescriptorTypeCreateInfoEXT *mutable_info, int binding) { unsigned size = 0; @@ -225,7 +225,7 @@ anv_descriptor_size_for_mutable_type(const struct anv_physical_device *device, return size; } - const VkMutableDescriptorTypeListVALVE *type_list = + const VkMutableDescriptorTypeListEXT *type_list = &mutable_info->pMutableDescriptorTypeLists[binding]; for (uint32_t i = 0; i < type_list->descriptorTypeCount; i++) { enum anv_descriptor_data desc_data = @@ -294,9 +294,9 @@ void anv_GetDescriptorSetLayoutSupport( const VkDescriptorSetLayoutBindingFlagsCreateInfo *binding_flags_info = vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO); - const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info = + const VkMutableDescriptorTypeCreateInfoEXT *mutable_info = vk_find_struct_const(pCreateInfo->pNext, - MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE); + MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT); for (uint32_t b = 0; b < pCreateInfo->bindingCount; b++) { const VkDescriptorSetLayoutBinding *binding = &pCreateInfo->pBindings[b]; @@ -308,7 +308,7 @@ void anv_GetDescriptorSetLayoutSupport( } enum anv_descriptor_data desc_data = - binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_mutable_type(pdevice, mutable_info, b) : anv_descriptor_data_for_type(pdevice, binding->descriptorType); @@ -467,9 +467,9 @@ VkResult anv_CreateDescriptorSetLayout( vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO); - const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info = + const VkMutableDescriptorTypeCreateInfoEXT *mutable_info = vk_find_struct_const(pCreateInfo->pNext, - MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE); + MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT); for (uint32_t b = 0; b < num_bindings; b++) { /* We stashed the pCreateInfo->pBindings[] index (plus one) in the @@ -514,7 +514,7 @@ VkResult anv_CreateDescriptorSetLayout( } set_layout->binding[b].data = - binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_mutable_type(device->physical, mutable_info, b) : anv_descriptor_data_for_type(device->physical, binding->descriptorType); @@ -530,7 +530,7 @@ VkResult anv_CreateDescriptorSetLayout( switch (binding->descriptorType) { case VK_DESCRIPTOR_TYPE_SAMPLER: case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: - case VK_DESCRIPTOR_TYPE_MUTABLE_VALVE: + case VK_DESCRIPTOR_TYPE_MUTABLE_EXT: set_layout->binding[b].max_plane_count = 1; if (binding->pImmutableSamplers) { set_layout->binding[b].immutable_samplers = samplers; @@ -569,7 +569,7 @@ VkResult anv_CreateDescriptorSetLayout( } set_layout->binding[b].descriptor_stride = - binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_size_for_mutable_type(device->physical, mutable_info, b) : anv_descriptor_size(&set_layout->binding[b]); @@ -846,9 +846,9 @@ VkResult anv_CreateDescriptorPool( const VkDescriptorPoolInlineUniformBlockCreateInfo *inline_info = vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO); - const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info = + const VkMutableDescriptorTypeCreateInfoEXT *mutable_info = vk_find_struct_const(pCreateInfo->pNext, - MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE); + MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT); uint32_t descriptor_count = 0; uint32_t buffer_view_count = 0; @@ -856,7 +856,7 @@ VkResult anv_CreateDescriptorPool( for (uint32_t i = 0; i < pCreateInfo->poolSizeCount; i++) { enum anv_descriptor_data desc_data = - pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_mutable_type(device->physical, mutable_info, i) : anv_descriptor_data_for_type(device->physical, pCreateInfo->pPoolSizes[i].type); @@ -864,7 +864,7 @@ VkResult anv_CreateDescriptorPool( buffer_view_count += pCreateInfo->pPoolSizes[i].descriptorCount; unsigned desc_data_size = - pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_size_for_mutable_type(device->physical, mutable_info, i) : anv_descriptor_data_size(desc_data); @@ -920,7 +920,7 @@ VkResult anv_CreateDescriptorPool( pool->size = pool_size; pool->next = 0; pool->free_list = EMPTY; - pool->host_only = pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_VALVE; + pool->host_only = pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_HOST_ONLY_BIT_EXT; if (descriptor_bo_size > 0) { VkResult result = anv_device_alloc_bo(device, @@ -1361,7 +1361,7 @@ anv_descriptor_set_write_image_view(struct anv_device *device, */ assert(type == bind_layout->type || type == VK_DESCRIPTOR_TYPE_SAMPLER || - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE); + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT); switch (type) { case VK_DESCRIPTOR_TYPE_SAMPLER: @@ -1405,7 +1405,7 @@ anv_descriptor_set_write_image_view(struct anv_device *device, return; enum anv_descriptor_data data = - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_type(device->physical, type) : bind_layout->data; @@ -1496,7 +1496,7 @@ anv_descriptor_set_write_buffer_view(struct anv_device *device, &set->descriptors[bind_layout->descriptor_index + element]; assert(type == bind_layout->type || - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE); + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT); *desc = (struct anv_descriptor) { .type = type, @@ -1507,7 +1507,7 @@ anv_descriptor_set_write_buffer_view(struct anv_device *device, return; enum anv_descriptor_data data = - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_type(device->physical, type) : bind_layout->data; @@ -1562,7 +1562,7 @@ anv_descriptor_set_write_buffer(struct anv_device *device, &set->descriptors[bind_layout->descriptor_index + element]; assert(type == bind_layout->type || - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE); + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT); *desc = (struct anv_descriptor) { .type = type, @@ -1585,7 +1585,7 @@ anv_descriptor_set_write_buffer(struct anv_device *device, struct anv_address bind_addr = anv_address_add(buffer->address, offset); uint64_t bind_range = vk_buffer_range(&buffer->vk, offset, range); enum anv_descriptor_data data = - bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_VALVE ? + bind_layout->type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT ? anv_descriptor_data_for_type(device->physical, type) : bind_layout->data; diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index 4463c09eac6..0fb683003ee 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -3720,7 +3720,7 @@ void anv_GetBufferMemoryRequirements2( pMemoryRequirements); } -void anv_GetDeviceBufferMemoryRequirementsKHR( +void anv_GetDeviceBufferMemoryRequirements( VkDevice _device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements) diff --git a/src/intel/vulkan_hasvk/anv_image.c b/src/intel/vulkan_hasvk/anv_image.c index cd236be484c..7112eca4624 100644 --- a/src/intel/vulkan_hasvk/anv_image.c +++ b/src/intel/vulkan_hasvk/anv_image.c @@ -1595,7 +1595,7 @@ void anv_GetImageMemoryRequirements2( pMemoryRequirements); } -void anv_GetDeviceImageMemoryRequirementsKHR( +void anv_GetDeviceImageMemoryRequirements( VkDevice _device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements) @@ -1632,7 +1632,7 @@ void anv_GetImageSparseMemoryRequirements2( *pSparseMemoryRequirementCount = 0; } -void anv_GetDeviceImageSparseMemoryRequirementsKHR( +void anv_GetDeviceImageSparseMemoryRequirements( VkDevice device, const VkDeviceImageMemoryRequirements* pInfo, uint32_t* pSparseMemoryRequirementCount, diff --git a/src/intel/vulkan_hasvk/anv_pipeline.c b/src/intel/vulkan_hasvk/anv_pipeline.c index 79f243fb925..da0539524ed 100644 --- a/src/intel/vulkan_hasvk/anv_pipeline.c +++ b/src/intel/vulkan_hasvk/anv_pipeline.c @@ -1154,7 +1154,7 @@ static bool anv_graphics_pipeline_load_cached_shaders(struct anv_graphics_pipeline *pipeline, struct vk_pipeline_cache *cache, struct anv_pipeline_stage *stages, - VkPipelineCreationFeedbackEXT *pipeline_feedback) + VkPipelineCreationFeedback *pipeline_feedback) { unsigned found = 0; unsigned cache_hits = 0; @@ -1277,7 +1277,7 @@ anv_graphics_pipeline_compile(struct anv_graphics_pipeline *pipeline, ANV_FROM_HANDLE(anv_pipeline_layout, layout, info->layout); VkResult result; - VkPipelineCreationFeedbackEXT pipeline_feedback = { + VkPipelineCreationFeedback pipeline_feedback = { .flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT, }; int64_t pipeline_start = os_time_get_nano();
