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

Change-Id: Idc9e2c7523b11e08a849f226037fd2f2fea1e370

diff --cc android/package/AndroidManifest.xml
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentClearTests.cpp
index 8aa8c428b9bd77706e92334067c5ee06dd6df99e,f987f147a75768f35f455e58baead3e948349afa..0c2d3d8141232b9f9af62067712de51d4c1565e2
--- 1/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentClearTests.cpp
--- 2/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentClearTests.cpp
+++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentClearTests.cpp
@@@ -226,9 -250,10 +226,10 @@@ tcu::TestStatus AttachmentClearTestInst
                vk.cmdExecuteCommands(*cmdBuffer, 1u, &secondaryCmdBuffer.get());
        }
  
 -      vk.cmdEndRenderPass(*cmdBuffer);
 +      endRenderPass(vk, *cmdBuffer);
  
        {
+               // Image validator reads image in compute shader
                const vk::VkImageMemoryBarrier  endImgBarrier           =
                {
                        vk::VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,                     // sType

diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentLoadTests.cpp
index 4accf0e19d65f12cec0b8403568f7e22a454dbcf,ca2587b9dd7ba5b3c25d91c0bad49c524cbf5ba8..f7f9926ef506f7324aecaf77d6d0b27d70734b26
--- 1/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentLoadTests.cpp
--- 2/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentLoadTests.cpp
+++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentLoadTests.cpp
@@@ -167,10 -166,22 +167,11 @@@ tcu::TestStatus AttachmentLoadTestInsta
        }
  
        // Image clear
 -      const vk::VkRenderPassBeginInfo         passBeginInfo           =
 -      {
 -              vk::VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,           // sType
 -              DE_NULL,                                                                                        // pNext
 -              *renderPass,                                                                            // renderPass
 -              *framebuffer,                                                                           // framebuffer
 -              { {0, 0}, {RENDER_WIDTH, RENDER_HEIGHT} },                      // renderArea
 -              1u,                                                                                                     // clearValueCount
 -              &m_clearValue,                                                                          // pClearValues
 -      };
 -
 -      vk.cmdBeginRenderPass(*cmdBuffer, &passBeginInfo, vk::VK_SUBPASS_CONTENTS_INLINE);
 -      vk.cmdEndRenderPass(*cmdBuffer);
 +      beginRenderPass(vk, *cmdBuffer, *renderPass, *framebuffer, vk::makeRect2D(0, 0, RENDER_WIDTH, RENDER_HEIGHT), m_clearValue);
 +      endRenderPass(vk, *cmdBuffer);
  
        {
+               // Image validator reads image in compute shader
                const vk::VkImageMemoryBarrier  endImgBarrier           =
                {
                        vk::VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,                     // sType

diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemCopyImageToBufferTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemFillUpdateCopyBufferTests.cpp
Simple merge