Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6

Change-Id: Ic4e0dff0f0b61669584c3eff4602af9971552ab4

diff --cc android/cts/master/src/vk-master-2019-03-01.txt
Simple merge

diff --cc android/cts/master/vk-master-2019-03-01.txt
Simple merge

diff --cc android/cts/master/vk-master.txt
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/draw/vktDrawConcurrentTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
index 63cd85f9b489fbbf37758230cf80fd5a9e2d70a8,21493191bf6927beea096abfb7307e662e117152..4be971a838e661041aa02d09b960be504d18a452
--- 1/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
--- 2/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
+++ b/external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
@@@ -3289,13 -3294,13 +3294,13 @@@ void MultiViewDepthStencilTestInstance:
  
        imageBarrier(*m_device, *m_cmdBuffer, m_dsAttachment->getImage(), subresourceRange,
                VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
 -              VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
 -              VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT);
 +              VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
 +              VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
  }
  
- void MultiViewDepthStencilTestInstance::afterDraw (void)
+ void MultiViewDepthStencilTestInstance::afterRenderPass (void)
  {
-       MultiViewRenderTestInstance::afterDraw();
+       MultiViewRenderTestInstance::afterRenderPass();
  
        const VkImageSubresourceRange   dsSubresourceRange              =
        {

diff --cc external/vulkancts/modules/vulkan/robustness/vktRobustnessExtsTests.cpp
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge

diff --cc modules/gles31/functional/es31fShaderMultisampleInterpolationStateQueryTests.cpp
Simple merge