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

Change-Id: Iae127509ee1d187291e37c0ee9da7d331b070646

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 06348d5,ecbd17c..848f1ce
--- 1/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
--- 2/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  (