From 1d699faac577dcafba85a1a9c1bf1ae7abcdfe3c Mon Sep 17 00:00:00 2001 From: ziga-lunarg Date: Mon, 16 Jan 2023 13:45:27 +0100 Subject: [PATCH] Fix image barrier in ray tracing pipeline build tests Use the correct combination of access mask and pipeline stage Components: Vulkan VK-GL-CTS issue: 4202 Affected tests: dEQP-VK.ray_tracing_pipeline.build.* Change-Id: I5ae3a9512dd29f363e2acfc56b451edc502ebafb --- .../vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp index f779470..9109f94 100644 --- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp +++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp @@ -471,7 +471,7 @@ de::MovePtr RayTracingBuildTestInstance::runTest (bool useGpuB const VkImageMemoryBarrier preImageBarrier = makeImageMemoryBarrier(0u, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, **image, imageSubresourceRange); - const VkImageMemoryBarrier postImageBarrier = makeImageMemoryBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR | VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR, + const VkImageMemoryBarrier postImageBarrier = makeImageMemoryBarrier(VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_GENERAL, **image, imageSubresourceRange); const VkMemoryBarrier postTraceMemoryBarrier = makeMemoryBarrier(VK_ACCESS_SHADER_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT); -- 2.7.4