From: Alexander Galazin <alexander.galazin@arm.com>
Date: Fri, 22 Feb 2019 13:22:13 +0000 (+0100)
Subject: Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/master
X-Git-Tag: upstream/1.3.5~2240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=306b2d31946519d84f9960ecbc661d6df3ec2d08;p=platform%2Fupstream%2FVK-GL-CTS.git

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

Change-Id: If127ebc2efa5fcc3c48f5d4fa47a7bfa181bfa1c
---

306b2d31946519d84f9960ecbc661d6df3ec2d08
diff --cc external/vulkancts/modules/vulkan/memory_model/vktMemoryModelMessagePassing.cpp
index bdfc414,ecef086..fe59502
--- a/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");
  		}