am 9252e819: Remove tessellation.user_defined_io.per_patch cases from must pass.

* commit '9252e8197ed615959ad594ecc85fa3c1ed8e2f2d':
  Remove tessellation.user_defined_io.per_patch cases from must pass.

diff --combined android/cts/com.drawelements.deqp.gles31.xml
index 6d3ed7e,8e1bf53..ce14aeb
--- 1/android/cts/com.drawelements.deqp.gles31.xml
--- 2/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@@ -769,66 -769,42 +769,66 @@@
  <Test name="vec4_highp_compute" />
  </TestCase>
  <TestCase name="frexp">
 +<Test name="float_lowp_vertex" />
  <Test name="float_lowp_geometry" />
  <Test name="float_lowp_tess_control" />
  <Test name="float_lowp_tess_eval" />
 +<Test name="float_lowp_compute" />
 +<Test name="float_mediump_vertex" />
  <Test name="float_mediump_geometry" />
  <Test name="float_mediump_tess_control" />
  <Test name="float_mediump_tess_eval" />
 +<Test name="float_mediump_compute" />
 +<Test name="float_highp_vertex" />
  <Test name="float_highp_geometry" />
  <Test name="float_highp_tess_control" />
  <Test name="float_highp_tess_eval" />
 +<Test name="float_highp_compute" />
 +<Test name="vec2_lowp_vertex" />
  <Test name="vec2_lowp_geometry" />
  <Test name="vec2_lowp_tess_control" />
  <Test name="vec2_lowp_tess_eval" />
 +<Test name="vec2_lowp_compute" />
 +<Test name="vec2_mediump_vertex" />
  <Test name="vec2_mediump_geometry" />
  <Test name="vec2_mediump_tess_control" />
  <Test name="vec2_mediump_tess_eval" />
 +<Test name="vec2_mediump_compute" />
 +<Test name="vec2_highp_vertex" />
  <Test name="vec2_highp_geometry" />
  <Test name="vec2_highp_tess_control" />
  <Test name="vec2_highp_tess_eval" />
 +<Test name="vec2_highp_compute" />
 +<Test name="vec3_lowp_vertex" />
  <Test name="vec3_lowp_geometry" />
  <Test name="vec3_lowp_tess_control" />
  <Test name="vec3_lowp_tess_eval" />
 +<Test name="vec3_lowp_compute" />
 +<Test name="vec3_mediump_vertex" />
  <Test name="vec3_mediump_geometry" />
  <Test name="vec3_mediump_tess_control" />
  <Test name="vec3_mediump_tess_eval" />
 +<Test name="vec3_mediump_compute" />
 +<Test name="vec3_highp_vertex" />
  <Test name="vec3_highp_geometry" />
  <Test name="vec3_highp_tess_control" />
  <Test name="vec3_highp_tess_eval" />
 +<Test name="vec3_highp_compute" />
 +<Test name="vec4_lowp_vertex" />
  <Test name="vec4_lowp_geometry" />
  <Test name="vec4_lowp_tess_control" />
  <Test name="vec4_lowp_tess_eval" />
 +<Test name="vec4_lowp_compute" />
 +<Test name="vec4_mediump_vertex" />
  <Test name="vec4_mediump_geometry" />
  <Test name="vec4_mediump_tess_control" />
  <Test name="vec4_mediump_tess_eval" />
 +<Test name="vec4_mediump_compute" />
 +<Test name="vec4_highp_vertex" />
  <Test name="vec4_highp_geometry" />
  <Test name="vec4_highp_tess_control" />
  <Test name="vec4_highp_tess_eval" />
 +<Test name="vec4_highp_compute" />
  </TestCase>
  <TestCase name="ldexp">
  <Test name="float_lowp_vertex" />
@@@ -3061,27 -3037,15 +3061,27 @@@
  <TestSuite name="frexp">
  <TestCase name="lowp_vertex">
  <Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
  </TestCase>
  <TestCase name="lowp_compute">
  <Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
  </TestCase>
  <TestCase name="mediump_vertex">
  <Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
  </TestCase>
  <TestCase name="mediump_compute">
  <Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
  </TestCase>
  </TestSuite>
  <TestSuite name="ldexp">
@@@ -3103,42 -3067,6 +3103,42 @@@
  <Test name="vec3" />
  <Test name="vec4" />
  </TestCase>
 +<TestCase name="mediump_vertex">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
 +<TestCase name="mediump_fragment">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
 +<TestCase name="mediump_compute">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
 +<TestCase name="highp_vertex">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
 +<TestCase name="highp_fragment">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
 +<TestCase name="highp_compute">
 +<Test name="scalar" />
 +<Test name="vec2" />
 +<Test name="vec3" />
 +<Test name="vec4" />
 +</TestCase>
  </TestSuite>
  <TestSuite name="fma">
  <TestCase name="lowp_vertex">
@@@ -3603,18 -3531,15 +3603,18 @@@
  </TestCase>
  <TestCase name="fragment">
  <Test name="sampler2d" />
 +<Test name="samplercube" />
  <Test name="sampler2darray" />
  <Test name="sampler3d" />
  <Test name="sampler2dshadow" />
  <Test name="samplercubeshadow" />
  <Test name="sampler2darrayshadow" />
  <Test name="isampler2d" />
 +<Test name="isamplercube" />
  <Test name="isampler2darray" />
  <Test name="isampler3d" />
  <Test name="usampler2d" />
 +<Test name="usamplercube" />
  <Test name="usampler2darray" />
  <Test name="usampler3d" />
  </TestCase>
