Module: Mesa Branch: main Commit: cb6422765c8927b6f64a33286478599ad6dd3f66 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb6422765c8927b6f64a33286478599ad6dd3f66
Author: Eric Engestrom <e...@igalia.com> Date: Sun Dec 3 19:41:49 2023 +0000 turnip: 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/26493> --- src/freedreno/vulkan/tu_clear_blit.cc | 36 +++++++++++++++++------------------ src/freedreno/vulkan/tu_cmd_buffer.cc | 14 +++++++------- src/freedreno/vulkan/tu_pipeline.cc | 10 +++++----- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/freedreno/vulkan/tu_clear_blit.cc b/src/freedreno/vulkan/tu_clear_blit.cc index 71c71922216..d0599da659b 100644 --- a/src/freedreno/vulkan/tu_clear_blit.cc +++ b/src/freedreno/vulkan/tu_clear_blit.cc @@ -1941,8 +1941,8 @@ tu6_blit_image(struct tu_cmd_buffer *cmd, template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdBlitImage2KHR(VkCommandBuffer commandBuffer, - const VkBlitImageInfo2* pBlitImageInfo) +tu_CmdBlitImage2(VkCommandBuffer commandBuffer, + const VkBlitImageInfo2 *pBlitImageInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); @@ -1971,7 +1971,7 @@ tu_CmdBlitImage2KHR(VkCommandBuffer commandBuffer, tu_disable_lrz(cmd, &cmd->cs, dst_image); } } -TU_GENX(tu_CmdBlitImage2KHR); +TU_GENX(tu_CmdBlitImage2); static void copy_compressed(VkFormat format, @@ -2074,8 +2074,8 @@ tu_copy_buffer_to_image(struct tu_cmd_buffer *cmd, template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, - const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) +tu_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, + const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_image, dst_image, pCopyBufferToImageInfo->dstImage); @@ -2089,7 +2089,7 @@ tu_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, tu_disable_lrz(cmd, &cmd->cs, dst_image); } } -TU_GENX(tu_CmdCopyBufferToImage2KHR); +TU_GENX(tu_CmdCopyBufferToImage2); template <chip CHIP> static void @@ -2163,8 +2163,8 @@ tu_copy_image_to_buffer(struct tu_cmd_buffer *cmd, template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, - const VkCopyImageToBufferInfo2* pCopyImageToBufferInfo) +tu_CmdCopyImageToBuffer2(VkCommandBuffer commandBuffer, + const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_image, src_image, pCopyImageToBufferInfo->srcImage); @@ -2174,7 +2174,7 @@ tu_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, tu_copy_image_to_buffer<CHIP>(cmd, src_image, dst_buffer, pCopyImageToBufferInfo->pRegions + i); } -TU_GENX(tu_CmdCopyImageToBuffer2KHR); +TU_GENX(tu_CmdCopyImageToBuffer2); /* Tiled formats don't support swapping, which means that we can't support * formats that require a non-WZYX swap like B8G8R8A8 natively. Also, some @@ -2406,8 +2406,8 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd, template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, - const VkCopyImageInfo2* pCopyImageInfo) +tu_CmdCopyImage2(VkCommandBuffer commandBuffer, + const VkCopyImageInfo2 *pCopyImageInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_image, src_image, pCopyImageInfo->srcImage); @@ -2432,7 +2432,7 @@ tu_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, tu_disable_lrz(cmd, &cmd->cs, dst_image); } } -TU_GENX(tu_CmdCopyImage2KHR); +TU_GENX(tu_CmdCopyImage2); template <chip CHIP> static void @@ -2470,8 +2470,8 @@ copy_buffer(struct tu_cmd_buffer *cmd, template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, - const VkCopyBufferInfo2 *pCopyBufferInfo) +tu_CmdCopyBuffer2(VkCommandBuffer commandBuffer, + const VkCopyBufferInfo2 *pCopyBufferInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_buffer, src_buffer, pCopyBufferInfo->srcBuffer); @@ -2485,7 +2485,7 @@ tu_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, region->size, 1); } } -TU_GENX(tu_CmdCopyBuffer2KHR); +TU_GENX(tu_CmdCopyBuffer2); template <chip CHIP> VKAPI_ATTR void VKAPI_CALL @@ -2554,8 +2554,8 @@ TU_GENX(tu_CmdFillBuffer); template <chip CHIP> VKAPI_ATTR void VKAPI_CALL -tu_CmdResolveImage2KHR(VkCommandBuffer commandBuffer, - const VkResolveImageInfo2* pResolveImageInfo) +tu_CmdResolveImage2(VkCommandBuffer commandBuffer, + const VkResolveImageInfo2 *pResolveImageInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_image, src_image, pResolveImageInfo->srcImage); @@ -2594,7 +2594,7 @@ tu_CmdResolveImage2KHR(VkCommandBuffer commandBuffer, ops->teardown(cmd, cs); } -TU_GENX(tu_CmdResolveImage2KHR); +TU_GENX(tu_CmdResolveImage2); #define for_each_layer(layer, layer_mask, layers) \ for (uint32_t layer = 0; \ diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index 9bb36cf5c9b..091c8cd29d7 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -2281,13 +2281,13 @@ tu_cmd_end_dynamic_state(struct tu_cmd_buffer *cmd, struct tu_cs *cs, } VKAPI_ATTR void VKAPI_CALL -tu_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, - uint32_t firstBinding, - uint32_t bindingCount, - const VkBuffer* pBuffers, - const VkDeviceSize* pOffsets, - const VkDeviceSize* pSizes, - const VkDeviceSize* pStrides) +tu_CmdBindVertexBuffers2(VkCommandBuffer commandBuffer, + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer *pBuffers, + const VkDeviceSize *pOffsets, + const VkDeviceSize *pSizes, + const VkDeviceSize *pStrides) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); struct tu_cs cs; diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc index b520b1d9195..e0a119af4ac 100644 --- a/src/freedreno/vulkan/tu_pipeline.cc +++ b/src/freedreno/vulkan/tu_pipeline.cc @@ -97,7 +97,7 @@ tu6_load_state_size(struct tu_pipeline *pipeline, count = stage_count * binding->array_size * 2; break; case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: case VK_DESCRIPTOR_TYPE_MUTABLE_EXT: break; default: @@ -187,7 +187,7 @@ tu6_emit_load_state(struct tu_device *device, break; } case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: case VK_DESCRIPTOR_TYPE_MUTABLE_EXT: /* nothing - input attachments and inline uniforms don't use bindless */ break; @@ -3453,8 +3453,8 @@ tu_pipeline_builder_parse_depth_stencil( VK_IMAGE_ASPECT_DEPTH_BIT)) { pipeline->ds.raster_order_attachment_access = ds_info && (ds_info->flags & - (VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_ARM | - VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_ARM)); + (VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_DEPTH_ACCESS_BIT_EXT | + VK_PIPELINE_DEPTH_STENCIL_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_STENCIL_ACCESS_BIT_EXT)); } } @@ -3492,7 +3492,7 @@ tu_pipeline_builder_parse_multisample_and_color_blend( if (builder->graphics_state.rp->attachment_aspects & VK_IMAGE_ASPECT_COLOR_BIT) { pipeline->output.raster_order_attachment_access = blend_info && (blend_info->flags & - VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_ARM); + VK_PIPELINE_COLOR_BLEND_STATE_CREATE_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_BIT_EXT); } }
