Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/master

Change-Id: I44bb78fa8e39d0a2dfd9a0d6d08d7163d6eba76a

diff --cc android/cts/master/vk-master-2020-03-01.txt
index 99299e28127b1fdfab43923c8b21943496b6fa41,a4e92fb49ec1c99be7cf0abccf5c30e81718a962..a18f64d590482505979eff28242d60952fafad59
--- 1/android/cts/master/vk-master-2020-03-01.txt
--- 2/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@@ -113658,6 -105576,6 +113658,90 @@@ dEQP-VK.image.format_reinterpret.buffer
  dEQP-VK.image.format_reinterpret.buffer.r8_snorm_r8_uint
  dEQP-VK.image.format_reinterpret.buffer.r8_snorm_r8_sint
  dEQP-VK.image.format_reinterpret.buffer.r8_snorm_r8_unorm
++dEQP-VK.image.atomic_operations.sub.1d.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.1d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.1d.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.1d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.1d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.1d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.1d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.1d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.2d.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.2d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.2d.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.2d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.2d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.2d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.2d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.2d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.3d.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.3d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.3d.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.3d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.cube.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.cube.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.cube.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.cube.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.sub.cube_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.sub.cube_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.sub.cube_array.r32i_end_result
++dEQP-VK.image.atomic_operations.sub.cube_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.1d.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.1d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.1d.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.1d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.1d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.1d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.1d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.1d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.2d.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.2d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.2d.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.2d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.2d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.2d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.2d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.2d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.3d.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.3d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.3d.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.3d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.cube.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.cube.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.cube.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.cube.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.inc.cube_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.inc.cube_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.inc.cube_array.r32i_end_result
++dEQP-VK.image.atomic_operations.inc.cube_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.1d.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.1d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.1d.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.1d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.1d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.1d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.1d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.1d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.2d.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.2d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.2d.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.2d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.2d_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.2d_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.2d_array.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.2d_array.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.3d.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.3d.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.3d.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.3d.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.cube.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.cube.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.cube.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.cube.r32i_intermediate_values
++dEQP-VK.image.atomic_operations.dec.cube_array.r32ui_end_result
++dEQP-VK.image.atomic_operations.dec.cube_array.r32ui_intermediate_values
++dEQP-VK.image.atomic_operations.dec.cube_array.r32i_end_result
++dEQP-VK.image.atomic_operations.dec.cube_array.r32i_intermediate_values
  dEQP-VK.image.extend_operands_spirv1p4.r32g32b32a32_uint_matching_extend
  dEQP-VK.image.extend_operands_spirv1p4.r16g16b16a16_uint_matching_extend
  dEQP-VK.image.extend_operands_spirv1p4.r16g16b16a16_uint_relaxed_matching_extend
@@@ -182910,7 -166656,7 +182994,9 @@@ dEQP-VK.graphicsfuzz.always-false-if-in
  dEQP-VK.graphicsfuzz.always-false-if-with-discard-return
  dEQP-VK.graphicsfuzz.barrier-in-loop-with-break
  dEQP-VK.graphicsfuzz.break-in-do-while-with-nested-if
++dEQP-VK.graphicsfuzz.call-function-with-discard
  dEQP-VK.graphicsfuzz.call-if-while-switch
++dEQP-VK.graphicsfuzz.color-set-in-for-loop
  dEQP-VK.graphicsfuzz.color-write-in-loop
  dEQP-VK.graphicsfuzz.complex-nested-loops-and-call
  dEQP-VK.graphicsfuzz.conditional-return-in-infinite-while
@@@ -182993,8 -166707,7 +183079,9 @@@ dEQP-VK.graphicsfuzz.smoothstep-after-l
  dEQP-VK.graphicsfuzz.struct-and-unreachable-infinite-loop
  dEQP-VK.graphicsfuzz.struct-controlled-loop
  dEQP-VK.graphicsfuzz.struct-used-as-temporary
 +dEQP-VK.graphicsfuzz.switch-case-with-undefined-expression
  dEQP-VK.graphicsfuzz.switch-if-discard
++dEQP-VK.graphicsfuzz.switch-inside-while-always-return
  dEQP-VK.graphicsfuzz.switch-with-empty-if-false
  dEQP-VK.graphicsfuzz.swizzle-struct-init-min
  dEQP-VK.graphicsfuzz.transpose-rectangular-matrix