@@@ -5560,15 -5485,12 +5560,15 @@@
  <Test name="ssbo_cmd_barrier_single" />
  <Test name="ssbo_cmd_barrier_multiple" />
  <Test name="shared_var_single_invocation" />
 +<Test name="shared_var_single_group" />
  <Test name="shared_var_multiple_invocations" />
  <Test name="shared_var_multiple_groups" />
  <Test name="shared_atomic_op_single_invocation" />
 +<Test name="shared_atomic_op_single_group" />
  <Test name="shared_atomic_op_multiple_invocations" />
  <Test name="shared_atomic_op_multiple_groups" />
  <Test name="copy_image_to_ssbo_small" />
 +<Test name="copy_ssbo_to_image_small" />
  <Test name="image_atomic_op_local_size_1" />
  <Test name="image_atomic_op_local_size_8" />
  <Test name="image_barrier_single" />
@@@ -5673,66 -5595,34 +5673,66 @@@
  </TestCase>
  <TestSuite name="atomic">
  <TestCase name="add">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="min">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="max">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="and">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="or">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="xor">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="exchange">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
  <TestCase name="compswap">
 +<Test name="lowp_uint" />
 +<Test name="lowp_int" />
 +<Test name="mediump_uint" />
 +<Test name="mediump_int" />
  <Test name="highp_uint" />
  <Test name="highp_int" />
  </TestCase>
@@@ -5752,7 -5642,6 +5752,7 @@@
  </TestCase>
  <TestCase name="gen_in_compute">
  <Test name="single_invocation" />
 +<Test name="multiple_groups" />
  <Test name="multiple_groups_multiple_invocations" />
  <Test name="small_offset" />
  <Test name="empty_command" />
@@@ -5904,26 -5793,18 +5904,26 @@@
  <Test name="drawarrays_separate_grid_100x100_drawcount_1" />
  <Test name="drawarrays_separate_grid_200x200_drawcount_1" />
  <Test name="drawarrays_separate_grid_500x500_drawcount_1" />
 +<Test name="drawarrays_separate_grid_1200x1200_drawcount_1" />
 +<Test name="drawarrays_separate_grid_1500x1500_drawcount_1" />
  <Test name="drawarrays_separate_grid_100x100_drawcount_8" />
  <Test name="drawarrays_separate_grid_200x200_drawcount_8" />
  <Test name="drawarrays_separate_grid_500x500_drawcount_8" />
 +<Test name="drawarrays_separate_grid_1200x1200_drawcount_8" />
 +<Test name="drawarrays_separate_grid_1500x1500_drawcount_8" />
  <Test name="drawarrays_separate_grid_100x100_drawcount_200" />
  <Test name="drawarrays_separate_grid_200x200_drawcount_800" />
  <Test name="drawarrays_separate_grid_500x500_drawcount_2500" />
  <Test name="drawarrays_combined_grid_100x100_drawcount_1" />
  <Test name="drawarrays_combined_grid_200x200_drawcount_1" />
  <Test name="drawarrays_combined_grid_500x500_drawcount_1" />
 +<Test name="drawarrays_combined_grid_1200x1200_drawcount_1" />
 +<Test name="drawarrays_combined_grid_1500x1500_drawcount_1" />
  <Test name="drawarrays_combined_grid_100x100_drawcount_8" />
  <Test name="drawarrays_combined_grid_200x200_drawcount_8" />
  <Test name="drawarrays_combined_grid_500x500_drawcount_8" />
 +<Test name="drawarrays_combined_grid_1200x1200_drawcount_8" />
 +<Test name="drawarrays_combined_grid_1500x1500_drawcount_8" />
  <Test name="drawarrays_combined_grid_100x100_drawcount_200" />
  <Test name="drawarrays_combined_grid_200x200_drawcount_800" />
  <Test name="drawarrays_combined_grid_500x500_drawcount_2500" />
@@@ -6332,23 -6213,6 +6332,6 @@@
  </TestCase>
  </TestSuite>
  <TestSuite name="user_defined_io">
- <TestSuite name="per_patch">
- <TestCase name="vertex_io_array_size_implicit">
- <Test name="triangles" />
- <Test name="quads" />
- <Test name="isolines" />
- </TestCase>
- <TestCase name="vertex_io_array_size_shader_builtin">
- <Test name="triangles" />
- <Test name="quads" />
- <Test name="isolines" />
- </TestCase>
- <TestCase name="vertex_io_array_size_query">
- <Test name="triangles" />
- <Test name="quads" />
- <Test name="isolines" />
- </TestCase>
- </TestSuite>
  <TestSuite name="per_vertex_block">
  <TestCase name="vertex_io_array_size_implicit">
  <Test name="triangles" />
@@@ -8445,6 -8309,7 +8428,6 @@@
  <Test name="17" />
  <Test name="18" />
  <Test name="19" />
 -<Test name="20" />
  <Test name="21" />
  <Test name="22" />
  <Test name="23" />
@@@ -9380,7 -9245,6 +9363,7 @@@
  <Test name="10" />
  <Test name="11" />
  <Test name="12" />
 +<Test name="13" />
  <Test name="14" />
  <Test name="15" />
  <Test name="16" />
@@@ -9395,7 -9259,6 +9378,7 @@@
  <Test name="26" />
  <Test name="27" />
  <Test name="28" />
 +<Test name="29" />
  <Test name="30" />
  <Test name="31" />
  <Test name="32" />
