From 3700394afb3f7ac520f9d571270aac8c073a7818 Mon Sep 17 00:00:00 2001 From: ziga-lunarg Date: Sun, 5 Mar 2023 23:05:53 +0100 Subject: [PATCH] Fix access mask in pipeline barriers in ray tracing tests The dstAccessMask of pMemoryBarriers must only include access flags that are supported by the pipeline stages in dstStageMask Components: Vulkan VK-GL-CTS issue: 4319 Affected tests: dEQP-VK.ray_tracing_pipeline.large_shader_set.* Change-Id: I633404e9fccd5651ddf4d838961bddd7cc60c32f --- .../modules/vulkan/ray_tracing/vktRayTracingBuildLargeTests.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildLargeTests.cpp b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildLargeTests.cpp index 6a04ad9..e92b32b 100644 --- a/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildLargeTests.cpp +++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildLargeTests.cpp @@ -397,7 +397,7 @@ de::MovePtr RayTracingBuildLargeTestInstance::runTest (const d 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