Update dEQP case list.

Change-Id: I07c8b19fb153d59eafc17ae548629099988caa5e

diff --git a/android/cts/com.drawelements.deqp.gles3.xml b/android/cts/com.drawelements.deqp.gles3.xml
index 9548d30..4969cf6 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles3.xml
+++ b/android/cts/com.drawelements.deqp.gles3.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestPackage name="dEQP-GLES3" targetBinaryName="com.drawelements.deqp" appPackageName="com.drawelements.deqp.gles3" testType="deqpTest">
 <TestSuite name="dEQP-GLES3">
+<TestCase name="info">
+<Test name="renderer" />
+<Test name="version" />
+<Test name="shading_language_version" />
+<Test name="extensions" />
+<Test name="render_target" />
+</TestCase>
 <TestSuite name="functional">
 <TestCase name="prerequisite">
+<Test name="state_reset" />
 <Test name="clear_color" />
 <Test name="read_pixels" />
 </TestCase>
@@ -633,7 +641,6 @@
 <Test name="pixel_unpack_full" />
 <Test name="pixel_unpack_partial" />
 <Test name="transform_feedback_full" />
-<Test name="transform_feedback_partial" />
 <Test name="uniform_full" />
 <Test name="uniform_partial" />
 </TestCase>
@@ -3846,8 +3853,6 @@
 <Test name="in_return_type_fragment" />
 <Test name="out_return_type_vertex" />
 <Test name="out_return_type_fragment" />
-<Test name="inout_return_type_vertex" />
-<Test name="inout_return_type_fragment" />
 <Test name="main_invalid_return_type_vertex" />
 <Test name="main_invalid_return_type_fragment" />
 <Test name="main_has_arguments_vertex" />
@@ -15058,10 +15063,6 @@
 <Test name="sampler2d_fixed_fragment" />
 <Test name="sampler2d_float_vertex" />
 <Test name="sampler2d_float_fragment" />
-<Test name="isampler2d_vertex" />
-<Test name="isampler2d_fragment" />
-<Test name="usampler2d_vertex" />
-<Test name="usampler2d_fragment" />
 <Test name="isamplercube_vertex" />
 <Test name="isamplercube_fragment" />
 <Test name="usamplercube_vertex" />
@@ -15070,18 +15071,10 @@
 <Test name="sampler2darray_fixed_fragment" />
 <Test name="sampler2darray_float_vertex" />
 <Test name="sampler2darray_float_fragment" />
-<Test name="isampler2darray_vertex" />
-<Test name="isampler2darray_fragment" />
-<Test name="usampler2darray_vertex" />
-<Test name="usampler2darray_fragment" />
 <Test name="sampler3d_fixed_vertex" />
 <Test name="sampler3d_fixed_fragment" />
 <Test name="sampler3d_float_vertex" />
 <Test name="sampler3d_float_fragment" />
-<Test name="isampler3d_vertex" />
-<Test name="isampler3d_fragment" />
-<Test name="usampler3d_vertex" />
-<Test name="usampler3d_fragment" />
 <Test name="sampler2dshadow_vertex" />
 <Test name="sampler2dshadow_fragment" />
 </TestCase>
@@ -15090,26 +15083,14 @@
 <Test name="sampler2d_vec3_fixed_fragment" />
 <Test name="sampler2d_vec3_float_vertex" />
 <Test name="sampler2d_vec3_float_fragment" />
-<Test name="isampler2d_vec3_vertex" />
-<Test name="isampler2d_vec3_fragment" />
-<Test name="usampler2d_vec3_vertex" />
-<Test name="usampler2d_vec3_fragment" />
 <Test name="sampler2d_vec4_fixed_vertex" />
 <Test name="sampler2d_vec4_fixed_fragment" />
 <Test name="sampler2d_vec4_float_vertex" />
 <Test name="sampler2d_vec4_float_fragment" />
-<Test name="isampler2d_vec4_vertex" />
-<Test name="isampler2d_vec4_fragment" />
-<Test name="usampler2d_vec4_vertex" />
-<Test name="usampler2d_vec4_fragment" />
 <Test name="sampler3d_fixed_vertex" />
 <Test name="sampler3d_fixed_fragment" />
 <Test name="sampler3d_float_vertex" />
 <Test name="sampler3d_float_fragment" />
