From 63d55d84a35bf2f68e596876be8d3aa459142cd3 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 11 Mar 2026 14:23:25 +0100 Subject: [PATCH] radv: replace remaining occurrences of VK_ACCESS_xxx Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/layers/radv_app_workarounds.c | 4 ++-- src/amd/vulkan/meta/radv_meta_copy.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/layers/radv_app_workarounds.c b/src/amd/vulkan/layers/radv_app_workarounds.c index 2fda1445cf8..d8b71442dcc 100644 --- a/src/amd/vulkan/layers/radv_app_workarounds.c +++ b/src/amd/vulkan/layers/radv_app_workarounds.c @@ -110,11 +110,11 @@ strange_brigade_CmdPipelineBarrier2(VkCommandBuffer commandBuffer, const VkDepen VkImageMemoryBarrier2 *barrier = (VkImageMemoryBarrier2 *)&pDependencyInfo->pImageMemoryBarriers[i]; if (barrier->newLayout == VK_IMAGE_LAYOUT_PRESENT_SRC_KHR && - barrier->srcAccessMask == VK_ACCESS_COLOR_ATTACHMENT_READ_BIT) { + barrier->srcAccessMask == VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT) { /* This game has a broken barrier right before present that causes rendering issues. Fix it * by modifying the src access mask. */ - barrier->srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + barrier->srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; break; } } diff --git a/src/amd/vulkan/meta/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c index 1b39fffd4f4..a465b21e0ae 100644 --- a/src/amd/vulkan/meta/radv_meta_copy.c +++ b/src/amd/vulkan/meta/radv_meta_copy.c @@ -340,9 +340,9 @@ radv_CmdCopyBufferToImage2(VkCommandBuffer commandBuffer, const VkCopyBufferToIm if (radv_is_format_emulated(pdev, dst_image->vk.format) && cmd_buffer->qf != RADV_QUEUE_TRANSFER) { cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_PS_PARTIAL_FLUSH | radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, - VK_ACCESS_TRANSFER_WRITE_BIT, 0, dst_image, NULL) | + VK_ACCESS_2_TRANSFER_WRITE_BIT, 0, dst_image, NULL) | radv_dst_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, - VK_ACCESS_TRANSFER_READ_BIT, 0, dst_image, NULL); + VK_ACCESS_2_TRANSFER_READ_BIT, 0, dst_image, NULL); const enum util_format_layout format_layout = radv_format_description(dst_image->vk.format)->layout; for (unsigned r = 0; r < pCopyBufferToImageInfo->regionCount; r++) { @@ -835,9 +835,9 @@ radv_CmdCopyImage2(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyI if (radv_is_format_emulated(pdev, dst_image->vk.format) && cmd_buffer->qf != RADV_QUEUE_TRANSFER) { cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_PS_PARTIAL_FLUSH | radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, - VK_ACCESS_TRANSFER_WRITE_BIT, 0, dst_image, NULL) | + VK_ACCESS_2_TRANSFER_WRITE_BIT, 0, dst_image, NULL) | radv_dst_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, - VK_ACCESS_TRANSFER_READ_BIT, 0, dst_image, NULL); + VK_ACCESS_2_TRANSFER_READ_BIT, 0, dst_image, NULL); const enum util_format_layout format_layout = radv_format_description(dst_image->vk.format)->layout; for (unsigned r = 0; r < pCopyImageInfo->regionCount; r++) {