Fix RAW and WAW hazards in pipeline barrier tests.

Test was not handling correctly internal state of the visibility and availability operations.
Both access scopes of the barrier must be set correctly to unlock such usage of the resource.

Affects:
dEQP-VK.memory.pipeline_barrier.*

Components: Vulkan
VK-GL-CTS issue: 1589

Change-Id: I7a778dbee8109f060b88beee625ca15de01c7364

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
index 1eb9a46..67f3265 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -8215,7 +8215,7 @@ void getAvailableOps (const State& state, bool supportsBuffers, bool supportsIma
                {
                        ops.push_back(OP_PIPELINE_BARRIER_GLOBAL);
 
-                       if (state.hasImage)
+                       if (state.hasImage && (state.imageLayout != vk::VK_IMAGE_LAYOUT_UNDEFINED))
                                ops.push_back(OP_PIPELINE_BARRIER_IMAGE);
 
                        if (state.hasBuffer)