-<Test name="isampler3d_vertex" />
-<Test name="isampler3d_fragment" />
-<Test name="usampler3d_vertex" />
-<Test name="usampler3d_fragment" />
 <Test name="sampler2dshadow_vertex" />
 <Test name="sampler2dshadow_fragment" />
 </TestCase>
@@ -15323,11 +15304,6 @@
 <Test name="float_highp" />
 <Test name="vec2_highp" />
 </TestCase>
-<TestCase name="uniform_loop">
-<Test name="float_mediump" />
-<Test name="float_highp" />
-<Test name="vec2_highp" />
-</TestCase>
 <TestCase name="uniform_switch">
 <Test name="float_mediump" />
 <Test name="float_highp" />
@@ -15410,7 +15386,6 @@
 </TestCase>
 <TestCase name="uniform_loop">
 <Test name="float_highp" />
-<Test name="vec2_highp" />
 </TestCase>
 <TestCase name="uniform_switch">
 <Test name="float_highp" />
@@ -15469,7 +15444,6 @@
 <Test name="float_highp" />
 <Test name="vec2_mediump" />
 <Test name="vec2_highp" />
-<Test name="vec4_mediump" />
 </TestCase>
 <TestCase name="static_switch">
 <Test name="float_mediump" />
@@ -15485,13 +15459,6 @@
 <Test name="vec2_highp" />
 <Test name="vec4_mediump" />
 </TestCase>
-<TestCase name="uniform_loop">
-<Test name="float_mediump" />
-<Test name="float_highp" />
-<Test name="vec2_mediump" />
-<Test name="vec2_highp" />
-<Test name="vec4_mediump" />
-</TestCase>
 <TestCase name="uniform_switch">
 <Test name="float_mediump" />
 <Test name="float_highp" />
@@ -15903,6 +15870,18 @@
 <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>
 </TestSuite>
 <TestSuite name="sub">
 <TestCase name="lowp_vertex">
@@ -15929,6 +15908,18 @@
 <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>
 </TestSuite>
 <TestSuite name="mul">
 <TestCase name="lowp_vertex">
@@ -15955,6 +15946,18 @@
 <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>
 </TestSuite>
 <TestSuite name="div">
 <TestCase name="lowp_vertex">
@@ -16045,6 +16048,18 @@
 <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>
 </TestSuite>
 <TestSuite name="sin">
 <TestCase name="lowp_vertex">
@@ -16151,12 +16166,6 @@
 <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" />
@@ -17139,12 +17148,22 @@
 <Test name="vec3" />
 <Test name="vec4" />
 </TestCase>
+<TestCase name="highp_vertex">
+<Test name="vec3" />
+<Test name="vec4" />
+</TestCase>
+<TestCase name="highp_fragment">
+<Test name="vec3" />
+<Test name="vec4" />
+</TestCase>
 </TestSuite>
 <TestCase name="cross">
 <Test name="lowp_vertex" />
 <Test name="lowp_fragment" />
 <Test name="mediump_vertex" />
 <Test name="mediump_fragment" />
+<Test name="highp_vertex" />
+<Test name="highp_fragment" />
 </TestCase>
 <TestSuite name="normalize">
 <TestCase name="lowp_vertex">
@@ -22196,7 +22215,6 @@
 <Test name="linear_linear" />
 </TestCase>
 <TestCase name="projected">
-<Test name="nearest_nearest" />
 <Test name="linear_nearest" />
 </TestCase>
 <TestCase name="bias">
@@ -22227,9 +22245,7 @@
 </TestCase>
 <TestCase name="max_lod">
 <Test name="nearest_nearest" />
-<Test name="linear_nearest" />
 <Test name="nearest_linear" />
-<Test name="linear_linear" />
 </TestCase>
 </TestSuite>
 <TestSuite name="3d">
@@ -28029,8 +28045,6 @@
 <Test name="rgba16f" />
 <Test name="depth24_stencil8" />
 <Test name="r11f_g11f_b10f" />
-<Test name="srgb_unsigned_byte" />
-<Test name="srgb_alpha_unsigned_byte" />
 <Test name="srgb8_alpha8" />
 <Test name="depth_component32f" />
 <Test name="depth32f_stencil8" />
@@ -28094,8 +28108,6 @@
 <Test name="rgb16f" />
 <Test name="depth24_stencil8" />
 <Test name="r11f_g11f_b10f" />
