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

Change-Id: I510f56d1a706648f1b8da895436df251ffecad3d

diff --cc android/cts/master/vk-master.txt
index a5fd87e,a287e6e..bf6b340
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@@ -471341,13 -462570,9 +472789,14 @@@ dEQP-VK.graphicsfuzz.mat-array-deep-con
  dEQP-VK.graphicsfuzz.mat-array-distance
  dEQP-VK.graphicsfuzz.matrices-and-return-in-loop
  dEQP-VK.graphicsfuzz.pow-vec4
+ dEQP-VK.graphicsfuzz.return-in-loop-in-function
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
  dEQP-VK.graphicsfuzz.while-inside-switch
 +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/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge

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

diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index 4364357,cc625cb..59ddbdb
--- 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
@@@ -473487,13 -464716,9 +474935,14 @@@ dEQP-VK.graphicsfuzz.mat-array-deep-con
  dEQP-VK.graphicsfuzz.mat-array-distance
  dEQP-VK.graphicsfuzz.matrices-and-return-in-loop
  dEQP-VK.graphicsfuzz.pow-vec4
+ dEQP-VK.graphicsfuzz.return-in-loop-in-function
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
  dEQP-VK.graphicsfuzz.while-inside-switch
 +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 ade0746,10170d8..454204b
--- 1/external/vulkancts/mustpass/master/vk-default.txt
--- 2/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@@ -473334,13 -464563,9 +474782,14 @@@ dEQP-VK.graphicsfuzz.mat-array-deep-con
  dEQP-VK.graphicsfuzz.mat-array-distance
  dEQP-VK.graphicsfuzz.matrices-and-return-in-loop
  dEQP-VK.graphicsfuzz.pow-vec4
+ dEQP-VK.graphicsfuzz.return-in-loop-in-function
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
  dEQP-VK.graphicsfuzz.while-inside-switch
 +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