@@@ -9537,12 -9400,6 +9520,12 @@@
  <Test name="comp_swap_r32i_result" />
  </TestCase>
  <TestCase name="qualifiers">
 +<Test name="coherent_r32f" />
 +<Test name="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
@@@ -9590,13 -9447,11 +9573,13 @@@
  <Test name="r32i_rgba8_snorm" />
  <Test name="rgba8_r32f" />
  <Test name="rgba8_rgba8ui" />
 +<Test name="rgba8_r32ui" />
  <Test name="rgba8_rgba8i" />
  <Test name="rgba8_r32i" />
  <Test name="rgba8_rgba8_snorm" />
  <Test name="rgba8_snorm_r32f" />
  <Test name="rgba8_snorm_rgba8ui" />
 +<Test name="rgba8_snorm_r32ui" />
  <Test name="rgba8_snorm_rgba8i" />
  <Test name="rgba8_snorm_r32i" />
  <Test name="rgba8_snorm_rgba8" />
@@@ -9761,13 -9616,11 +9744,13 @@@
  <Test name="r32i_rgba8_snorm" />
  <Test name="rgba8_r32f" />
  <Test name="rgba8_rgba8ui" />
 +<Test name="rgba8_r32ui" />
  <Test name="rgba8_rgba8i" />
  <Test name="rgba8_r32i" />
  <Test name="rgba8_rgba8_snorm" />
  <Test name="rgba8_snorm_r32f" />
  <Test name="rgba8_snorm_rgba8ui" />
 +<Test name="rgba8_snorm_r32ui" />
  <Test name="rgba8_snorm_rgba8i" />
  <Test name="rgba8_snorm_r32i" />
  <Test name="rgba8_snorm_rgba8" />
@@@ -9879,12 -9732,6 +9862,12 @@@
  <Test name="comp_swap_r32i_result" />
  </TestCase>
  <TestCase name="qualifiers">
 +<Test name="coherent_r32f" />
 +<Test name="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
@@@ -9932,13 -9779,11 +9915,13 @@@
  <Test name="r32i_rgba8_snorm" />
  <Test name="rgba8_r32f" />
  <Test name="rgba8_rgba8ui" />
 +<Test name="rgba8_r32ui" />
  <Test name="rgba8_rgba8i" />
  <Test name="rgba8_r32i" />
  <Test name="rgba8_rgba8_snorm" />
  <Test name="rgba8_snorm_r32f" />
  <Test name="rgba8_snorm_rgba8ui" />
 +<Test name="rgba8_snorm_r32ui" />
  <Test name="rgba8_snorm_rgba8i" />
  <Test name="rgba8_snorm_r32i" />
  <Test name="rgba8_snorm_rgba8" />
@@@ -10050,12 -9895,6 +10033,12 @@@
  <Test name="comp_swap_r32i_result" />
  </TestCase>
  <TestCase name="qualifiers">
 +<Test name="coherent_r32f" />
 +<Test name="volatile_r32f" />
 +<Test name="coherent_r32ui" />
 +<Test name="volatile_r32ui" />
 +<Test name="coherent_r32i" />
 +<Test name="volatile_r32i" />
  <Test name="restrict" />
  </TestCase>
  <TestCase name="format_reinterpret">
@@@ -10103,13 -9942,11 +10086,13 @@@
  <Test name="r32i_rgba8_snorm" />
  <Test name="rgba8_r32f" />
  <Test name="rgba8_rgba8ui" />
 +<Test name="rgba8_r32ui" />
  <Test name="rgba8_rgba8i" />
  <Test name="rgba8_r32i" />
  <Test name="rgba8_rgba8_snorm" />
  <Test name="rgba8_snorm_r32f" />
  <Test name="rgba8_snorm_rgba8ui" />
 +<Test name="rgba8_snorm_r32ui" />
  <Test name="rgba8_snorm_rgba8i" />
  <Test name="rgba8_snorm_r32i" />
  <Test name="rgba8_snorm_rgba8" />
@@@ -10599,9 -10436,6 +10582,9 @@@
  </TestSuite>
  <TestSuite name="stencil_texturing">
  <TestCase name="format">
 +<Test name="depth32f_stencil8_2d" />
 +<Test name="depth32f_stencil8_2d_array" />
 +<Test name="depth32f_stencil8_cube" />
  <Test name="depth24_stencil8_2d" />
  <Test name="depth24_stencil8_2d_array" />
  <Test name="depth24_stencil8_cube" />
@@@ -11459,13 -11293,9 +11442,13 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11476,10 -11306,6 +11459,10 @@@
  </TestCase>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -11492,13 -11318,9 +11475,13 @@@
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11507,9 -11329,6 +11490,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11518,13 -11337,9 +11501,13 @@@
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11533,9 -11348,6 +11516,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11545,31 -11357,21 +11528,31 @@@
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -11581,13 -11383,9 +11564,13 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11598,10 -11396,6 +11581,10 @@@
  </TestCase>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -11614,13 -11408,9 +11597,13 @@@
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11629,9 -11419,6 +11612,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11640,13 -11427,9 +11623,13 @@@
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -11655,9 -11438,6 +11638,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11667,33 -11447,21 +11650,33 @@@
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -11734,10 -11502,6 +11717,10 @@@
  </TestCase>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -11774,9 -11538,6 +11757,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11812,9 -11573,6 +11795,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -11856,62 -11614,42 +11839,62 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="depth32f">
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  </TestSuite>
@@@ -11920,62 -11658,42 +11903,62 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="depth32f">
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  </TestSuite>
@@@ -11986,13 -11704,9 +11969,13 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12003,10 -11717,6 +11986,10 @@@
  </TestCase>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -12019,13 -11729,9 +12002,13 @@@
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12034,9 -11740,6 +12017,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -12045,13 -11748,9 +12028,13 @@@
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12060,9 -11759,6 +12043,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -12072,33 -11768,21 +12055,33 @@@
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -12110,13 -11794,9 +12093,13 @@@
  <TestSuite name="rgba8">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12127,10 -11807,6 +12110,10 @@@
  </TestCase>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -12143,13 -11819,9 +12126,13 @@@
  <TestSuite name="rgba8ui">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12158,9 -11830,6 +12141,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -12169,13 -11838,9 +12152,13 @@@
  <TestSuite name="rgba8i">
  <TestCase name="size_pot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="size_npot">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="texture_swizzle">
  <Test name="green_blue_alpha_zero" />
