Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/vulkan-cts-1.1.0

Change-Id: I5a095ab6fddfaa9ce687f8627b58ec12176ba660

diff --cc android/cts/master/vk-master.txt
index d286555,2ba273b..0024a6d
mode 100755,100644..100755
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt

diff --cc external/vulkancts/mustpass/1.1.0/src/excluded-tests.txt
index eb9e13b,e7c222b..dc48dd9
--- 1/external/vulkancts/mustpass/1.1.0/src/excluded-tests.txt
--- 2/external/vulkancts/mustpass/1.0.2/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.1.0/src/excluded-tests.txt
@@@ -278,8 -291,53 +278,15 @@@ dEQP-VK.spirv_assembly.instruction.comp
  # New tests from AOSP
  dEQP-VK.texture.explicit_lod.*
  
 -# Exclude tests which are not on the Android CTS mustpass list
 -dEQP-VK.texture.mipmap.2d.projected.*
 -
 -#VK-GL-CTS 526
 -dEQP-VK.pipeline.render_to_image.*.huge.*
 -
 -#VK-GL-CTS 534
 -dEQP-VK.api.copy_and_blit.*.resolve_image.diff_image_size.*
 -
 -#VK-GL-CTS 535
 -dEQP-VK.renderpass.*.multisample.*
 +#VK-GL-CTS 110: Excluded wsi android tests as they require android loader support
 +dEQP-VK.wsi.android.surface.query_devgroup_*
  
 -#VK-GL-CTS 538
 -dEQP-VK.renderpass.*.multisample_resolve.*
 +#VK-GL-CTS 749
 +dEQP-VK.glsl.builtin.precision.atan2.mediump_compute.*
+ 
 -#VK-GL-CTS 542
 -dEQP-VK.pipeline.render_to_image.*.mipmap.*
 -dEQP-VK.api.image_clearing.*.*multiple_layers
 -dEQP-VK.pipeline.render_to_image.*.small.r8g8b8a8_unorm_d16_unorm
 -dEQP-VK.pipeline.render_to_image.*.small.r32_uint_d16_unorm
 -dEQP-VK.pipeline.render_to_image.*.small.r16g16_sint_d16_unorm
 -dEQP-VK.pipeline.render_to_image.*.small.r32g32b32a32_sfloat_d16_unorm
 -dEQP-VK.pipeline.render_to_image.*.small.r8g8b8a8_unorm_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32_uint_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r16g16_sint_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32g32b32a32_sfloat_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r8g8b8a8_unorm_d24_unorm_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32_uint_d24_unorm_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r16g16_sint_d24_unorm_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32g32b32a32_sfloat_d24_unorm_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r8g8b8a8_unorm_d32_sfloat_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32_uint_d32_sfloat_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r16g16_sint_d32_sfloat_s8_uint
 -dEQP-VK.pipeline.render_to_image.*.small.r32g32b32a32_sfloat_d32_sfloat_s8_uint
 -
 -#VK-GL-CTS 655
 -dEQP-VK.glsl.builtin_var.fragdepth.*
 -
 -#VK-GL-CTS 656
 -dEQP-VK.glsl.builtin_var.fragcoord_msaa.*
 -
 -#VK-GL-CTS 657
 -dEQP-VK.memory.requirements.dedicated_allocation.buffer.*
 -dEQP-VK.memory.requirements.dedicated_allocation.image.*
 -
 -# VK-GL-CTS 1273
++#VK-GL-CTS 1273
+ dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_ccw_valid_levels
+ dEQP-VK.tessellation.primitive_discard.triangles_fractional_odd_spacing_cw_valid_levels
+ dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_ccw_valid_levels
+ dEQP-VK.tessellation.primitive_discard.quads_fractional_odd_spacing_cw_valid_levels
++