Fix validation errors in synchronization tests

Change a pipeline stage flag to one supported by
VK_ACCESS_COLOR_ATTACHMENT_READ_BIT and initialize
a VkExternalSemaphoreProperties struct.

Affects:

dEQP-VK.synchronization.cross_instance.*
dEQP-VK.synchronization.internally_synchronized_objects.
pipeline_cache_graphics

Components: Vulkan

VK-GL-CTS issue: 1046

Change-Id: I537933539b616c14942791accee689db40294dba

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
index 1b26fb4..25fc89e 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
@@ -216,7 +216,15 @@ public:
                                DE_NULL,
                                config.semaphoreHandleType
                        };
-                       vk::VkExternalSemaphoreProperties                               properties;
+
+                       vk::VkExternalSemaphoreProperties                               properties      =
+                       {
+                               vk::VK_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_PROPERTIES,
+                               DE_NULL,
+                               0u,
+                               0u,
+                               0u
+                       };
 
                        vki.getPhysicalDeviceExternalSemaphoreProperties(physicalDevice, &info, &properties);
 

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
index ec80b66..c4c53e4 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
@@ -394,7 +394,7 @@ TestStatus executeGraphicPipeline (const Context& context, const VkPipeline& pip
                                VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
                                **colorAttachmentImage, colorImageSubresourceRange);
 
-                       vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, (VkDependencyFlags)0,
+                       vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, (VkDependencyFlags)0,
                                0u, DE_NULL, 0u, DE_NULL, 1u, &colorAttachmentLayoutBarrier);
                }