-<Test name="srgb_unsigned_byte" />
-<Test name="srgb_alpha_unsigned_byte" />
 <Test name="srgb8_alpha8" />
 <Test name="depth_component32f" />
 <Test name="depth32f_stencil8" />
@@ -28158,8 +28170,6 @@
 <Test name="rgb16f" />
 <Test name="depth24_stencil8" />
 <Test name="r11f_g11f_b10f" />
-<Test name="srgb_unsigned_byte" />
-<Test name="srgb_alpha_unsigned_byte" />
 <Test name="srgb8_alpha8" />
 <Test name="depth_component32f" />
 <Test name="depth32f_stencil8" />
@@ -28947,7 +28957,6 @@
 <Test name="rgba4_to_rgba4" />
 <Test name="rgba4_to_rgb5_a1" />
 <Test name="rgba4_to_rgb8" />
-<Test name="rgba4_to_rgb565" />
 <Test name="rgba4_to_rg8" />
 <Test name="rgba4_to_r8" />
 <Test name="rgba4_to_rgba32f" />
@@ -36001,23 +36010,13 @@
 <Test name="triangles" />
 <Test name="triangle_strip" />
 <Test name="triangle_fan" />
-<Test name="lines" />
-<Test name="line_strip" />
 <Test name="line_loop" />
-<Test name="lines_wide" />
-<Test name="line_strip_wide" />
-<Test name="line_loop_wide" />
 </TestCase>
 <TestCase name="projected">
 <Test name="triangles" />
 <Test name="triangle_strip" />
 <Test name="triangle_fan" />
-<Test name="lines" />
 <Test name="line_strip" />
-<Test name="line_loop" />
-<Test name="lines_wide" />
-<Test name="line_strip_wide" />
-<Test name="line_loop_wide" />
 </TestCase>
 </TestSuite>
 <TestCase name="flatshading">

diff --git a/android/cts/com.drawelements.deqp.gles31.xml b/android/cts/com.drawelements.deqp.gles31.xml
index 447c86d..663a13f 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles31.xml
+++ b/android/cts/com.drawelements.deqp.gles31.xml
@@ -769,66 +769,42 @@
 <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" />
@@ -2211,12 +2187,6 @@
 <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="radians">
 <TestCase name="lowp_compute">
@@ -2751,12 +2721,6 @@
 <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="min">
 <TestCase name="lowp_compute">
@@ -2771,12 +2735,6 @@
 <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="max">
 <TestCase name="lowp_compute">
@@ -2791,12 +2749,6 @@
 <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="clamp">
 <TestCase name="lowp_compute">
@@ -2811,12 +2763,6 @@
 <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="step">
 <TestCase name="lowp_compute">
@@ -2851,12 +2797,6 @@
 <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="length">
 <TestCase name="lowp_compute">
@@ -3100,34 +3040,19 @@
 <TestCase name="mediump_compute">
 <Test name="mat2" />
 </TestCase>
-<TestCase name="highp_compute">
-<Test name="mat2" />
-</TestCase>
 </TestSuite>
 <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">
@@ -3149,42 +3074,6 @@
 <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">
@@ -3649,18 +3538,15 @@
 </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>
@@ -5601,20 +5487,15 @@
 <Test name="write_multiple_unsized_arr_single_invocation" />
 <Test name="write_multiple_unsized_arr_multiple_groups" />
 <Test name="ssbo_local_barrier_single_invocation" />
-<Test name="ssbo_local_barrier_single_group" />
-<Test name="ssbo_local_barrier_multiple_groups" />
 <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" />
@@ -5719,34 +5600,20 @@
 </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>
@@ -5754,7 +5621,6 @@
 <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>
@@ -5767,8 +5633,6 @@
 <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" />
@@ -5798,7 +5662,6 @@
 </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" />
@@ -5950,71 +5813,50 @@
 <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_1000x1000_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_1000x1000_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_separate_grid_1000x1000_drawcount_5000" />
 <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_1000x1000_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_1000x1000_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" />
-<Test name="drawarrays_combined_grid_1000x1000_drawcount_5000" />
 <Test name="drawelements_separate_grid_100x100_drawcount_1" />
 <Test name="drawelements_separate_grid_200x200_drawcount_1" />
 <Test name="drawelements_separate_grid_500x500_drawcount_1" />
 <Test name="drawelements_separate_grid_1000x1000_drawcount_1" />
 <Test name="drawelements_separate_grid_1200x1200_drawcount_1" />