@@@ -12184,9 -11849,6 +12167,9 @@@
  <Test name="zero_one_red_green" />
  <Test name="one_red_green_blue" />
  </TestCase>
 +<TestCase name="filter_mode">
 +<Test name="min_nearest_mipmap_nearest_mag_nearest" />
 +</TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
  <Test name="level_2" />
@@@ -12196,33 -11858,21 +12179,33 @@@
  <TestSuite name="size_pot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestSuite name="size_npot">
  <TestCase name="compare_less">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  <TestCase name="compare_greater">
  <Test name="clamp_to_edge_repeat" />
 +<Test name="repeat_mirrored_repeat" />
 +<Test name="mirrored_repeat_clamp_to_edge" />
  </TestCase>
  </TestSuite>
  <TestCase name="filter_mode">
  <Test name="min_linear_mag_linear" />
 +<Test name="min_nearest_mipmap_nearest_mag_linear" />
 +<Test name="min_nearest_mipmap_linear_mag_linear" />
 +<Test name="min_linear_mipmap_nearest_mag_linear" />
 +<Test name="min_linear_mipmap_linear_mag_linear" />
  </TestCase>
  <TestCase name="base_level">
  <Test name="level_1" />
@@@ -15165,7 -14815,6 +15148,7 @@@
  <Test name="darken" />
  <Test name="lighten" />
  <Test name="colordodge" />
 +<Test name="colorburn" />
  <Test name="hardlight" />
  <Test name="difference" />
  <Test name="exclusion" />
@@@ -15201,10 -14850,7 +15184,10 @@@
  <Test name="hardlight" />
  <Test name="difference" />
  <Test name="exclusion" />
 +<Test name="hsl_hue" />
 +<Test name="hsl_saturation" />
  <Test name="hsl_color" />
 +<Test name="hsl_luminosity" />
  </TestCase>
  <TestCase name="coherent">
  <Test name="multiply" />
@@@ -15279,155 -14925,63 +15262,155 @@@
  </TestCase>
  <TestCase name="interface">
  <Test name="same_name_vertex_smooth_fragment_smooth" />
 +<Test name="same_name_vertex_smooth_fragment_centroid" />
 +<Test name="same_name_vertex_smooth" />
  <Test name="same_name_vertex_flat_fragment_flat" />
 +<Test name="same_name_vertex_centroid_fragment_smooth" />
  <Test name="same_name_vertex_centroid_fragment_centroid" />
 +<Test name="same_name_vertex_centroid" />
  <Test name="same_name_fragment_smooth" />
 +<Test name="same_name_fragment_centroid" />
  <Test name="same_name" />
  <Test name="same_location_vertex_smooth_fragment_smooth" />
 +<Test name="same_location_vertex_smooth_fragment_centroid" />
 +<Test name="same_location_vertex_smooth" />
  <Test name="same_location_vertex_flat_fragment_flat" />
 +<Test name="same_location_vertex_centroid_fragment_smooth" />
  <Test name="same_location_vertex_centroid_fragment_centroid" />
 +<Test name="same_location_vertex_centroid" />
 +<Test name="same_location_fragment_smooth" />
 +<Test name="same_location_fragment_centroid" />
 +<Test name="same_location" />
  </TestCase>
  <TestCase name="random">
 +<Test name="0" />
 +<Test name="1" />
 +<Test name="2" />
 +<Test name="3" />
  <Test name="4" />
  <Test name="5" />
 +<Test name="6" />
  <Test name="7" />
 +<Test name="8" />
  <Test name="9" />
  <Test name="10" />
 +<Test name="11" />
 +<Test name="12" />
 +<Test name="13" />
 +<Test name="14" />
  <Test name="15" />
 +<Test name="16" />
 +<Test name="17" />
 +<Test name="18" />
  <Test name="19" />
  <Test name="20" />
 +<Test name="21" />
 +<Test name="22" />
 +<Test name="23" />
 +<Test name="24" />
 +<Test name="25" />
  <Test name="26" />
  <Test name="27" />
 +<Test name="28" />
  <Test name="29" />
 +<Test name="30" />
  <Test name="31" />
 +<Test name="32" />
  <Test name="33" />
  <Test name="34" />
 +<Test name="35" />
  <Test name="36" />
 +<Test name="37" />
 +<Test name="38" />
 +<Test name="39" />
  <Test name="40" />
  <Test name="41" />
  <Test name="42" />
  <Test name="43" />
  <Test name="44" />
 +<Test name="45" />
  <Test name="46" />
  <Test name="47" />
  <Test name="48" />
 +<Test name="49" />
 +<Test name="50" />
 +<Test name="51" />
 +<Test name="52" />
  <Test name="53" />
 +<Test name="54" />
  <Test name="55" />
 +<Test name="56" />
  <Test name="57" />
 +<Test name="58" />
 +<Test name="59" />
 +<Test name="60" />
 +<Test name="61" />
 +<Test name="62" />
 +<Test name="63" />
 +<Test name="64" />
 +<Test name="65" />
  <Test name="66" />
 +<Test name="67" />
 +<Test name="68" />
 +<Test name="69" />
 +<Test name="70" />
 +<Test name="71" />
  <Test name="72" />
 +<Test name="73" />
  <Test name="74" />
  <Test name="75" />
  <Test name="76" />
 +<Test name="77" />
 +<Test name="78" />
 +<Test name="79" />
 +<Test name="80" />
 +<Test name="81" />
 +<Test name="82" />
 +<Test name="83" />
  <Test name="84" />
  <Test name="85" />
 +<Test name="86" />
  <Test name="87" />
 +<Test name="88" />
 +<Test name="89" />
 +<Test name="90" />
 +<Test name="91" />
  <Test name="92" />
  <Test name="93" />
  <Test name="94" />
 +<Test name="95" />
 +<Test name="96" />
 +<Test name="97" />
  <Test name="98" />
 +<Test name="99" />
 +<Test name="100" />
  <Test name="101" />
 +<Test name="102" />
 +<Test name="103" />
 +<Test name="104" />
  <Test name="105" />
 +<Test name="106" />
 +<Test name="107" />
 +<Test name="108" />
  <Test name="109" />
  <Test name="110" />
 +<Test name="111" />
 +<Test name="112" />
 +<Test name="113" />
 +<Test name="114" />
 +<Test name="115" />
  <Test name="116" />
  <Test name="117" />
 +<Test name="118" />
  <Test name="119" />
  <Test name="120" />
 +<Test name="121" />
 +<Test name="122" />
  <Test name="123" />
 +<Test name="124" />
  <Test name="125" />
 +<Test name="126" />
 +<Test name="127" />
  </TestCase>
  <TestCase name="api">
  <Test name="current_program_priority" />
