Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I8c2286b2b99e7d246111657db98348860a7330b0

diff --cc android/cts/master/vk-master.txt
index 2485f91,1315828..ef7be86
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@@ -551389,14 -521011,8 +551472,13 @@@ dEQP-VK.graphicsfuzz.unreachable-loops-
  dEQP-VK.graphicsfuzz.unreachable-return-in-loop
  dEQP-VK.graphicsfuzz.while-inside-switch
  dEQP-VK.graphicsfuzz.write-before-break
- dEQP-VK.graphicsfuzz.write-red-after-search
  dEQP-VK.graphicsfuzz.write-red-in-loop-nest
  dEQP-VK.graphicsfuzz.wrong-color-in-always-false-if
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256

diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index a10d364,d1bba07..d6736c9
--- 1/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
--- 2/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
@@@ -553732,14 -523354,8 +553815,13 @@@ dEQP-VK.graphicsfuzz.unreachable-loops-
  dEQP-VK.graphicsfuzz.unreachable-return-in-loop
  dEQP-VK.graphicsfuzz.while-inside-switch
  dEQP-VK.graphicsfuzz.write-before-break
- dEQP-VK.graphicsfuzz.write-red-after-search
  dEQP-VK.graphicsfuzz.write-red-in-loop-nest
  dEQP-VK.graphicsfuzz.wrong-color-in-always-false-if
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256

diff --cc external/vulkancts/mustpass/master/vk-default.txt
index db9d85f,4e0d8fa..ff8f921
--- 1/external/vulkancts/mustpass/master/vk-default.txt
--- 2/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@@ -553579,14 -523201,8 +553662,13 @@@ dEQP-VK.graphicsfuzz.unreachable-loops-
  dEQP-VK.graphicsfuzz.unreachable-return-in-loop
  dEQP-VK.graphicsfuzz.while-inside-switch
  dEQP-VK.graphicsfuzz.write-before-break
- dEQP-VK.graphicsfuzz.write-red-after-search
  dEQP-VK.graphicsfuzz.write-red-in-loop-nest
  dEQP-VK.graphicsfuzz.wrong-color-in-always-false-if
 +dEQP-VK.imageless_framebuffer.color
 +dEQP-VK.imageless_framebuffer.depth_stencil
 +dEQP-VK.imageless_framebuffer.color_resolve
 +dEQP-VK.imageless_framebuffer.depth_stencil_resolve
 +dEQP-VK.imageless_framebuffer.multisubpass
  dEQP-VK.transform_feedback.simple.basic_1_256
  dEQP-VK.transform_feedback.simple.basic_beginqueryindexed_streamid_0_1_256
  dEQP-VK.transform_feedback.simple.basic_endqueryindexed_streamid_0_1_256