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

Change-Id: If127ebc2efa5fcc3c48f5d4fa47a7bfa181bfa1c

diff --cc external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
index bdfc414,ecef086..fe59502
--- 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
@@@ -212,8 -208,12 +212,12 @@@ void MemoryModelTestCase::checkSupport(
        }
        if (m_data.dataType == DATA_TYPE_UINT64)
        {
+               if (!context.getDeviceFeatures().shaderInt64)
+               {
+                       TCU_THROW(NotSupportedError, "64-bit integer in shaders not supported");
+               }
                if (!context.getShaderAtomicInt64Features().shaderBufferInt64Atomics &&
 -                      m_data.guardSC == SC_BUFFER)
 +                      (m_data.guardSC == SC_BUFFER || m_data.guardSC == SC_PHYSBUFFER))
                {
                        TCU_THROW(NotSupportedError, "64-bit integer buffer atomics not supported");
                }