@@@ -15444,14 -14998,11 +15427,14 @@@
  <Test name="mismatch_explicit_location_type" />
  <Test name="mismatch_explicit_location_precision" />
  <Test name="mismatch_explicit_location" />
 +<Test name="mismatch_implicit_explicit_location_1" />
  <Test name="mismatch_implicit_explicit_location_2" />
  <Test name="mismatch_implicit_explicit_location_3" />
  <Test name="match_different_struct_names" />
 +<Test name="mismatch_struct_member_name" />
  <Test name="mismatch_struct_member_type" />
  <Test name="mismatch_struct_member_precision" />
 +<Test name="mismatch_struct_member_order" />
  <Test name="mismatch_array_element_type" />
  <Test name="mismatch_array_length" />
  <Test name="mismatch_array_precision" />
@@@ -15901,7 -15452,6 +15884,7 @@@
  <Test name="draw_buffers" />
  <Test name="flush_mapped_buffer_range" />
  <Test name="map_buffer_range" />
 +<Test name="read_buffer" />
  <Test name="unmap_buffer" />
  <Test name="bind_framebuffer" />
  <Test name="bind_renderbuffer" />
@@@ -16174,7 -15724,6 +16157,7 @@@
  <Test name="get_buffer_parameteriv" />
  <Test name="get_buffer_parameteri64v" />
  <Test name="get_buffer_pointerv" />
 +<Test name="get_framebuffer_attachment_parameteriv" />
  <Test name="get_renderbuffer_parameteriv" />
  <Test name="get_internalformativ" />
  <Test name="get_queryiv" />
@@@ -16206,7 -15755,6 +16189,7 @@@
  <Test name="draw_buffers" />
  <Test name="flush_mapped_buffer_range" />
  <Test name="map_buffer_range" />
 +<Test name="read_buffer" />
  <Test name="unmap_buffer" />
  <Test name="bind_framebuffer" />
  <Test name="bind_renderbuffer" />
@@@ -16479,7 -16027,6 +16462,7 @@@
  <Test name="get_buffer_parameteriv" />
  <Test name="get_buffer_parameteri64v" />
  <Test name="get_buffer_pointerv" />
 +<Test name="get_framebuffer_attachment_parameteriv" />
  <Test name="get_renderbuffer_parameteriv" />
  <Test name="get_internalformativ" />
  <Test name="get_queryiv" />
@@@ -16797,6 -16344,9 +16780,6 @@@
  <Test name="case_29" />
  <Test name="case_30" />
  </TestCase>
 -<TestCase name="error_groups">
 -<Test name="case_4" />
 -</TestCase>
  <TestCase name="async">
  <Test name="case_0_log" />
  <Test name="case_1_callback" />
