From: Alexander Galazin <alexander.galazin@arm.com>
Date: Fri, 11 Aug 2017 16:32:00 +0000 (+0200)
Subject: Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
X-Git-Tag: upstream/0.1.0~9^2~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b2f42f7dea39989fc4c80e0606bd216efb6c918;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2

Change-Id: Iae127509ee1d187291e37c0ee9da7d331b070646
---

8b2f42f7dea39989fc4c80e0606bd216efb6c918
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 06348d518,ecbd17c8a..848f1ce25
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@@ -365,13 -390,11 +365,13 @@@ struct OpAtomicCas
  						, numOutputElements (_numOutputElements) {}
  };
  
 -tcu::TestCaseGroup* createOpAtomicGroup (tcu::TestContext& testCtx)
 +tcu::TestCaseGroup* createOpAtomicGroup (tcu::TestContext& testCtx, bool useStorageBuffer)
  {
 -	de::MovePtr<tcu::TestCaseGroup>	group			(new tcu::TestCaseGroup(testCtx, "opatomic", "Test the OpAtomic* opcodes"));
 -	de::Random						rnd				(deStringHash(group->getName()));
 -	const int						numElements		= 65535;
 +	de::MovePtr<tcu::TestCaseGroup>	group				(new tcu::TestCaseGroup(testCtx,
 +																				useStorageBuffer ? "opatomic_storage_buffer" : "opatomic",
 +																				"Test the OpAtomic* opcodes"));
 +	de::Random						rnd					(deStringHash(group->getName()));
- 	const int						numElements			= 1000000;
++	const int						numElements			= 65535;
  	vector<OpAtomicCase>			cases;
  
  	const StringTemplate			shaderTemplate	(