-<Test name="drawelements_separate_grid_1500x1500_drawcount_1" />
 <Test name="drawelements_separate_grid_100x100_drawcount_8" />
 <Test name="drawelements_separate_grid_200x200_drawcount_8" />
 <Test name="drawelements_separate_grid_500x500_drawcount_8" />
 <Test name="drawelements_separate_grid_1000x1000_drawcount_8" />
 <Test name="drawelements_separate_grid_1200x1200_drawcount_8" />
-<Test name="drawelements_separate_grid_1500x1500_drawcount_8" />
 <Test name="drawelements_separate_grid_100x100_drawcount_200" />
 <Test name="drawelements_separate_grid_200x200_drawcount_800" />
 <Test name="drawelements_separate_grid_500x500_drawcount_2500" />
-<Test name="drawelements_separate_grid_1000x1000_drawcount_5000" />
 <Test name="drawelements_combined_grid_100x100_drawcount_1" />
 <Test name="drawelements_combined_grid_200x200_drawcount_1" />
 <Test name="drawelements_combined_grid_500x500_drawcount_1" />
 <Test name="drawelements_combined_grid_1000x1000_drawcount_1" />
 <Test name="drawelements_combined_grid_1200x1200_drawcount_1" />
-<Test name="drawelements_combined_grid_1500x1500_drawcount_1" />
 <Test name="drawelements_combined_grid_100x100_drawcount_8" />
 <Test name="drawelements_combined_grid_200x200_drawcount_8" />
 <Test name="drawelements_combined_grid_500x500_drawcount_8" />
 <Test name="drawelements_combined_grid_1000x1000_drawcount_8" />
 <Test name="drawelements_combined_grid_1200x1200_drawcount_8" />
-<Test name="drawelements_combined_grid_1500x1500_drawcount_8" />
 <Test name="drawelements_combined_grid_100x100_drawcount_200" />
 <Test name="drawelements_combined_grid_200x200_drawcount_800" />
 <Test name="drawelements_combined_grid_500x500_drawcount_2500" />
-<Test name="drawelements_combined_grid_1000x1000_drawcount_5000" />
 </TestCase>
 </TestSuite>
 <TestCase name="random">
-<Test name="0" />
 <Test name="2" />
 <Test name="3" />
 <Test name="4" />
@@ -6022,14 +5864,11 @@
 <Test name="6" />
 <Test name="7" />
 <Test name="8" />
-<Test name="10" />
 <Test name="11" />
 <Test name="12" />
 <Test name="13" />
 <Test name="14" />
-<Test name="15" />
 <Test name="17" />
-<Test name="18" />
 <Test name="19" />
 <Test name="20" />
 <Test name="21" />
@@ -9444,14 +9283,12 @@
 <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" />
@@ -9460,7 +9297,6 @@
 <Test name="26" />
 <Test name="27" />
 <Test name="28" />
-<Test name="29" />
 <Test name="30" />
 <Test name="31" />
 <Test name="32" />
@@ -9472,7 +9308,6 @@
 <Test name="38" />
 <Test name="39" />
 <Test name="40" />
-<Test name="41" />
 <Test name="42" />
 <Test name="43" />
 <Test name="44" />
@@ -9605,12 +9440,6 @@
 <Test name="comp_swap_r32i_return_value" />
 </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">
@@ -9658,13 +9487,11 @@
 <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" />
@@ -9831,13 +9658,11 @@
 <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" />
@@ -10004,13 +9829,11 @@
 <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" />
@@ -10177,13 +10000,11 @@
 <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" />
@@ -10675,9 +10496,6 @@
 </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" />
@@ -11356,11 +11174,6 @@
 <TestSuite name="multisample">
 <TestCase name="samples_1">
 <Test name="sample_position" />
-<Test name="sample_mask_only" />
-<Test name="sample_mask_and_alpha_to_coverage" />
-<Test name="sample_mask_and_sample_coverage" />
-<Test name="sample_mask_and_sample_coverage_and_alpha_to_coverage" />
-<Test name="sample_mask_non_effective_bits" />
 <Test name="use_texture_color_2d" />
 <Test name="use_texture_color_2d_array" />
 <Test name="use_texture_int_2d" />
