Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3

Change-Id: I7cfcfe8c9e3549a509420cbe1b63d089b3ee00dc

diff --cc external/vulkancts/framework/vulkan/vkImageUtil.cpp
index 7ad8d4e,33d7272..245745e
--- 1/external/vulkancts/framework/vulkan/vkImageUtil.cpp
--- 2/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@@ -4318,10 -4302,10 +4318,10 @@@ void copyBufferToImage (const DeviceInt
        };
  
        VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &cmdBufferBeginInfo));
 -      copyBufferToImage(vk, *cmdBuffer, buffer, bufferSize, copyRegions, imageAspectFlags, mipLevels, arrayLayers, destImage, destImageLayout, destImageDstStageFlags);
 +      copyBufferToImage(vk, *cmdBuffer, buffer, bufferSize, copyRegions, imageAspectFlags, mipLevels, arrayLayers, destImage, destImageLayout, destImageDstStageFlags, baseMipLevel);
        VK_CHECK(vk.endCommandBuffer(*cmdBuffer));
  
-       const VkPipelineStageFlags pipelineStageFlags = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT;
+       const VkPipelineStageFlags pipelineStageFlags = VK_PIPELINE_STAGE_TRANSFER_BIT;
  
        const VkSubmitInfo submitInfo =
        {

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

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
Simple merge