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

Change-Id: I45389a45424b0978ce6ac4b08108717c486e1bee

diff --cc external/vulkancts/README.md
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
index 43f379c,88252e8..2916d56
--- 1/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
@@@ -774,24 -548,7 +774,25 @@@ tcu::TestCaseGroup* createImageCompress
                                                                                   addAhbCompressionControlTests, testParams));
        }
  
 -              group->addChild(subgroup);
 +      group->addChild(subgroup);
 +
 +      subgroup = new tcu::TestCaseGroup(testCtx, "swapchain", "swapchain");
 +      for (int typeNdx = 0; typeNdx < vk::wsi::TYPE_LAST; ++typeNdx)
 +      {
 +              const vk::wsi::Type wsiType = (vk::wsi::Type)typeNdx;
 +              testParams.wsiType                      = wsiType;
 +
 +              tcu::TestCaseGroup* wsi_subgroup(new tcu::TestCaseGroup(testCtx, getName(wsiType), "Swapchain tests"));
 +
 +              for (auto& flag : compression_flags)
 +              {
 +                      testParams.control.flags = flag.flag;
 +                      addFunctionCase(wsi_subgroup, flag.name, flag.name, swapchainCreateTest, testParams);
 +              }
 +              subgroup->addChild(wsi_subgroup);
 +      }
++
 +      group->addChild(subgroup);
  
        return group.release();
  }

diff --cc external/vulkancts/modules/vulkan/fragment_ops/vktFragmentOperationsEarlyFragmentTests.cpp
Simple merge

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