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

Change-Id: I36779b517d338b55ea3adab1d377711b21f90d90

diff --cc android/cts/master/vk-master.txt
index 8447b0a,72503bf..4c6045e
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@@ -550004,11 -520922,7 +551383,12 @@@ dEQP-VK.graphicsfuzz.while-inside-switc
  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/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp
Simple merge

diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index fb1362d,4b25620..32e2ffb
--- 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
@@@ -552347,11 -523265,7 +553726,12 @@@ dEQP-VK.graphicsfuzz.while-inside-switc
  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 7551251,d899c56..6f348fc
--- 1/external/vulkancts/mustpass/master/vk-default.txt
--- 2/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@@ -552194,11 -523112,7 +553573,12 @@@ dEQP-VK.graphicsfuzz.while-inside-switc
  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