Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

Change-Id: Iaaff1bd558b7938a73c553c312f8271a8e288cd3

diff --cc external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
index fe59502,093088d..88618db
--- 1/external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
--- 2/external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
+++ b/external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
@@@ -227,14 -223,20 +227,29 @@@ void MemoryModelTestCase::checkSupport(
                        TCU_THROW(NotSupportedError, "64-bit integer shared atomics not supported");
                }
        }
-     if (m_data.transitive &&
 +
-     if ((m_data.payloadSC == SC_PHYSBUFFER || m_data.guardSC == SC_PHYSBUFFER) &&
++      if (m_data.transitive &&
 +              !context.getVulkanMemoryModelFeatures().vulkanMemoryModelAvailabilityVisibilityChains)
 +              TCU_THROW(NotSupportedError, "vulkanMemoryModelAvailabilityVisibilityChains not supported");
 +
++      if ((m_data.payloadSC == SC_PHYSBUFFER || m_data.guardSC == SC_PHYSBUFFER) &&
 +              !context.getBufferDeviceAddressFeatures().bufferDeviceAddress)
 +              TCU_THROW(NotSupportedError, "Physical storage buffer pointers not supported");
++
+       if (m_data.stage == STAGE_VERTEX)
+       {
+               if (!context.getDeviceFeatures().vertexPipelineStoresAndAtomics)
+               {
+                       TCU_THROW(NotSupportedError, "vertexPipelineStoresAndAtomics not supported");
+               }
+       }
+       if (m_data.stage == STAGE_FRAGMENT)
+       {
+               if (!context.getDeviceFeatures().fragmentStoresAndAtomics)
+               {
+                       TCU_THROW(NotSupportedError, "fragmentStoresAndAtomics not supported");
+               }
+       }
  }