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

Change-Id: I84a639633f77095edfd99f1d5873b77896f35c97

diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
index 4b5764f9c7560947d0adbc053bc1d0895bf82195,5bd4d74c33e72126457e5a4b92fb71e12b4a51a3..6769f89cba85d8cc6a7e97efb993e968736b1930
--- 1/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
--- 2/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
@@@ -463,11 -461,25 +463,12 @@@ struct RenderInf
  void  recordRenderPass (const DeviceInterface& deviceInterface, const RenderInfo& renderInfo)
  {
        const VkDeviceSize                                      bindingOffset                   = 0;
 -      const VkClearValue                                      clearValue                              = makeClearValueColorF32(0.0, 0.0, 1.0, 1.0);
 -      VkRenderPassBeginInfo                           renderPassBeginState;
        VkImageMemoryBarrier                            renderBarrier;
  
 -      deMemset(&renderPassBeginState, 0xcd, sizeof(renderPassBeginState));
 -      renderPassBeginState.sType                                              = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
 -      renderPassBeginState.pNext                                              = DE_NULL;
 -      renderPassBeginState.renderPass                                 = renderInfo.renderPass;
 -      renderPassBeginState.framebuffer                                = renderInfo.framebuffer;
 -      renderPassBeginState.renderArea.offset.x                = 0;
 -      renderPassBeginState.renderArea.offset.y                = 0;
 -      renderPassBeginState.renderArea.extent.width    = renderInfo.width;
 -      renderPassBeginState.renderArea.extent.height   = renderInfo.height;
 -      renderPassBeginState.clearValueCount                    = 1;
 -      renderPassBeginState.pClearValues                               = &clearValue;
 +      beginRenderPass(deviceInterface, renderInfo.commandBuffer, renderInfo.renderPass, renderInfo.framebuffer, makeRect2D(0, 0, renderInfo.width, renderInfo.height), tcu::Vec4(0.0f, 0.0f, 1.0f, 1.0f));
+ 
        if (renderInfo.waitEvent)
                deviceInterface.cmdWaitEvents(renderInfo.commandBuffer, 1, &renderInfo.event, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, DE_NULL, 0, DE_NULL, 0, DE_NULL);
 -      deviceInterface.cmdBeginRenderPass(renderInfo.commandBuffer, &renderPassBeginState, VK_SUBPASS_CONTENTS_INLINE);
        deviceInterface.cmdBindPipeline(renderInfo.commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, renderInfo.pipeline);
        deviceInterface.cmdBindVertexBuffers(renderInfo.commandBuffer, 0u, 1u, &renderInfo.vertexBuffer, &bindingOffset);
        deviceInterface.cmdDraw(renderInfo.commandBuffer, renderInfo.vertexBufferSize, 1, 0, 0);