graphics_dEQP: rev master/* files to 6.0_r6.
This should be done automatically in the future, see bug below.
BUG=chromium:617758
TEST=None.
Change-Id: I749878ad980ca684c49af8527068606e49f1ff19
Reviewed-on: https://chromium-review.googlesource.com/350131
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/client/site_tests/graphics_dEQP/master/gles2-master.txt b/client/site_tests/graphics_dEQP/master/gles2-master.txt
index c85cca6..327c01a 100644
--- a/client/site_tests/graphics_dEQP/master/gles2-master.txt
+++ b/client/site_tests/graphics_dEQP/master/gles2-master.txt
@@ -8611,12 +8611,10 @@
dEQP-GLES2.functional.texture.size.2d.64x64_rgba8888
dEQP-GLES2.functional.texture.size.2d.64x64_rgba8888_mipmap
dEQP-GLES2.functional.texture.size.2d.65x63_l8
-dEQP-GLES2.functional.texture.size.2d.65x63_rgba4444
dEQP-GLES2.functional.texture.size.2d.65x63_rgb888
dEQP-GLES2.functional.texture.size.2d.65x63_rgba8888
dEQP-GLES2.functional.texture.size.2d.512x512_l8
dEQP-GLES2.functional.texture.size.2d.512x512_l8_mipmap
-dEQP-GLES2.functional.texture.size.2d.512x512_rgba4444
dEQP-GLES2.functional.texture.size.2d.512x512_rgba4444_mipmap
dEQP-GLES2.functional.texture.size.2d.512x512_rgb888
dEQP-GLES2.functional.texture.size.2d.512x512_rgb888_mipmap
@@ -8624,7 +8622,6 @@
dEQP-GLES2.functional.texture.size.2d.512x512_rgba8888_mipmap
dEQP-GLES2.functional.texture.size.2d.1024x1024_l8
dEQP-GLES2.functional.texture.size.2d.1024x1024_l8_mipmap
-dEQP-GLES2.functional.texture.size.2d.1024x1024_rgba4444
dEQP-GLES2.functional.texture.size.2d.1024x1024_rgba4444_mipmap
dEQP-GLES2.functional.texture.size.2d.1024x1024_rgb888
dEQP-GLES2.functional.texture.size.2d.1024x1024_rgb888_mipmap
@@ -8632,7 +8629,6 @@
dEQP-GLES2.functional.texture.size.2d.1024x1024_rgba8888_mipmap
dEQP-GLES2.functional.texture.size.2d.2048x2048_l8
dEQP-GLES2.functional.texture.size.2d.2048x2048_l8_mipmap
-dEQP-GLES2.functional.texture.size.2d.2048x2048_rgba4444
dEQP-GLES2.functional.texture.size.2d.2048x2048_rgba4444_mipmap
dEQP-GLES2.functional.texture.size.2d.2048x2048_rgb888
dEQP-GLES2.functional.texture.size.2d.2048x2048_rgb888_mipmap
@@ -8676,9 +8672,7 @@
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgb888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgba4444
dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_l8
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_rgb888
@@ -8689,35 +8683,18 @@
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_rgba4444
dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_l8
dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba4444
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_l8
dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_etc1
dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_clamp_etc1
dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_linear_clamp_etc1
dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_clamp_etc1
@@ -9050,117 +9027,6 @@
dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_clamp
dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_repeat
dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_mirror
-dEQP-GLES2.functional.texture.units.2_units.only_2d.0
-dEQP-GLES2.functional.texture.units.2_units.only_2d.1
-dEQP-GLES2.functional.texture.units.2_units.only_2d.2
-dEQP-GLES2.functional.texture.units.2_units.only_2d.3
-dEQP-GLES2.functional.texture.units.2_units.only_2d.4
-dEQP-GLES2.functional.texture.units.2_units.only_2d.5
-dEQP-GLES2.functional.texture.units.2_units.only_2d.6
-dEQP-GLES2.functional.texture.units.2_units.only_2d.7
-dEQP-GLES2.functional.texture.units.2_units.only_2d.8
-dEQP-GLES2.functional.texture.units.2_units.only_2d.9
-dEQP-GLES2.functional.texture.units.2_units.only_cube.2
-dEQP-GLES2.functional.texture.units.2_units.only_cube.4
-dEQP-GLES2.functional.texture.units.2_units.only_cube.5
-dEQP-GLES2.functional.texture.units.2_units.only_cube.6
-dEQP-GLES2.functional.texture.units.2_units.only_cube.7
-dEQP-GLES2.functional.texture.units.2_units.only_cube.8
-dEQP-GLES2.functional.texture.units.2_units.mixed.3
-dEQP-GLES2.functional.texture.units.2_units.mixed.4
-dEQP-GLES2.functional.texture.units.2_units.mixed.6
-dEQP-GLES2.functional.texture.units.2_units.mixed.7
-dEQP-GLES2.functional.texture.units.2_units.mixed.8
-dEQP-GLES2.functional.texture.units.2_units.mixed.9
-dEQP-GLES2.functional.texture.units.4_units.only_2d.0
-dEQP-GLES2.functional.texture.units.4_units.only_2d.1
-dEQP-GLES2.functional.texture.units.4_units.only_2d.2
-dEQP-GLES2.functional.texture.units.4_units.only_2d.3
-dEQP-GLES2.functional.texture.units.4_units.only_2d.4
-dEQP-GLES2.functional.texture.units.4_units.only_2d.5
-dEQP-GLES2.functional.texture.units.4_units.only_2d.6
-dEQP-GLES2.functional.texture.units.4_units.only_2d.7
-dEQP-GLES2.functional.texture.units.4_units.only_2d.8
-dEQP-GLES2.functional.texture.units.4_units.only_2d.9
-dEQP-GLES2.functional.texture.units.4_units.only_cube.0
-dEQP-GLES2.functional.texture.units.4_units.only_cube.1
-dEQP-GLES2.functional.texture.units.4_units.only_cube.2
-dEQP-GLES2.functional.texture.units.4_units.only_cube.3
-dEQP-GLES2.functional.texture.units.4_units.only_cube.4
-dEQP-GLES2.functional.texture.units.4_units.only_cube.5
-dEQP-GLES2.functional.texture.units.4_units.only_cube.6
-dEQP-GLES2.functional.texture.units.4_units.only_cube.7
-dEQP-GLES2.functional.texture.units.4_units.only_cube.8
-dEQP-GLES2.functional.texture.units.4_units.only_cube.9
-dEQP-GLES2.functional.texture.units.4_units.mixed.0
-dEQP-GLES2.functional.texture.units.4_units.mixed.1
-dEQP-GLES2.functional.texture.units.4_units.mixed.2
-dEQP-GLES2.functional.texture.units.4_units.mixed.3
-dEQP-GLES2.functional.texture.units.4_units.mixed.4
-dEQP-GLES2.functional.texture.units.4_units.mixed.5
-dEQP-GLES2.functional.texture.units.4_units.mixed.7
-dEQP-GLES2.functional.texture.units.4_units.mixed.8
-dEQP-GLES2.functional.texture.units.4_units.mixed.9
-dEQP-GLES2.functional.texture.units.8_units.only_2d.0
-dEQP-GLES2.functional.texture.units.8_units.only_2d.1
-dEQP-GLES2.functional.texture.units.8_units.only_2d.2
-dEQP-GLES2.functional.texture.units.8_units.only_2d.3
-dEQP-GLES2.functional.texture.units.8_units.only_2d.4
-dEQP-GLES2.functional.texture.units.8_units.only_2d.5
-dEQP-GLES2.functional.texture.units.8_units.only_2d.6
-dEQP-GLES2.functional.texture.units.8_units.only_2d.7
-dEQP-GLES2.functional.texture.units.8_units.only_2d.8
-dEQP-GLES2.functional.texture.units.8_units.only_2d.9
-dEQP-GLES2.functional.texture.units.8_units.only_cube.0
-dEQP-GLES2.functional.texture.units.8_units.only_cube.1
-dEQP-GLES2.functional.texture.units.8_units.only_cube.2
-dEQP-GLES2.functional.texture.units.8_units.only_cube.3
-dEQP-GLES2.functional.texture.units.8_units.only_cube.4
-dEQP-GLES2.functional.texture.units.8_units.only_cube.5
-dEQP-GLES2.functional.texture.units.8_units.only_cube.6
-dEQP-GLES2.functional.texture.units.8_units.only_cube.7
-dEQP-GLES2.functional.texture.units.8_units.only_cube.8
-dEQP-GLES2.functional.texture.units.8_units.only_cube.9
-dEQP-GLES2.functional.texture.units.8_units.mixed.0
-dEQP-GLES2.functional.texture.units.8_units.mixed.1
-dEQP-GLES2.functional.texture.units.8_units.mixed.2
-dEQP-GLES2.functional.texture.units.8_units.mixed.3
-dEQP-GLES2.functional.texture.units.8_units.mixed.4
-dEQP-GLES2.functional.texture.units.8_units.mixed.5
-dEQP-GLES2.functional.texture.units.8_units.mixed.6
-dEQP-GLES2.functional.texture.units.8_units.mixed.7
-dEQP-GLES2.functional.texture.units.8_units.mixed.8
-dEQP-GLES2.functional.texture.units.8_units.mixed.9
-dEQP-GLES2.functional.texture.units.all_units.only_2d.0
-dEQP-GLES2.functional.texture.units.all_units.only_2d.1
-dEQP-GLES2.functional.texture.units.all_units.only_2d.2
-dEQP-GLES2.functional.texture.units.all_units.only_2d.3
-dEQP-GLES2.functional.texture.units.all_units.only_2d.4
-dEQP-GLES2.functional.texture.units.all_units.only_2d.5
-dEQP-GLES2.functional.texture.units.all_units.only_2d.6
-dEQP-GLES2.functional.texture.units.all_units.only_2d.7
-dEQP-GLES2.functional.texture.units.all_units.only_2d.8
-dEQP-GLES2.functional.texture.units.all_units.only_2d.9
-dEQP-GLES2.functional.texture.units.all_units.only_cube.0
-dEQP-GLES2.functional.texture.units.all_units.only_cube.1
-dEQP-GLES2.functional.texture.units.all_units.only_cube.2
-dEQP-GLES2.functional.texture.units.all_units.only_cube.3
-dEQP-GLES2.functional.texture.units.all_units.only_cube.4
-dEQP-GLES2.functional.texture.units.all_units.only_cube.5
-dEQP-GLES2.functional.texture.units.all_units.only_cube.6
-dEQP-GLES2.functional.texture.units.all_units.only_cube.7
-dEQP-GLES2.functional.texture.units.all_units.only_cube.8
-dEQP-GLES2.functional.texture.units.all_units.only_cube.9
-dEQP-GLES2.functional.texture.units.all_units.mixed.0
-dEQP-GLES2.functional.texture.units.all_units.mixed.1
-dEQP-GLES2.functional.texture.units.all_units.mixed.2
-dEQP-GLES2.functional.texture.units.all_units.mixed.3
-dEQP-GLES2.functional.texture.units.all_units.mixed.4
-dEQP-GLES2.functional.texture.units.all_units.mixed.5
-dEQP-GLES2.functional.texture.units.all_units.mixed.6
-dEQP-GLES2.functional.texture.units.all_units.mixed.7
-dEQP-GLES2.functional.texture.units.all_units.mixed.8
-dEQP-GLES2.functional.texture.units.all_units.mixed.9
dEQP-GLES2.functional.fragment_ops.depth.cmp_always
dEQP-GLES2.functional.fragment_ops.depth.cmp_never
dEQP-GLES2.functional.fragment_ops.depth.cmp_equal
diff --git a/client/site_tests/graphics_dEQP/master/gles3-master.txt b/client/site_tests/graphics_dEQP/master/gles3-master.txt
index 6e761ea..ee0ecba 100644
--- a/client/site_tests/graphics_dEQP/master/gles3-master.txt
+++ b/client/site_tests/graphics_dEQP/master/gles3-master.txt
@@ -40225,7 +40225,6 @@
dEQP-GLES3.functional.draw.draw_elements_instanced.indices.user_ptr.index_int
dEQP-GLES3.functional.draw.draw_elements_instanced.indices.unaligned_user_ptr.index_short
dEQP-GLES3.functional.draw.draw_elements_instanced.indices.unaligned_user_ptr.index_int
-dEQP-GLES3.functional.draw.draw_elements_instanced.indices.buffer.index_byte
dEQP-GLES3.functional.draw.draw_elements_instanced.indices.buffer.index_short
dEQP-GLES3.functional.draw.draw_elements_instanced.indices.buffer.index_int
dEQP-GLES3.functional.draw.draw_elements_instanced.points.single_attribute
diff --git a/client/site_tests/graphics_dEQP/master/gles31-master.txt b/client/site_tests/graphics_dEQP/master/gles31-master.txt
index 4a758a0..ef5e147 100644
--- a/client/site_tests/graphics_dEQP/master/gles31-master.txt
+++ b/client/site_tests/graphics_dEQP/master/gles31-master.txt
@@ -20864,9 +20864,6 @@
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_fragment.fbo_bbox_equal
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_fragment.fbo_bbox_larger
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_fragment.fbo_bbox_smaller
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
-dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_equal
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_larger
dEQP-GLES31.functional.primitive_bounding_box.lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_smaller
@@ -20926,9 +20923,6 @@
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_equal
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_larger
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_fragment.fbo_bbox_smaller
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_equal
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_larger
-dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_geometry_fragment.fbo_bbox_smaller
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_equal
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_larger
dEQP-GLES31.functional.primitive_bounding_box.wide_lines.global_state.vertex_tessellation_geometry_fragment.fbo_bbox_smaller