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

Change-Id: I8db9696a5f7b9bafdf20e76afc8d1d42b96cfe1c

diff --cc external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp
index d446468,1e5d734..ba81b94
--- 1/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp
--- 2/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp
+++ b/external/vulkancts/modules/vulkan/draw/vktDrawInstancedTests.cpp
@@@ -452,13 -452,11 +452,13 @@@ tcu::TestStatus InstancedDrawInstance::
                const deUint32 instanceCount = instanceCounts[instanceCountNdx];
                for (int firstInstanceIndexNdx = 0; firstInstanceIndexNdx < firstInstanceIndicesCount; firstInstanceIndexNdx++)
                {
 -                      const deUint32 firstInstance = firstInstanceIndices[firstInstanceIndexNdx];
 +                      // Prepare vertex data for at least one instance
 +                      const deUint32                          prepareCount                    = de::max(instanceCount, 1u);
 +                      const deUint32                          firstInstance                   = firstInstanceIndices[firstInstanceIndexNdx];
  
 -                      prepareVertexData(instanceCount, firstInstance);
 +                      prepareVertexData(prepareCount, firstInstance);
-                       const de::SharedPtr<Buffer>     vertexBuffer                    = createAndUploadBuffer(m_data, m_vk, m_context);
-                       const de::SharedPtr<Buffer>     instancedVertexBuffer   = createAndUploadBuffer(m_instancedColor, m_vk, m_context);
+                       const de::SharedPtr<Buffer>     vertexBuffer                    = createAndUploadBuffer(m_data, m_vk, m_context, vk::VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
+                       const de::SharedPtr<Buffer>     instancedVertexBuffer   = createAndUploadBuffer(m_instancedColor, m_vk, m_context, vk::VK_BUFFER_USAGE_VERTEX_BUFFER_BIT);
                        de::SharedPtr<Buffer>           indexBuffer;
                        de::SharedPtr<Buffer>           indirectBuffer;
                        m_vk.beginCommandBuffer(*m_cmdBuffer, &beginInfo);