@@@ -16869,72 -16419,8 +16852,72 @@@
  </TestCase>
  </TestSuite>
  <TestSuite name="no_attachments">
 +<TestCase name="size">
 +<Test name="16x16" />
 +<Test name="16x64" />
 +<Test name="16x256" />
 +<Test name="16x1024" />
 +<Test name="64x16" />
 +<Test name="64x64" />
 +<Test name="64x256" />
 +<Test name="64x1024" />
 +<Test name="256x16" />
 +<Test name="256x64" />
 +<Test name="256x256" />
 +<Test name="256x1024" />
 +<Test name="1024x16" />
 +<Test name="1024x64" />
 +<Test name="1024x256" />
 +<Test name="1024x1024" />
 +</TestCase>
  <TestCase name="npot_size">
  <Test name="1x1" />
 +<Test name="3x3" />
 +<Test name="15x15" />
 +<Test name="17x17" />
 +<Test name="31x31" />
 +<Test name="33x33" />
 +<Test name="63x63" />
 +<Test name="65x65" />
 +<Test name="127x127" />
 +<Test name="129x129" />
 +<Test name="255x255" />
 +<Test name="257x257" />
 +<Test name="511x511" />
 +<Test name="513x513" />
 +<Test name="1023x1023" />
 +<Test name="1025x1025" />
 +<Test name="2047x2047" />
 +<Test name="15x511" />
 +<Test name="127x15" />
 +<Test name="129x127" />
 +<Test name="511x127" />
 +<Test name="2047x1025" />
 +</TestCase>
 +<TestCase name="multisample">
 +<Test name="samples0" />
 +<Test name="samples1" />
 +<Test name="samples2" />
 +<Test name="samples3" />
 +<Test name="samples4" />
 +</TestCase>
 +<TestCase name="random">
 +<Test name="0" />
 +<Test name="1" />
 +<Test name="2" />
 +<Test name="3" />
 +<Test name="4" />
 +<Test name="5" />
 +<Test name="6" />
 +<Test name="7" />
 +<Test name="8" />
 +<Test name="9" />
 +<Test name="10" />
 +<Test name="11" />
 +<Test name="12" />
 +<Test name="13" />
 +<Test name="14" />
 +<Test name="15" />
  </TestCase>
  <TestCase name="interaction">
  <Test name="256x256ms0_default_128x128ms1" />
@@@ -16946,12 -16432,6 +16929,12 @@@
  <Test name="2048x2048ms4_default_1x1ms0" />
  <Test name="1x1ms0_default_2048x2048ms4" />
  </TestCase>
 +<TestCase name="maximums">
 +<Test name="width" />
 +<Test name="height" />
 +<Test name="size" />
 +<Test name="samples" />
 +</TestCase>
  </TestSuite>
  <TestCase name="completeness">
  <Test name="no_attachments" />
@@@ -16959,7 -16439,6 +16942,7 @@@
  </TestSuite>
  <TestSuite name="program_interface_query">
  <TestCase name="buffer_limited_query">
 +<Test name="resource_name_query" />
  <Test name="resource_query" />
  </TestCase>
  <TestSuite name="uniform">
@@@ -17114,15 -16593,6 +17097,15 @@@
  <Test name="mat3" />
  <Test name="mat4x2" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
  <Test name="image_2d" />
  <Test name="iimage_2d_array" />
  <Test name="uimage_2d" />
@@@ -17217,23 -16687,9 +17200,23 @@@
  <Test name="mat3" />
  <Test name="mat4x2" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="image_2d" />
 +<Test name="iimage_2d_array" />
 +<Test name="uimage_2d" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="aggregates">
 +<Test name="sampler2D_struct" />
 +<Test name="sampler2D_array" />
  <Test name="atomic_uint_array" />
  <Test name="float_struct" />
  <Test name="float_struct_struct" />
@@@ -17392,24 -16848,6 +17375,24 @@@
  <Test name="mat4" />
  </TestCase>
  <TestCase name="opaque_type">
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="sampler_cube_shadow" />
 +<Test name="sampler_2d_array_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="isampler_cube" />
 +<Test name="isampler_2d_array" />
 +<Test name="isampler_3d" />
 +<Test name="usampler_2d" />
 +<Test name="usampler_cube" />
 +<Test name="usampler_2d_array" />
 +<Test name="usampler_3d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="usampler_2d_ms" />
  <Test name="image_2d" />
  <Test name="image_cube" />
  <Test name="image_2d_array" />
@@@ -17426,7 -16864,6 +17409,7 @@@
  </TestCase>
  <TestCase name="array">
  <Test name="var_array" />
 +<Test name="var_array_array" />
  </TestCase>
  </TestSuite>
  <TestCase name="named_block">
@@@ -17474,36 -16911,6 +17457,36 @@@
  <Test name="mat4" />
  </TestCase>
  <TestCase name="opaque_type">
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="sampler_cube_shadow" />
 +<Test name="sampler_2d_array_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="isampler_cube" />
 +<Test name="isampler_2d_array" />
 +<Test name="isampler_3d" />
 +<Test name="usampler_2d" />
 +<Test name="usampler_cube" />
 +<Test name="usampler_2d_array" />
 +<Test name="usampler_3d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="usampler_2d_ms" />
 +<Test name="image_2d" />
 +<Test name="image_cube" />
 +<Test name="image_2d_array" />
 +<Test name="image_3d" />
 +<Test name="iimage_2d" />
 +<Test name="iimage_cube" />
 +<Test name="iimage_2d_array" />
 +<Test name="iimage_3d" />
 +<Test name="uimage_2d" />
 +<Test name="uimage_cube" />
 +<Test name="uimage_2d_array" />
 +<Test name="uimage_3d" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestSuite name="array">
@@@ -17524,18 -16931,6 +17507,18 @@@
  <Test name="mat4" />
  </TestCase>
  <TestCase name="opaque_type">
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="image_2d" />
 +<Test name="iimage_2d_array" />
 +<Test name="uimage_2d" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="array">
@@@ -17545,12 -16940,6 +17528,12 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
 +<Test name="image_2d" />
 +<Test name="iimage_2d_array" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="struct">
@@@ -17560,10 -16949,6 +17543,10 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
  </TestCase>
  </TestSuite>
  <TestSuite name="struct">