@@ -11540,13 +11353,9 @@
 <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" />
@@ -11557,10 +11366,6 @@
 </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" />
@@ -11573,13 +11378,9 @@
 <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" />
@@ -11588,9 +11389,6 @@
 <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" />
@@ -11599,13 +11397,9 @@
 <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" />
@@ -11614,9 +11408,6 @@
 <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" />
@@ -11626,33 +11417,23 @@
 <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" />
@@ -11664,13 +11445,9 @@
 <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" />
@@ -11681,10 +11458,6 @@
 </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" />
@@ -11697,13 +11470,9 @@
 <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" />
@@ -11712,9 +11481,6 @@
 <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" />
@@ -11723,13 +11489,9 @@
 <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" />
@@ -11738,9 +11500,6 @@
 <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" />
@@ -11750,33 +11509,21 @@
 <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" />
@@ -11805,10 +11552,6 @@
 </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" />
@@ -11833,9 +11576,6 @@
 <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" />
@@ -11859,9 +11599,6 @@
 <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" />
@@ -11894,10 +11631,6 @@
 </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" />
@@ -11912,62 +11645,42 @@
 <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>
@@ -11976,62 +11689,42 @@
 <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>
@@ -12042,13 +11735,9 @@
 <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" />
@@ -12059,10 +11748,6 @@
 </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" />
@@ -12075,13 +11760,9 @@
 <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" />
@@ -12090,9 +11771,6 @@
 <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" />
@@ -12101,13 +11779,9 @@
 <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" />
@@ -12116,9 +11790,6 @@
 <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" />
@@ -12128,33 +11799,21 @@
 <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" />
@@ -12166,13 +11825,9 @@
 <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" />
@@ -12183,10 +11838,6 @@
 </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" />
@@ -12199,13 +11850,9 @@
 <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" />
@@ -12214,9 +11861,6 @@
 <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" />
@@ -12225,13 +11869,9 @@
 <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" />
@@ -12240,9 +11880,6 @@
 <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" />
@@ -12252,33 +11889,21 @@
 <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" />
@@ -13637,7 +13262,6 @@
 <Test name="vertex_binding_divisor_getintegeri" />
 <Test name="vertex_binding_divisor_getintegeri64" />
 <Test name="vertex_binding_divisor_mixed" />
-<Test name="vertex_binding_offset_mixed" />
 <Test name="vertex_binding_stride_mixed" />
 <Test name="vertex_binding_buffer_mixed" />
 </TestCase>
@@ -15223,7 +14847,6 @@
 <Test name="darken" />
 <Test name="lighten" />
 <Test name="colordodge" />
-<Test name="colorburn" />
 <Test name="hardlight" />
 <Test name="difference" />
 <Test name="exclusion" />
@@ -15259,10 +14882,7 @@
 <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" />
@@ -15337,167 +14957,64 @@
 </TestCase>
 <TestCase name="interface">
 <Test name="same_name_vertex_smooth_fragment_smooth" />
-<Test name="same_name_vertex_smooth_fragment_flat" />
-<Test name="same_name_vertex_smooth_fragment_centroid" />
-<Test name="same_name_vertex_smooth" />
-<Test name="same_name_vertex_flat_fragment_smooth" />
 <Test name="same_name_vertex_flat_fragment_flat" />
-<Test name="same_name_vertex_flat_fragment_centroid" />
-<Test name="same_name_vertex_flat" />
-<Test name="same_name_vertex_centroid_fragment_smooth" />
-<Test name="same_name_vertex_centroid_fragment_flat" />
 <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_flat" />
-<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_flat" />
-<Test name="same_location_vertex_smooth_fragment_centroid" />
-<Test name="same_location_vertex_smooth" />
-<Test name="same_location_vertex_flat_fragment_smooth" />
 <Test name="same_location_vertex_flat_fragment_flat" />
-<Test name="same_location_vertex_flat_fragment_centroid" />
-<Test name="same_location_vertex_flat" />
-<Test name="same_location_vertex_centroid_fragment_smooth" />
-<Test name="same_location_vertex_centroid_fragment_flat" />
 <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_flat" />
-<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" />
@@ -15514,14 +15031,11 @@
 <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" />
@@ -16853,15 +16367,11 @@
 <Test name="push_pop_consistency" />
 </TestCase>
 <TestCase name="error_filters">
