Module: Mesa Branch: main Commit: 680d5fdaf328a3157cc88683826fe49685203085 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=680d5fdaf328a3157cc88683826fe49685203085
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 anv: 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/anv_device.c | 2 +- src/intel/vulkan/anv_formats.c | 8 ++++---- src/intel/vulkan/anv_image.c | 4 ++-- src/intel/vulkan/anv_pipeline.c | 16 ++++++++-------- src/intel/vulkan/genX_cmd_buffer.c | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 272a60005bb..a57004af66a 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -4733,7 +4733,7 @@ anv_get_buffer_memory_requirements(struct anv_device *device, } } -void anv_GetDeviceBufferMemoryRequirementsKHR( +void anv_GetDeviceBufferMemoryRequirements( VkDevice _device, const VkDeviceBufferMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements) diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 79acf61d72f..a402b062004 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -1026,7 +1026,7 @@ void anv_GetPhysicalDeviceFormatProperties2( static bool anv_format_supports_usage( - VkFormatFeatureFlags2KHR format_feature_flags, + VkFormatFeatureFlags2 format_feature_flags, VkImageUsageFlags usage_flags) { if (usage_flags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) { @@ -1161,7 +1161,7 @@ anv_formats_gather_format_features( bool allow_texel_compatible) { const struct intel_device_info *devinfo = &physical_device->info; - VkFormatFeatureFlags2KHR all_formats_feature_flags = 0; + VkFormatFeatureFlags2 all_formats_feature_flags = 0; /* We need to check that each of the usage bits are allowed for at least * one of the potential formats. @@ -1183,7 +1183,7 @@ anv_formats_gather_format_features( if (anv_formats_are_compatible(format, possible_anv_format, devinfo, tiling, allow_texel_compatible)) { - VkFormatFeatureFlags2KHR view_format_features = + VkFormatFeatureFlags2 view_format_features = anv_get_image_format_features2(physical_device, possible_anv_format->vk_format, possible_anv_format, tiling, @@ -1202,7 +1202,7 @@ anv_formats_gather_format_features( const struct anv_format *anv_view_format = anv_get_format(vk_view_format); - VkFormatFeatureFlags2KHR view_format_features = + VkFormatFeatureFlags2 view_format_features = anv_get_image_format_features2(physical_device, vk_view_format, anv_view_format, tiling, isl_mod_info); diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 2b74e94505e..5ba57beebe9 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -2009,7 +2009,7 @@ void anv_GetImageMemoryRequirements2( pMemoryRequirements); } -void anv_GetDeviceImageMemoryRequirementsKHR( +void anv_GetDeviceImageMemoryRequirements( VkDevice _device, const VkDeviceImageMemoryRequirements* pInfo, VkMemoryRequirements2* pMemoryRequirements) @@ -2156,7 +2156,7 @@ void anv_GetDeviceImageSparseMemoryRequirements( return; } - /* This function is similar to anv_GetDeviceImageMemoryRequirementsKHR, in + /* This function is similar to anv_GetDeviceImageMemoryRequirements, in * which it actually creates an image, gets the properties and then * destroys the image. * diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 5073b9c63e6..e264726baf6 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -1811,7 +1811,7 @@ anv_graphics_pipeline_load_cached_shaders(struct anv_graphics_base_pipeline *pip struct vk_pipeline_cache *cache, struct anv_pipeline_stage *stages, bool link_optimize, - VkPipelineCreationFeedbackEXT *pipeline_feedback) + VkPipelineCreationFeedback *pipeline_feedback) { struct anv_device *device = pipeline->base.device; unsigned cache_hits = 0, found = 0, imported = 0; @@ -2041,7 +2041,7 @@ anv_pipeline_nir_preprocess(struct anv_pipeline *pipeline, static void anv_fill_pipeline_creation_feedback(const struct anv_graphics_base_pipeline *pipeline, - VkPipelineCreationFeedbackEXT *pipeline_feedback, + VkPipelineCreationFeedback *pipeline_feedback, const VkGraphicsPipelineCreateInfo *info, struct anv_pipeline_stage *stages) { @@ -2094,7 +2094,7 @@ static VkResult anv_graphics_pipeline_compile(struct anv_graphics_base_pipeline *pipeline, struct anv_pipeline_stage *stages, struct vk_pipeline_cache *cache, - VkPipelineCreationFeedbackEXT *pipeline_feedback, + VkPipelineCreationFeedback *pipeline_feedback, const VkGraphicsPipelineCreateInfo *info, const struct vk_graphics_pipeline_state *state) { @@ -2999,8 +2999,8 @@ anv_graphics_lib_pipeline_create(struct anv_device *device, VkPipeline *pPipeline) { struct anv_pipeline_stage stages[ANV_GRAPHICS_SHADER_STAGE_COUNT] = {}; - VkPipelineCreationFeedbackEXT pipeline_feedback = { - .flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT, + VkPipelineCreationFeedback pipeline_feedback = { + .flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT, }; int64_t pipeline_start = os_time_get_nano(); @@ -3025,7 +3025,7 @@ anv_graphics_lib_pipeline_create(struct anv_device *device, pAllocator); if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, pAllocator, pipeline); - if (result == VK_PIPELINE_COMPILE_REQUIRED_EXT) + if (result == VK_PIPELINE_COMPILE_REQUIRED) *pPipeline = VK_NULL_HANDLE; return result; } @@ -3109,8 +3109,8 @@ anv_graphics_pipeline_create(struct anv_device *device, VkPipeline *pPipeline) { struct anv_pipeline_stage stages[ANV_GRAPHICS_SHADER_STAGE_COUNT] = {}; - VkPipelineCreationFeedbackEXT pipeline_feedback = { - .flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT_EXT, + VkPipelineCreationFeedback pipeline_feedback = { + .flags = VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT, }; int64_t pipeline_start = os_time_get_nano(); diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index cbd37a9b68d..13d5b280a5e 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -3823,7 +3823,7 @@ static inline bool stage_is_transfer(const VkPipelineStageFlags2 stage) { return (stage & (VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT | - VK_PIPELINE_STAGE_2_TRANSFER_BIT)); + VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT)); } static inline bool @@ -8733,7 +8733,7 @@ genX(write_trtt_entries)(struct anv_trtt_submission *submit) void genX(CmdWriteBufferMarker2AMD)(VkCommandBuffer commandBuffer, - VkPipelineStageFlags2KHR stage, + VkPipelineStageFlags2 stage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker)
