Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.3.0

Change-Id: Icb78e9ab972d7942276a0f12b6bcb55ceb2878c7

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

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

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

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

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

diff --cc external/vulkancts/modules/vulkan/compute/vktComputeWorkgroupMemoryExplicitLayoutTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassSubpassDependencyTests.cpp
index 9780759,9de3bd2..140aa5b
--- 1/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSubpassDependencyTests.cpp
--- 2/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSubpassDependencyTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassSubpassDependencyTests.cpp
@@@ -2559,8 -2559,15 +2559,15 @@@ tcu::TestStatus SeparateChannelsTestIns
                }
  
                const vector<Subpass>           subpasses       (1, Subpass(VK_PIPELINE_BIND_POINT_GRAPHICS, 0u, inputAttachmentReferences, colorAttachmentReferences, vector<AttachmentReference>(), isDSFormat ? dsAttachmentReference : AttachmentReference(VK_ATTACHMENT_UNUSED, VK_IMAGE_LAYOUT_GENERAL), vector<deUint32>()));
 -              renderPass = createRenderPass(vkd, device, RenderPass(attachments, subpasses, subpassDependency), m_renderPassType);
+               vector<SubpassDependency> subpassDependency;
+               if(!isDSFormat)
+               {
+                       /* Self supass-dependency */
+                       subpassDependency.push_back(SubpassDependency(0u, 0u, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+                                                       VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_INPUT_ATTACHMENT_READ_BIT, VK_DEPENDENCY_BY_REGION_BIT));
+               }
++              renderPass = createRenderPass(vkd, device, RenderPass(attachments, subpasses, subpassDependency), m_renderingType);
  
-               renderPass = createRenderPass(vkd, device, RenderPass(attachments, subpasses, vector<SubpassDependency>()), m_renderingType);
        }
  
        // Create render pipeline.

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

diff --cc framework/common/tcuRasterizationVerifier.cpp
Simple merge

diff --cc scripts/build_android_mustpass.py
Simple merge