Module: Mesa Branch: main Commit: 1e03ac324f58e78912546000daba015d602e4baf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e03ac324f58e78912546000daba015d602e4baf
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 v3dv: 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/26485> --- src/broadcom/vulkan/v3dv_android.c | 2 +- src/broadcom/vulkan/v3dv_cmd_buffer.c | 6 +++--- src/broadcom/vulkan/v3dv_device.c | 14 +++++++------- src/broadcom/vulkan/v3dv_formats.c | 6 +++--- src/broadcom/vulkan/v3dv_meta_copy.c | 12 ++++++------ src/broadcom/vulkan/v3dv_private.h | 4 ++-- src/broadcom/vulkan/v3dv_queue.c | 4 ++-- src/broadcom/vulkan/v3dvx_formats.c | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_android.c b/src/broadcom/vulkan/v3dv_android.c index 6c49e5d718a..7a16b59dd40 100644 --- a/src/broadcom/vulkan/v3dv_android.c +++ b/src/broadcom/vulkan/v3dv_android.c @@ -486,7 +486,7 @@ finish: * VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT or * VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT" */ - p->formatFeatures |= VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR; + p->formatFeatures |= VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT; return VK_SUCCESS; } diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c index 203c4c273f7..81f9a066b02 100644 --- a/src/broadcom/vulkan/v3dv_cmd_buffer.c +++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c @@ -916,7 +916,7 @@ cmd_buffer_emit_resolve(struct v3dv_cmd_buffer *cmd_buffer, }; VkCommandBuffer cmd_buffer_handle = v3dv_cmd_buffer_to_handle(cmd_buffer); - v3dv_CmdResolveImage2KHR(cmd_buffer_handle, &resolve_info); + v3dv_CmdResolveImage2(cmd_buffer_handle, &resolve_info); } static void @@ -3272,7 +3272,7 @@ handle_barrier(VkPipelineStageFlags2 srcStageMask, VkAccessFlags2 srcAccessMask, void v3dv_cmd_buffer_emit_pipeline_barrier(struct v3dv_cmd_buffer *cmd_buffer, - const VkDependencyInfoKHR *info) + const VkDependencyInfo *info) { uint32_t imageBarrierCount = info->imageMemoryBarrierCount; const VkImageMemoryBarrier2 *pImageBarriers = info->pImageMemoryBarriers; @@ -3334,7 +3334,7 @@ v3dv_cmd_buffer_emit_pipeline_barrier(struct v3dv_cmd_buffer *cmd_buffer, VKAPI_ATTR void VKAPI_CALL v3dv_CmdPipelineBarrier2(VkCommandBuffer commandBuffer, - const VkDependencyInfoKHR *pDependencyInfo) + const VkDependencyInfo *pDependencyInfo) { V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer); v3dv_cmd_buffer_emit_pipeline_barrier(cmd_buffer, pDependencyInfo); diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index c3edc923dff..ca5f26e1277 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -2171,7 +2171,7 @@ v3dv_AllocateMemory(VkDevice _device, * through descriptor state. */ if (flags_info && - (flags_info->flags & VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR)) { + (flags_info->flags & VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT)) { mem->is_for_device_address = true; device_add_device_address_bo(device, mem->bo); } @@ -2306,7 +2306,7 @@ v3dv_GetImageMemoryRequirements2(VkDevice device, } VKAPI_ATTR void VKAPI_CALL -v3dv_GetDeviceImageMemoryRequirementsKHR( +v3dv_GetDeviceImageMemoryRequirements( VkDevice _device, const VkDeviceImageMemoryRequirements *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -2515,7 +2515,7 @@ v3dv_GetBufferMemoryRequirements2(VkDevice device, } VKAPI_ATTR void VKAPI_CALL -v3dv_GetDeviceBufferMemoryRequirementsKHR( +v3dv_GetDeviceBufferMemoryRequirements( VkDevice _device, const VkDeviceBufferMemoryRequirements *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -2801,7 +2801,7 @@ v3dv_GetImageSparseMemoryRequirements2( } VKAPI_ATTR void VKAPI_CALL -v3dv_GetDeviceImageSparseMemoryRequirementsKHR( +v3dv_GetDeviceImageSparseMemoryRequirements( VkDevice device, const VkDeviceImageMemoryRequirements *pInfo, uint32_t *pSparseMemoryRequirementCount, @@ -2812,7 +2812,7 @@ v3dv_GetDeviceImageSparseMemoryRequirementsKHR( VkDeviceAddress v3dv_GetBufferDeviceAddress(VkDevice device, - const VkBufferDeviceAddressInfoKHR *pInfo) + const VkBufferDeviceAddressInfo *pInfo) { V3DV_FROM_HANDLE(v3dv_buffer, buffer, pInfo->buffer); return buffer->mem_offset + buffer->mem->bo->offset; @@ -2820,7 +2820,7 @@ v3dv_GetBufferDeviceAddress(VkDevice device, uint64_t v3dv_GetBufferOpaqueCaptureAddress(VkDevice device, - const VkBufferDeviceAddressInfoKHR *pInfo) + const VkBufferDeviceAddressInfo *pInfo) { /* Not implemented */ return 0; @@ -2829,7 +2829,7 @@ v3dv_GetBufferOpaqueCaptureAddress(VkDevice device, uint64_t v3dv_GetDeviceMemoryOpaqueCaptureAddress( VkDevice device, - const VkDeviceMemoryOpaqueCaptureAddressInfoKHR *pInfo) + const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo) { /* Not implemented */ return 0; diff --git a/src/broadcom/vulkan/v3dv_formats.c b/src/broadcom/vulkan/v3dv_formats.c index 01be6dcf4c2..9d2a4b6c961 100644 --- a/src/broadcom/vulkan/v3dv_formats.c +++ b/src/broadcom/vulkan/v3dv_formats.c @@ -170,7 +170,7 @@ image_format_plane_features(struct v3dv_physical_device *pdevice, if (tiling != VK_IMAGE_TILING_LINEAR) { if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN && desc->is_array) { flags |= VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT | - VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR; + VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT; if (desc->nr_channels == 1 && vk_format_is_int(vk_format)) flags |= VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT; } else if (vk_format == VK_FORMAT_A2B10G10R10_UNORM_PACK32 || @@ -179,7 +179,7 @@ image_format_plane_features(struct v3dv_physical_device *pdevice, vk_format == VK_FORMAT_B10G11R11_UFLOAT_PACK32) { /* To comply with shaderStorageImageExtendedFormats */ flags |= VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT | - VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR; + VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT; } } @@ -295,7 +295,7 @@ buffer_format_features(VkFormat vk_format, const struct v3dv_format *v3dv_format */ flags |= VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT | VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT | - VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR; + VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT; } } else if (vk_format == VK_FORMAT_A2B10G10R10_UNORM_PACK32 || vk_format == VK_FORMAT_A2R10G10B10_UNORM_PACK32) { diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c index f9779bf26cb..d7c04f5a863 100644 --- a/src/broadcom/vulkan/v3dv_meta_copy.c +++ b/src/broadcom/vulkan/v3dv_meta_copy.c @@ -1081,7 +1081,7 @@ copy_image_to_buffer_texel_buffer(struct v3dv_cmd_buffer *cmd_buffer, } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 *info) { @@ -1677,7 +1677,7 @@ copy_image_linear_texel_buffer(struct v3dv_cmd_buffer *cmd_buffer, } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *info) { @@ -1706,7 +1706,7 @@ v3dv_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdCopyBuffer2(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 *pCopyBufferInfo) { V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer); @@ -3210,7 +3210,7 @@ copy_buffer_to_image_shader(struct v3dv_cmd_buffer *cmd_buffer, } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 *info) { V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer); @@ -4721,7 +4721,7 @@ fail: } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdBlitImage2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdBlitImage2(VkCommandBuffer commandBuffer, const VkBlitImageInfo2 *pBlitImageInfo) { V3DV_FROM_HANDLE(v3dv_cmd_buffer, cmd_buffer, commandBuffer); @@ -4864,7 +4864,7 @@ resolve_image_blit(struct v3dv_cmd_buffer *cmd_buffer, } VKAPI_ATTR void VKAPI_CALL -v3dv_CmdResolveImage2KHR(VkCommandBuffer commandBuffer, +v3dv_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *info) { diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h index 33d07e5e9f0..970991755cd 100644 --- a/src/broadcom/vulkan/v3dv_private.h +++ b/src/broadcom/vulkan/v3dv_private.h @@ -1235,7 +1235,7 @@ struct v3dv_job { /* VK_KHR_buffer_device_address allows shaders to use pointers that can * dereference memory in any buffer that has been flagged with - * VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR. These buffers may not + * VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT. These buffers may not * be bound via descriptor sets, so we need to make sure that a job that * uses this functionality includes all these buffers in its kernel * submission. @@ -1846,7 +1846,7 @@ bool v3dv_cmd_buffer_check_needs_store(const struct v3dv_cmd_buffer_state *state VkAttachmentStoreOp store_op); void v3dv_cmd_buffer_emit_pipeline_barrier(struct v3dv_cmd_buffer *cmd_buffer, - const VkDependencyInfoKHR *info); + const VkDependencyInfo *info); bool v3dv_cmd_buffer_copy_image_tfu(struct v3dv_cmd_buffer *cmd_buffer, struct v3dv_image *dst, diff --git a/src/broadcom/vulkan/v3dv_queue.c b/src/broadcom/vulkan/v3dv_queue.c index a0942cf1c96..1b20be77638 100644 --- a/src/broadcom/vulkan/v3dv_queue.c +++ b/src/broadcom/vulkan/v3dv_queue.c @@ -704,7 +704,7 @@ handle_cl_job(struct v3dv_queue *queue, submit.flags |= DRM_V3D_SUBMIT_CL_FLUSH_CACHE; /* If the job uses VK_KHR_buffer_device_address we need to ensure all - * buffers flagged with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR + * buffers flagged with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT * are included. */ if (job->uses_buffer_device_address) { @@ -870,7 +870,7 @@ handle_csd_job(struct v3dv_queue *queue, struct drm_v3d_submit_csd *submit = &job->csd.submit; /* If the job uses VK_KHR_buffer_device_address we need to ensure all - * buffers flagged with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR + * buffers flagged with VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT * are included. */ if (job->uses_buffer_device_address) { diff --git a/src/broadcom/vulkan/v3dvx_formats.c b/src/broadcom/vulkan/v3dvx_formats.c index 2392e836757..10bec96e78a 100644 --- a/src/broadcom/vulkan/v3dvx_formats.c +++ b/src/broadcom/vulkan/v3dvx_formats.c @@ -238,8 +238,8 @@ static const struct v3dv_format format_table[] = { * ARGB4: YZWX (reverse + swap R/B) */ static const struct v3dv_format format_table_4444[] = { - FORMAT(A4B4G4R4_UNORM_PACK16_EXT, ABGR4444, RGBA4, SWIZ_WZYX, 16, true), /* Reverse */ - FORMAT(A4R4G4B4_UNORM_PACK16_EXT, ABGR4444, RGBA4, SWIZ_YZWX, 16, true), /* Reverse + RB swap */ + FORMAT(A4B4G4R4_UNORM_PACK16, ABGR4444, RGBA4, SWIZ_WZYX, 16, true), /* Reverse */ + FORMAT(A4R4G4B4_UNORM_PACK16, ABGR4444, RGBA4, SWIZ_YZWX, 16, true), /* Reverse + RB swap */ }; static const struct v3dv_format format_table_ycbcr[] = {