-<Test name="case_1" />
-<Test name="case_2" />
 <Test name="case_4" />
 <Test name="case_5" />
 <Test name="case_6" />
 <Test name="case_7" />
-<Test name="case_9" />
 <Test name="case_10" />
-<Test name="case_11" />
 <Test name="case_12" />
 <Test name="case_13" />
 <Test name="case_14" />
@@ -16869,22 +16379,14 @@
 <Test name="case_21" />
 <Test name="case_22" />
 <Test name="case_23" />
-<Test name="case_24" />
 <Test name="case_25" />
-<Test name="case_27" />
 <Test name="case_28" />
 <Test name="case_29" />
 <Test name="case_30" />
-<Test name="case_31" />
 </TestCase>
 <TestCase name="error_groups">
-<Test name="case_1" />
-<Test name="case_2" />
 <Test name="case_4" />
-<Test name="case_5" />
 <Test name="case_6" />
-<Test name="case_7" />
-<Test name="case_12" />
 <Test name="case_14" />
 </TestCase>
 <TestCase name="async">
@@ -16910,7 +16412,6 @@
 <Test name="shader" />
 <Test name="program" />
 <Test name="query" />
-<Test name="program_pipeline" />
 <Test name="transform_feedback" />
 <Test name="sampler" />
 <Test name="texture" />
@@ -16960,72 +16461,8 @@
 </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" />
@@ -17037,12 +16474,6 @@
 <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" />
@@ -17050,7 +16481,6 @@
 </TestSuite>
 <TestSuite name="program_interface_query">
 <TestCase name="buffer_limited_query">
-<Test name="resource_name_query" />
 <Test name="resource_query" />
 </TestCase>
 <TestSuite name="uniform">
@@ -17205,15 +16635,6 @@
 <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" />
@@ -17308,23 +16729,9 @@
 <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" />
@@ -17483,24 +16890,6 @@
 <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" />
@@ -17517,7 +16906,6 @@
 </TestCase>
 <TestCase name="array">
 <Test name="var_array" />
-<Test name="var_array_array" />
 </TestCase>
 </TestSuite>
 <TestCase name="named_block">
@@ -17565,36 +16953,6 @@
 <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">
@@ -17615,18 +16973,6 @@
 <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">
@@ -17636,12 +16982,6 @@
 <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">
@@ -17651,10 +16991,6 @@
 <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">
@@ -17674,17 +17010,6 @@
 <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" />
@@ -17692,10 +17017,6 @@
 <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" />
@@ -17704,10 +17025,6 @@
 <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>
@@ -17744,15 +17061,6 @@
 <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" />
@@ -17790,7 +17098,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -17802,12 +17109,10 @@
 <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" />
@@ -17824,7 +17129,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -17841,7 +17145,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -17853,12 +17156,10 @@
 <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" />
@@ -17875,7 +17176,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -17900,19 +17200,9 @@
 <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" />
@@ -17955,7 +17245,6 @@
 <TestCase name="aggregates">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 </TestSuite>
 <TestSuite name="column_major">
@@ -17978,12 +17267,10 @@
 <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" />
@@ -18000,7 +17287,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -18017,7 +17303,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -18029,12 +17314,10 @@
 <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" />
@@ -18051,7 +17334,6 @@
 <TestCase name="row_major">
 <Test name="var" />
 <Test name="var_struct" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="column_major">
 <Test name="var" />
@@ -18118,36 +17400,6 @@
 <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">
@@ -18248,9 +17500,6 @@
 <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" />
@@ -18383,8 +17632,6 @@
 <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" />
@@ -18410,8 +17657,6 @@
 <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" />
@@ -18458,36 +17703,6 @@
 <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">
@@ -18497,12 +17712,6 @@
 <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">
@@ -18512,10 +17721,6 @@
 <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">
@@ -18618,20 +17823,16 @@
 </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" />
@@ -18650,9 +17851,7 @@
 <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" />
@@ -18732,8 +17931,6 @@
 <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">
@@ -18774,11 +17971,6 @@
 <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">
@@ -18923,7 +18115,6 @@
 <TestCase name="vertex_fragment">
 <Test name="empty" />
 <Test name="var" />
-<Test name="var_array" />
 </TestCase>
 <TestCase name="separable_vertex">
 <Test name="empty" />
@@ -18958,20 +18149,11 @@
 <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">