@@@ -17583,17 -16968,6 +17566,17 @@@
  <Test name="mat4x2" />
  <Test name="mat4" />
  </TestCase>
 +<TestCase name="opaque_type">
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +</TestCase>
  <TestCase name="array">
  <Test name="float" />
  <Test name="int" />
@@@ -17601,10 -16975,6 +17584,10 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
  </TestCase>
  <TestCase name="struct">
  <Test name="float" />
@@@ -17613,10 -16983,6 +17596,10 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
  </TestCase>
  </TestSuite>
  </TestSuite>
@@@ -17653,15 -17019,6 +17636,15 @@@
  <Test name="mat3x4" />
  <Test name="mat4x3" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
  <Test name="image_2d" />
  <Test name="iimage_2d_array" />
  <Test name="uimage_2d" />
@@@ -17699,7 -17056,6 +17682,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17711,12 -17067,10 +17694,12 @@@
  <TestCase name="no_qualifier">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17733,7 -17087,6 +17716,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17750,7 -17103,6 +17733,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17762,12 -17114,10 +17745,12 @@@
  <TestCase name="no_qualifier">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17784,7 -17134,6 +17767,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17809,19 -17158,9 +17792,19 @@@
  <Test name="mat3x4" />
  <Test name="mat4x3" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="usampler_2d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
  <Test name="image_2d" />
  <Test name="iimage_2d_array" />
  <Test name="uimage_2d" />
 +<Test name="atomic_uint" />
  </TestCase>
  <TestCase name="aggregates">
  <Test name="var" />
@@@ -17864,7 -17203,6 +17847,7 @@@
  <TestCase name="aggregates">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  </TestSuite>
  <TestSuite name="column_major">
@@@ -17887,12 -17225,10 +17870,12 @@@
  <TestCase name="no_qualifier">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17909,7 -17245,6 +17892,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17926,7 -17261,6 +17909,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17938,12 -17272,10 +17921,12 @@@
  <TestCase name="no_qualifier">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -17960,7 -17292,6 +17943,7 @@@
  <TestCase name="row_major">
  <Test name="var" />
  <Test name="var_struct" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="column_major">
  <Test name="var" />
@@@ -18027,36 -17358,6 +18010,36 @@@
  <Test name="mat4x2" />
  <Test name="mat4x3" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="sampler_cube_shadow" />
 +<Test name="sampler_2d_array_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="isampler_cube" />
 +<Test name="isampler_2d_array" />
 +<Test name="isampler_3d" />
 +<Test name="usampler_2d" />
 +<Test name="usampler_cube" />
 +<Test name="usampler_2d_array" />
 +<Test name="usampler_3d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="usampler_2d_ms" />
 +<Test name="image_2d" />
 +<Test name="image_cube" />
 +<Test name="image_2d_array" />
 +<Test name="image_3d" />
 +<Test name="iimage_2d" />
 +<Test name="iimage_cube" />
 +<Test name="iimage_2d_array" />
 +<Test name="iimage_3d" />
 +<Test name="uimage_2d" />
 +<Test name="uimage_cube" />
 +<Test name="uimage_2d_array" />
 +<Test name="uimage_3d" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="aggregates">
@@@ -18157,9 -17458,6 +18140,9 @@@
  <Test name="float" />
  <Test name="float_array" />
  <Test name="float_struct" />
 +<Test name="sampler" />
 +<Test name="sampler_array" />
 +<Test name="sampler_struct" />
  <Test name="atomic_uint" />
  <Test name="atomic_uint_array" />
  <Test name="float_array_struct" />
@@@ -18292,8 -17590,6 +18275,8 @@@
  <Test name="sampler" />
  <Test name="sampler_array" />
  <Test name="sampler_struct" />
 +<Test name="atomic_uint" />
 +<Test name="atomic_uint_array" />
  </TestCase>
  <TestCase name="uniform_block">
  <Test name="float" />
@@@ -18319,8 -17615,6 +18302,8 @@@
  <Test name="sampler" />
  <Test name="sampler_array" />
  <Test name="sampler_struct" />
 +<Test name="atomic_uint" />
 +<Test name="atomic_uint_array" />
  </TestCase>
  <TestCase name="uniform_block">
  <Test name="float" />
@@@ -18367,36 -17661,6 +18350,36 @@@
  <Test name="mat4x2" />
  <Test name="mat4x3" />
  <Test name="mat4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_cube" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="sampler_2d_shadow" />
 +<Test name="sampler_cube_shadow" />
 +<Test name="sampler_2d_array_shadow" />
 +<Test name="isampler_2d" />
 +<Test name="isampler_cube" />
 +<Test name="isampler_2d_array" />
 +<Test name="isampler_3d" />
 +<Test name="usampler_2d" />
 +<Test name="usampler_cube" />
 +<Test name="usampler_2d_array" />
 +<Test name="usampler_3d" />
 +<Test name="sampler_2d_ms" />
 +<Test name="isampler_2d_ms" />
 +<Test name="usampler_2d_ms" />
 +<Test name="image_2d" />
 +<Test name="image_cube" />
 +<Test name="image_2d_array" />
 +<Test name="image_3d" />
 +<Test name="iimage_2d" />
 +<Test name="iimage_cube" />
 +<Test name="iimage_2d_array" />
 +<Test name="iimage_3d" />
 +<Test name="uimage_2d" />
 +<Test name="uimage_cube" />
 +<Test name="uimage_2d_array" />
 +<Test name="uimage_3d" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="array">
