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

Change-Id: I717b207ec5642fb2f5a7deb9a91e52da7b3c862f

diff --cc android/cts/master/vk-master.txt
Simple merge

diff --cc external/vulkancts/mustpass/1.1.1/src/excluded-tests.txt
index f9b9568,0000000..4f63866
mode 100644,000000..100644
--- 1/external/vulkancts/mustpass/1.1.1/src/excluded-tests.txt
--- /dev/null
+++ b/external/vulkancts/mustpass/1.1.1/src/excluded-tests.txt
@@@ -1,52 -1,0 +1,59 @@@
 +# Issue 218: Excluded built-in function precision tests
 +dEQP-VK.glsl.builtin.precision.clamp.highp_compute.*
 +dEQP-VK.glsl.builtin.precision.cos.mediump_*
 +dEQP-VK.glsl.builtin.precision.div.highp_compute.*
 +dEQP-VK.glsl.builtin.precision.max.highp_compute.*
 +dEQP-VK.glsl.builtin.precision.min.highp_compute.*
 +dEQP-VK.glsl.builtin.precision.mod.highp_compute.*
 +dEQP-VK.glsl.builtin.precision.reflect.highp_compute.vec4
 +dEQP-VK.glsl.builtin.precision.sin.mediump_compute.*
 +dEQP-VK.glsl.builtin.precision.tan.mediump_compute.*
 +
 +# Excluded texture function tests according to the Android GLES3 issue list
 +dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_fragment
 +dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_vertex
 +
 +# Excluded sparse version of the above texture function tests
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_fragment
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_vertex
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_fragment
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_isamplercube_vertex
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_usamplercube_fragment
 +dEQP-VK.glsl.texture_functions.texturegrad.sparse_isampler3d_vertex
 +
 +# Issue 419: Failing sparse tests (Image mismatch)
 +dEQP-VK.glsl.texture_functions.texture.sparse_isampler2d_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_usampler2d_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_isamplercube_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_usamplercube_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_isampler2darray_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_usampler2darray_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_isampler3d_bias_fragment
 +dEQP-VK.glsl.texture_functions.texture.sparse_usampler3d_bias_fragment
 +
 +# Issue 420: Exclude problematic clipping tests
 +dEQP-VK.clipping.clip_volume.clipped.large_points
 +dEQP-VK.clipping.clip_volume.clipped.wide_lines_axis_aligned
 +dEQP-VK.clipping.clip_volume.clipped.wide_lines_diagonal
 +
 +# Issue 431: Excluded copies and blitting tests
 +dEQP-VK.api.copy_and_blit.core.blit_image.simple_tests.scaling_and_offset.b8g8r8a8_unorm_linear
 +
 +# CTS issue 426, spec issue 403
 +dEQP-VK.spirv_assembly.instruction.compute.opfunord.*
 +
 +# New tests from AOSP
 +dEQP-VK.texture.explicit_lod.*
 +
 +#VK-GL-CTS 110: Excluded wsi android tests as they require android loader support
 +dEQP-VK.wsi.android.surface.query_devgroup_*
 +
 +#VK-GL-CTS 749
 +dEQP-VK.glsl.builtin.precision.atan2.mediump_compute.*
++
++#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
++