@@@ -18406,12 -17670,6 +18389,12 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
 +<Test name="image_2d" />
 +<Test name="iimage_2d_array" />
  <Test name="atomic_uint" />
  </TestCase>
  <TestCase name="struct">
@@@ -18421,10 -17679,6 +18404,10 @@@
  <Test name="bool" />
  <Test name="vec3" />
  <Test name="vec4" />
 +<Test name="sampler_2d" />
 +<Test name="sampler_2d_array" />
 +<Test name="sampler_3d" />
 +<Test name="isampler_2d" />
  </TestCase>
  </TestSuite>
  <TestSuite name="named_block">
@@@ -18527,20 -17781,16 +18510,20 @@@
  </TestSuite>
  <TestCase name="random">
  <Test name="0" />
 +<Test name="1" />
  <Test name="2" />
  <Test name="3" />
  <Test name="4" />
  <Test name="5" />
  <Test name="6" />
 +<Test name="7" />
 +<Test name="8" />
  <Test name="9" />
  <Test name="10" />
  <Test name="11" />
  <Test name="12" />
  <Test name="13" />
 +<Test name="14" />
  <Test name="15" />
  <Test name="16" />
  <Test name="17" />
@@@ -18559,9 -17809,7 +18542,9 @@@
  <Test name="30" />
  <Test name="31" />
  <Test name="32" />
 +<Test name="33" />
  <Test name="34" />
 +<Test name="35" />
  <Test name="36" />
  <Test name="37" />
  <Test name="38" />
@@@ -18641,8 -17889,6 +18624,8 @@@
  <Test name="referenced_by_separable_vertex" />
  <Test name="referenced_by_separable_fragment" />
  <Test name="referenced_by_vertex_fragment" />
 +<Test name="referenced_by_vertex_fragment_only_fragment" />
 +<Test name="referenced_by_vertex_fragment_only_vertex" />
  </TestCase>
  <TestSuite name="program_input">
  <TestSuite name="resource_list">
@@@ -18683,11 -17929,6 +18666,11 @@@
  <Test name="var" />
  <Test name="var_explicit_location" />
  </TestCase>
 +<TestCase name="separable_fragment">
 +<Test name="var_explicit_location" />
 +<Test name="var_struct_explicit_location" />
 +<Test name="var_array_explicit_location" />
 +</TestCase>
  </TestSuite>
  <TestSuite name="name_length">
  <TestCase name="vertex_fragment">
@@@ -18832,7 -18073,6 +18815,7 @@@
  <TestCase name="vertex_fragment">
  <Test name="empty" />
  <Test name="var" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="separable_vertex">
  <Test name="empty" />
@@@ -18843,7 -18083,6 +18826,7 @@@
  <TestCase name="separable_fragment">
  <Test name="empty" />
  <Test name="var" />
 +<Test name="var_array" />
  </TestCase>
  <TestCase name="compute">
  <Test name="empty" />
@@@ -18867,20 -18106,11 +18850,20 @@@
  <TestSuite name="location">
  <TestCase name="vertex_fragment">
  <Test name="var" />
 +<Test name="var_explicit_location" />
  <Test name="var_array" />
 +<Test name="var_array_explicit_location" />
 +</TestCase>
 +<TestCase name="separable_vertex">
 +<Test name="var_explicit_location" />
 +<Test name="var_struct_explicit_location" />
 +<Test name="var_array_explicit_location" />
  </TestCase>
  <TestCase name="separable_fragment">
  <Test name="var" />
 +<Test name="var_explicit_location" />
  <Test name="var_array" />
 +<Test name="var_array_explicit_location" />
  </TestCase>
  </TestSuite>
  <TestSuite name="name_length">
@@@ -19042,12 -18272,10 +19025,12 @@@
  <TestCase name="vertex_fragment">
  <Test name="builtin_gl_position" />
  <Test name="default_block_basic_type" />
 +<Test name="default_block_array_element" />
  </TestCase>
  <TestCase name="separable_vertex">
  <Test name="builtin_gl_position" />
  <Test name="default_block_basic_type" />
 +<Test name="default_block_array_element" />
  </TestCase>
  </TestSuite>
  <TestSuite name="array_size">

diff --combined android/cts/es31-lmp.txt
index 901232d,3187b0b..3187b0b
--- 1/android/cts/es31-lmp.txt
--- 2/android/cts/es31-mustpass-2014.2.9-2014-10-24.txt
+++ b/android/cts/es31-lmp.txt
@@@ -5296,15 -5296,6 +5296,6 @@@ dEQP-GLES31.functional.tessellation.inv
  dEQP-GLES31.functional.tessellation.invariance.one_minus_tess_coord_component.isolines_fractional_even_spacing_ccw_point_mode
  dEQP-GLES31.functional.tessellation.invariance.one_minus_tess_coord_component.isolines_fractional_even_spacing_cw
  dEQP-GLES31.functional.tessellation.invariance.one_minus_tess_coord_component.isolines_fractional_even_spacing_cw_point_mode
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_implicit.triangles
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_implicit.quads
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_implicit.isolines
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_shader_builtin.triangles
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_shader_builtin.quads
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_shader_builtin.isolines
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_query.triangles
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_query.quads
- dEQP-GLES31.functional.tessellation.user_defined_io.per_patch.vertex_io_array_size_query.isolines
  dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex_block.vertex_io_array_size_implicit.triangles
  dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex_block.vertex_io_array_size_implicit.quads
  dEQP-GLES31.functional.tessellation.user_defined_io.per_vertex_block.vertex_io_array_size_implicit.isolines