Update Android test lists and Android files

author Paul Thomson <paulthomson@google.com>

Thu, 7 Oct 2021 17:37:55 +0000 (18:37 +0100)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Fri, 15 Oct 2021 19:00:40 +0000 (19:00 +0000)
author Paul Thomson <paulthomson@google.com>
Thu, 7 Oct 2021 17:37:55 +0000 (18:37 +0100)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Fri, 15 Oct 2021 19:00:40 +0000 (19:00 +0000)
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt

index 27a04bd..4c54d07 100644 (file)
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -3726,11 +3726,9 @@ dEQP-EGL.functional.wide_color.pbuffer_1010102_colorspace_p3
  dEQP-EGL.functional.wide_color.pbuffer_1010102_colorspace_p3_passthrough
  dEQP-EGL.functional.wide_color.window_8888_colorspace_default
  dEQP-EGL.functional.wide_color.window_8888_colorspace_srgb
-dEQP-EGL.functional.wide_color.window_8888_colorspace_p3
  dEQP-EGL.functional.wide_color.window_8888_colorspace_p3_passthrough
  dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_default
  dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_srgb
-dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_p3
  dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_p3_passthrough
  dEQP-EGL.functional.wide_color.window_888_colorspace_default
  dEQP-EGL.functional.wide_color.window_888_colorspace_srgb
diff --git a/android/cts/master/gles2-master-2020-03-01.txt b/android/cts/master/gles2-master-2020-03-01.txt

index 3b10c21..854618e 100644 (file)
--- a/android/cts/master/gles2-master-2020-03-01.txt
+++ b/android/cts/master/gles2-master-2020-03-01.txt
@@ -124,6 +124,7 @@ dEQP-GLES2.functional.light_amount.10omni
  dEQP-GLES2.functional.light_amount.12omni
  dEQP-GLES2.functional.light_amount.14omni
  dEQP-GLES2.functional.light_amount.16omni
+dEQP-GLES2.functional.multisampled_render_to_texture.readpixels
  dEQP-GLES2.functional.shaders.preprocessor.basic.correct_phases_vertex
  dEQP-GLES2.functional.shaders.preprocessor.basic.correct_phases_fragment
  dEQP-GLES2.functional.shaders.preprocessor.basic.invalid_identifier_vertex
diff --git a/android/cts/master/gles2-master-2021-03-01.txt b/android/cts/master/gles2-master-2021-03-01.txt

index 2d83140..8b1c1a1 100644 (file)
--- a/android/cts/master/gles2-master-2021-03-01.txt
+++ b/android/cts/master/gles2-master-2021-03-01.txt
@@ -1,4 +1,3 @@
-dEQP-GLES2.functional.multisampled_render_to_texture.readpixels
  dEQP-GLES2.functional.shaders.indexing.tmp_array.float_const_write_static_read_vertex
  dEQP-GLES2.functional.shaders.indexing.tmp_array.float_const_write_static_read_fragment
  dEQP-GLES2.functional.shaders.indexing.tmp_array.float_const_write_dynamic_read_vertex
@@ -31,4 +30,3 @@ dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_const_write_static_loop_re
  dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_const_write_static_loop_read_fragment
  dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_const_write_dynamic_loop_read_vertex
  dEQP-GLES2.functional.shaders.indexing.tmp_array.vec4_const_write_dynamic_loop_read_fragment
-dEQP-GLES2.functional.shaders.constant_expressions.invalid.precision_specifier
diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt

index 710c688..a9475c9 100644 (file)
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -7202,7 +7202,6 @@ dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.geometric.n
  dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.geometric.normalize_vec3_fragment
  dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.geometric.normalize_vec4_vertex
  dEQP-GLES2.functional.shaders.constant_expressions.builtin_functions.geometric.normalize_vec4_fragment
-dEQP-GLES2.functional.shaders.constant_expressions.invalid.precision_specifier
  dEQP-GLES2.functional.shaders.random.basic_expression.vertex.0
  dEQP-GLES2.functional.shaders.random.basic_expression.vertex.1
  dEQP-GLES2.functional.shaders.random.basic_expression.vertex.2
diff --git a/android/cts/master/gles3-incremental-deqp.txt b/android/cts/master/gles3-incremental-deqp.txt

new file mode 100644 (file)

index 0000000..afffe44
--- /dev/null
+++ b/android/cts/master/gles3-incremental-deqp.txt
@@ -0,0 +1,73 @@
+dEQP-GLES3.info.vendor
+dEQP-GLES3.info.renderer
+dEQP-GLES3.info.version
+dEQP-GLES3.info.shading_language_version
+dEQP-GLES3.info.extensions
+dEQP-GLES3.info.render_target
+dEQP-GLES3.functional.prerequisite.state_reset
+dEQP-GLES3.functional.prerequisite.clear_color
+dEQP-GLES3.functional.prerequisite.read_pixels
+dEQP-GLES3.functional.implementation_limits.max_element_index
+dEQP-GLES3.functional.implementation_limits.subpixel_bits
+dEQP-GLES3.functional.color_clear.single_rgb
+dEQP-GLES3.functional.color_clear.single_rgba
+dEQP-GLES3.functional.color_clear.multiple_rgb
+dEQP-GLES3.functional.color_clear.multiple_rgba
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_b_fragment
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_rb_vertex
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_rb_fragment
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_bb_vertex
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_static_read_fragment
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_dynamic_read_vertex
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_dynamic_read_fragment
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.highp_vec2_fragment
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.mediump_vec3_vertex
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.mediump_vec3_fragment
+dEQP-GLES3.functional.texture.format.compressed.etc1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_cube_npot
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.triangles
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points
diff --git a/android/cts/master/gles3-master-2021-03-01.txt b/android/cts/master/gles3-master-2021-03-01.txt

index 768570b..3926403 100644 (file)
--- a/android/cts/master/gles3-master-2021-03-01.txt
+++ b/android/cts/master/gles3-master-2021-03-01.txt
@@ -250,7 +250,3 @@ dEQP-GLES3.functional.transform_feedback.random_full_array_capture.interleaved.t
  dEQP-GLES3.functional.transform_feedback.random_full_array_capture.interleaved.triangles.8
  dEQP-GLES3.functional.transform_feedback.random_full_array_capture.interleaved.triangles.9
  dEQP-GLES3.functional.transform_feedback.random_full_array_capture.interleaved.triangles.10
-dEQP-GLES3.functional.flush_finish.wait
-dEQP-GLES3.functional.flush_finish.flush
-dEQP-GLES3.functional.flush_finish.finish
-dEQP-GLES3.functional.flush_finish.finish_wait
diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt

index c00b7b5..6297da2 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -42762,10 +42762,6 @@ dEQP-GLES3.functional.draw.random.207
  dEQP-GLES3.functional.draw.random.208
  dEQP-GLES3.functional.draw.random.209
  dEQP-GLES3.functional.draw.random.210
-dEQP-GLES3.functional.flush_finish.wait
-dEQP-GLES3.functional.flush_finish.flush
-dEQP-GLES3.functional.flush_finish.finish
-dEQP-GLES3.functional.flush_finish.finish_wait
  dEQP-GLES3.functional.default_vertex_attrib.float.vertex_attrib_1f
  dEQP-GLES3.functional.default_vertex_attrib.float.vertex_attrib_2f
  dEQP-GLES3.functional.default_vertex_attrib.float.vertex_attrib_3f
diff --git a/android/cts/master/gles31-master-2021-03-01.txt b/android/cts/master/gles31-master-2021-03-01.txt

index aee8c2b..c8cf364 100644 (file)
--- a/android/cts/master/gles31-master-2021-03-01.txt
+++ b/android/cts/master/gles31-master-2021-03-01.txt
@@ -1,5 +1,3 @@
-dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
-dEQP-GLES31.functional.separate_shader.random.38
  dEQP-GLES31.functional.fbo.color.tex2d.r16
  dEQP-GLES31.functional.fbo.color.tex2d.rg16
  dEQP-GLES31.functional.fbo.color.tex2d.rgba16
diff --git a/android/cts/master/gles31-master.txt b/android/cts/master/gles31-master.txt

index 414235b..ab276c2 100644 (file)
--- a/android/cts/master/gles31-master.txt
+++ b/android/cts/master/gles31-master.txt
@@ -10290,7 +10290,6 @@ dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.44
  dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.45
  dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.46
  dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.47
-dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
  dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.49
  dEQP-GLES31.functional.ssbo.atomic.add.lowp_uint
  dEQP-GLES31.functional.ssbo.atomic.add.lowp_int
@@ -17689,7 +17688,6 @@ dEQP-GLES31.functional.separate_shader.random.34
  dEQP-GLES31.functional.separate_shader.random.35
  dEQP-GLES31.functional.separate_shader.random.36
  dEQP-GLES31.functional.separate_shader.random.37
-dEQP-GLES31.functional.separate_shader.random.38
  dEQP-GLES31.functional.separate_shader.random.39
  dEQP-GLES31.functional.separate_shader.random.40
  dEQP-GLES31.functional.separate_shader.random.41
diff --git a/android/cts/master/mustpass.xml b/android/cts/master/mustpass.xml

index 37d7f64..c5b27b1 100644 (file)
--- a/android/cts/master/mustpass.xml
+++ b/android/cts/master/mustpass.xml
@@ -37,6 +37,7 @@
                 <Configuration caseListFile="gles3-rotate-reverse-landscape.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=270 --deqp-surface-type=window --deqp-watchdog=enable" name="rotate-reverse-landscape"/>
                 <Configuration caseListFile="gles3-multisample.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms4 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="multisample"/>
                 <Configuration caseListFile="gles3-565-no-depth-no-stencil.txt" commandLine="--deqp-gl-config-name=rgb565d0s0ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="565-no-depth-no-stencil"/>
+               <Configuration caseListFile="gles3-incremental-deqp.txt" commandLine="--deqp-watchdog=enable" name="incremental-deqp"/>
         </TestPackage>
         <TestPackage name="dEQP-GLES31">
                 <Configuration caseListFile="gles31-master.txt" commandLine="--deqp-gl-config-name=rgba8888d24s8ms0 --deqp-screen-rotation=unspecified --deqp-surface-type=window --deqp-watchdog=enable" name="master"/>
@@ -54,5 +55,6 @@
                 <Configuration caseListFile="vk-master-2019-03-01.txt" commandLine="--deqp-watchdog=enable" name="master-2019-03-01"/>
                 <Configuration caseListFile="vk-master-2020-03-01.txt" commandLine="--deqp-watchdog=enable" name="master-2020-03-01"/>
                 <Configuration caseListFile="vk-master-2021-03-01.txt" commandLine="--deqp-watchdog=enable" name="master-2021-03-01"/>
+               <Configuration caseListFile="vk-incremental-deqp.txt" commandLine="--deqp-watchdog=enable" name="incremental-deqp"/>
         </TestPackage>
  </Mustpass>
diff --git a/android/cts/master/src/egl-test-issues.txt b/android/cts/master/src/egl-test-issues.txt

index 7ce0644..d8671ae 100644 (file)
--- a/android/cts/master/src/egl-test-issues.txt
+++ b/android/cts/master/src/egl-test-issues.txt
@@ -27,3 +27,9 @@ dEQP-EGL.functional.color_clears.*.gles*.rgba5551_pbuffer
  # Bug: 30909609
  dEQP-EGL.functional.image.modify.tex_rgba4_renderbuffer_clear_color
  dEQP-EGL.functional.image.modify.renderbuffer_rgba4_renderbuffer_clear_color
+
+# Issue 1384: sRGB encoding of EGL_GL_COLORSPACE_DISPLAY_P3_EXT. P has
+# conflicting implementations due to test being broken in early P CTS.
+# Can be removed in Q.
+dEQP-EGL.functional.wide_color.pbuffer_8888_colorspace_p3
+dEQP-EGL.functional.wide_color.window_8888_colorspace_p3
diff --git a/android/cts/master/src/gles2-master-2020-03-01.txt b/android/cts/master/src/gles2-master-2020-03-01.txt

index 3b10c21..854618e 100644 (file)
--- a/android/cts/master/src/gles2-master-2020-03-01.txt
+++ b/android/cts/master/src/gles2-master-2020-03-01.txt
@@ -124,6 +124,7 @@ dEQP-GLES2.functional.light_amount.10omni
  dEQP-GLES2.functional.light_amount.12omni
  dEQP-GLES2.functional.light_amount.14omni
  dEQP-GLES2.functional.light_amount.16omni
+dEQP-GLES2.functional.multisampled_render_to_texture.readpixels
  dEQP-GLES2.functional.shaders.preprocessor.basic.correct_phases_vertex
  dEQP-GLES2.functional.shaders.preprocessor.basic.correct_phases_fragment
  dEQP-GLES2.functional.shaders.preprocessor.basic.invalid_identifier_vertex
diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt

index 8c9ea65..709979a 100644 (file)
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -65,3 +65,6 @@ dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
  dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
  dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
  dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
+
+# Negative ES2 tests
+dEQP-GLES2.functional.shaders.constant_expressions.invalid.precision_specifier
diff --git a/android/cts/master/src/gles3-incremental-deqp.txt b/android/cts/master/src/gles3-incremental-deqp.txt

new file mode 100644 (file)

index 0000000..061730c
--- /dev/null
+++ b/android/cts/master/src/gles3-incremental-deqp.txt
@@ -0,0 +1,74 @@
+# subset of gles3 tests
+dEQP-GLES3.info.vendor
+dEQP-GLES3.info.renderer
+dEQP-GLES3.info.version
+dEQP-GLES3.info.shading_language_version
+dEQP-GLES3.info.extensions
+dEQP-GLES3.info.render_target
+dEQP-GLES3.functional.prerequisite.state_reset
+dEQP-GLES3.functional.prerequisite.clear_color
+dEQP-GLES3.functional.prerequisite.read_pixels
+dEQP-GLES3.functional.implementation_limits.max_element_index
+dEQP-GLES3.functional.implementation_limits.subpixel_bits
+dEQP-GLES3.functional.color_clear.single_rgb
+dEQP-GLES3.functional.color_clear.single_rgba
+dEQP-GLES3.functional.color_clear.multiple_rgb
+dEQP-GLES3.functional.color_clear.multiple_rgba
+dEQP-GLES3.functional.texture.format.compressed.etc1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_r11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_r11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_rg11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.eac_signed_rg11_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_rgb8_punchthrough_alpha1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_srgb8_punchthrough_alpha1_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_rgba8_cube_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_2d_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_cube_pot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_2d_npot
+dEQP-GLES3.functional.texture.format.compressed.etc2_eac_srgb8_alpha8_cube_npot
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_b_fragment
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_rb_vertex
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_rb_fragment
+dEQP-GLES3.functional.shaders.swizzles.vector_swizzles.mediump_ivec3_bb_vertex
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_static_read_fragment
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_dynamic_read_vertex
+dEQP-GLES3.functional.shaders.indexing.matrix_subscript.mat4x2_dynamic_write_dynamic_read_fragment
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.highp_vec2_fragment
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.mediump_vec3_vertex
+dEQP-GLES3.functional.shaders.operator.angle_and_trigonometry.tanh.mediump_vec3_fragment
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.triangles
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
+dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.points
diff --git a/android/cts/master/src/gles3-spec-issues.txt b/android/cts/master/src/gles3-spec-issues.txt

index 2b7cf96..525eef9 100644 (file)
--- a/android/cts/master/src/gles3-spec-issues.txt
+++ b/android/cts/master/src/gles3-spec-issues.txt
@@ -510,9 +510,6 @@ dEQP-GLES3.functional.shaders.random.trigonometric.vertex.94
  # Khronos bugs 11207, 12408, internal bug 20699693
  dEQP-GLES3.functional.shaders.arrays.invalid.empty_declaration_without_var_name_*
  
-# Khronos bug 13916, internal bug 20558284
-dEQP-GLES3.functional.flush_finish.flush_wait
-
  # Khronos bug 14284, internal bug 22461511
  dEQP-GLES3.functional.shaders.linkage.uniform.block.layout_qualifier_mismatch_3
  
diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt

index 6f58d73..d691640 100644 (file)
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -149,3 +149,7 @@ dEQP-GLES3.functional.shaders.texture_functions.texturegrad.isamplercube_fragmen
  
  # Bug 26651667
  dEQP-GLES3.functional.draw.draw_elements_instanced.indices.buffer.index_byte
+
+# Khronos bug 13916, internal bugs 20558284, 143459817
+dEQP-GLES3.functional.flush_finish.*
+
diff --git a/android/cts/master/src/gles31-driver-issues.txt b/android/cts/master/src/gles31-driver-issues.txt

index e69de29..634df11 100644 (file)
--- a/android/cts/master/src/gles31-driver-issues.txt
+++ b/android/cts/master/src/gles31-driver-issues.txt
@@ -0,0 +1,2 @@
+# b/130880466
+dEQP-GLES31.functional.separate_shader.random.38
diff --git a/android/cts/master/src/gles31-temp-excluded.txt b/android/cts/master/src/gles31-temp-excluded.txt

index 2974117..bf72f10 100644 (file)
--- a/android/cts/master/src/gles31-temp-excluded.txt
+++ b/android/cts/master/src/gles31-temp-excluded.txt
@@ -1 +1,2 @@
  # Tests to be temporarily skipped for Android CI, but still enforced in CTS.
+
diff --git a/android/cts/master/src/gles31-test-issues.txt b/android/cts/master/src/gles31-test-issues.txt

index f0181d4..d818b8c 100644 (file)
--- a/android/cts/master/src/gles31-test-issues.txt
+++ b/android/cts/master/src/gles31-test-issues.txt
@@ -36,3 +36,6 @@ dEQP-GLES31.functional.debug.negative_coverage.get_error.texture.compressedtexim
  
  # Bug 28813504
  dEQP-GLES31.functional.ubo.random.all_per_block_buffers.41
+
+# Bug 122608943 shader generated is ridiculously large.
+dEQP-GLES31.functional.ssbo.layout.random.all_shared_buffer.48
diff --git a/android/cts/master/src/vk-incremental-deqp.txt b/android/cts/master/src/vk-incremental-deqp.txt

new file mode 100644 (file)

index 0000000..fd0f838
--- /dev/null
+++ b/android/cts/master/src/vk-incremental-deqp.txt
@@ -0,0 +1,354 @@
+# subset of vulkan tests
+dEQP-VK.info.build
+dEQP-VK.info.device
+dEQP-VK.info.platform
+dEQP-VK.info.memory_limits
+dEQP-VK.info.physical_devices
+dEQP-VK.info.physical_device_groups
+dEQP-VK.info.instance_layers
+dEQP-VK.info.instance_extensions
+dEQP-VK.info.device_features
+dEQP-VK.info.device_properties
+dEQP-VK.info.device_queue_family_properties
+dEQP-VK.info.device_memory_properties
+dEQP-VK.info.device_layers
+dEQP-VK.info.device_extensions
+dEQP-VK.info.device_no_khx_extensions
+dEQP-VK.info.device_memory_budget
+dEQP-VK.info.device_mandatory_features
+dEQP-VK.info.device_group_peer_memory_features
+dEQP-VK.api.version_check.version
+dEQP-VK.api.version_check.entry_points
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.smoke.create_sampler
+dEQP-VK.api.smoke.create_shader
+dEQP-VK.api.smoke.triangle
+dEQP-VK.api.smoke.triangle_ext_structs
+dEQP-VK.api.smoke.asm_triangle
+dEQP-VK.api.smoke.asm_triangle_no_opname
+dEQP-VK.api.smoke.unused_resolve_attachment
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_pot
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_pot
+dEQP-VK.texture.compressed.eac_r11g11_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_5x4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc1_rgba_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc2_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc4_snorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_pot
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc6h_ufloat_block_2d_pot
+dEQP-VK.texture.compressed.bc6h_sfloat_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8_srgb_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8a1_unorm_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8a1_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_npot
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.eac_r11g11_unorm_block_2d_npot
+dEQP-VK.texture.compressed.eac_r11g11_snorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_npot
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_npot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_npot
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc1_rgba_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_npot
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_npot
+dEQP-VK.texture.compressed.bc6h_ufloat_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_npot_sparse
+dEQP-VK.api.info.format_properties.r4g4_unorm_pack8
+dEQP-VK.api.info.format_properties.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.format_properties.b4g4r4a4_unorm_pack16
+dEQP-VK.api.info.format_properties.r5g6b5_unorm_pack16
+dEQP-VK.api.info.format_properties.g16b16g16r16_422_unorm
+dEQP-VK.api.info.format_properties.b16g16r16g16_422_unorm
+dEQP-VK.api.info.format_properties.g16_b16_r16_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties.3d.linear.r64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.b10g11r11_ufloat_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.d16_unorm
+dEQP-VK.api.info.image_format_properties.3d.linear.x8_d24_unorm_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.d32_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d16_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d24_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d32_sfloat_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgb_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgb_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgba_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgba_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc2_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc2_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc3_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc3_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc4_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc5_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc6h_ufloat_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc6h_sfloat_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc7_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc7_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a1_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a1_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11g11_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11g11_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_4x4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_4x4_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x4_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x10_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x10_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x10_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x10_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_srgb_block
+dEQP-VK.api.info.get_physical_device_properties2.features
+dEQP-VK.api.info.get_physical_device_properties2.properties
+dEQP-VK.api.info.get_physical_device_properties2.format_properties
+dEQP-VK.api.info.get_physical_device_properties2.queue_family_properties
+dEQP-VK.api.info.get_physical_device_properties2.memory_properties
+dEQP-VK.api.info.vulkan1p2.features
+dEQP-VK.api.info.vulkan1p2.properties
+dEQP-VK.api.info.vulkan1p2.feature_extensions_consistency
+dEQP-VK.api.info.vulkan1p2.property_extensions_consistency
+dEQP-VK.api.info.vulkan1p2.feature_bits_influence
+dEQP-VK.api.info.vulkan1p2_limits_validation.general
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_push_descriptor
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_multiview
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_discard_rectangles
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_sample_locations
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_external_memory_host
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_blend_operation_advanced
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_maintenance_3
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_conservative_rasterization
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_descriptor_indexing
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_inline_uniform_block
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_vertex_attribute_divisor
+dEQP-VK.api.info.vulkan1p2_limits_validation.nv_mesh_shader
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_transform_feedback
+dEQP-VK.api.info.vulkan1p2_limits_validation.fragment_density_map
+dEQP-VK.api.info.vulkan1p2_limits_validation.nv_ray_tracing
+dEQP-VK.api.info.vulkan1p2_limits_validation.timeline_semaphore
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_line_rasterization
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r4g4_unorm_pack8
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.optimal.b4g4r4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r5g6b5_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_sint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_sfloat
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b10g11r11_ufloat_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d16_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.x8_d24_unorm_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d32_sfloat
+dEQP-VK.api.info.image_format_properties2.2d.optimal.s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d16_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d24_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d32_sfloat_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgb_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgb_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgba_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgba_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc2_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc2_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc3_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc3_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc4_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc5_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc6h_ufloat_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc6h_sfloat_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc7_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc7_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a1_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a1_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11g11_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11g11_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_4x4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_4x4_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x4_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x10_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x10_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x10_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x10_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x12_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x12_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8b8g8r8_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b8g8r8g8_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8r8_2plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8r8_2plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_444_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6g10x6_unorm_2pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6g10x6b10x6a10x6_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6b10x6g10x6r10x6_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b10x6g10x6r10x6g10x6_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6r10x6_2plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6r10x6_2plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_444_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4g12x4_unorm_2pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4g12x4b12x4a12x4_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4b12x4g12x4r12x4_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b12x4g12x4r12x4g12x4_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4r12x4_2plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4r12x4_2plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_444_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16b16g16r16_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b16g16r16g16_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16r16_2plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16r16_2plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_444_unorm
+dEQP-VK.api.info.image_format_properties2.2d.linear.r4g4_unorm_pack8
+dEQP-VK.api.info.image_format_properties2.2d.linear.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.linear.b4g4r4a4_unorm_pack16
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.compute_tests.compute_stage
+dEQP-VK.pipeline.cache.merge.vertex_stage_fragment_stage.src_empty_dst_empty
+dEQP-VK.pipeline.cache.merge.vertex_stage_fragment_stage.src_empty_empty_dst_empty
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_primary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_secondary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_secondary_inherited
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_primary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_secondary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_secondary_inherited
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.8192
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.65536
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_transfer_src.1024
+dEQP-VK.api.descriptor_set.descriptor_set_layout_lifetime.graphics
+dEQP-VK.api.descriptor_set.descriptor_set_layout_lifetime.compute
+dEQP-VK.api.descriptor_set.descriptor_set_layout.empty_set.normal
+dEQP-VK.api.descriptor_set.descriptor_set_layout.empty_set.push_descriptor
+dEQP-VK.api.pipeline.renderpass.destroy_pipeline_renderpass
+dEQP-VK.api.pipeline.renderpass.framebuffer_compatible_renderpass
+dEQP-VK.api.pipeline.pipeline_layout.lifetime.graphics
+dEQP-VK.api.pipeline.pipeline_layout.lifetime.compute
+dEQP-VK.api.invariance.random
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_never
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_less
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_equal
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_vert
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_tessc
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_tesse
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_geom
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_frag
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_comp
+dEQP-VK.glsl.derivate.dfdx.texture.basic.float_mediump
+dEQP-VK.glsl.derivate.dfdx.texture.basic.float_highp
+dEQP-VK.glsl.derivate.dfdx.texture.basic.vec2_mediump
diff --git a/android/cts/master/src/vk-master-2019-03-01.txt b/android/cts/master/src/vk-master-2019-03-01.txt

index 9fc179a..3261b42 100644 (file)
--- a/android/cts/master/src/vk-master-2019-03-01.txt
+++ b/android/cts/master/src/vk-master-2019-03-01.txt
@@ -220386,7 +220386,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitl
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.iublimithigh.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.iublimithigh.uab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.iublimithigh.uab.vert.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.uab.comp.noia.0
@@ -220652,7 +220651,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.nouab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.frag.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.vert.noia.0
@@ -302651,8 +302649,6 @@ dEQP-VK.draw.zero_viewport_height.front_cw_cull_front
  dEQP-VK.draw.zero_viewport_height.front_cw_cull_back
  dEQP-VK.draw.zero_viewport_height.front_cw_cull_both
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltazero
-dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltasmall
-dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltaone
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_depth_range_unrestricted
  dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltasmall
  dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltaone
diff --git a/android/cts/master/src/vk-master-2020-03-01.txt b/android/cts/master/src/vk-master-2020-03-01.txt

index 64453b2..85fc215 100644 (file)
--- a/android/cts/master/src/vk-master-2020-03-01.txt
+++ b/android/cts/master/src/vk-master-2020-03-01.txt
@@ -81217,7 +81217,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimit
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.lowimgnotex.iublimitlow.nouab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.lowimgsingletex.noiub.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.lowimgsingletex.noiub.uab.frag.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.lowimgsingletex.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.noiub.uab.rgen.noia.0
@@ -81351,11 +81350,9 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.1
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.2
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.3
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.4
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.5
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.6
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.7
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.8
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.9
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.iublimithigh.nouab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimithigh.nouab.rgen.noia.0
@@ -81441,10 +81438,8 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.iublimitlow.nouab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.comp.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.noiub.uab.frag.ialimithigh.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.outimgtexlow.noiub.uab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.iublimithigh.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.iublimithigh.nouab.frag.ialimithigh.0
@@ -81455,7 +81450,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.iublimitlow.uab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimitlow.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.outimgtexlow.iublimitlow.uab.rgen.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.noiub.nouab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimithigh.uab.comp.noia.0
diff --git a/android/cts/master/src/vk-temp-excluded.txt b/android/cts/master/src/vk-temp-excluded.txt

index 2974117..bf72f10 100644 (file)
--- a/android/cts/master/src/vk-temp-excluded.txt
+++ b/android/cts/master/src/vk-temp-excluded.txt
@@ -1 +1,2 @@
  # Tests to be temporarily skipped for Android CI, but still enforced in CTS.
+
diff --git a/android/cts/master/src/vk-test-issues.txt b/android/cts/master/src/vk-test-issues.txt

index e5f64e7..6ea8c91 100644 (file)
--- a/android/cts/master/src/vk-test-issues.txt
+++ b/android/cts/master/src/vk-test-issues.txt
@@ -10,3 +10,6 @@ dEQP-VK.glsl.texture_functions.texturegrad.sparse_samplercubeshadow_vertex
  
  # b/135200048: Compile time is unreasonable on low-end parts, revisit for R
  dEQP-VK.ssbo.layout.random.scalar.75
+
+# b/156595708: Randomly generated shader is unusually large compared to the others.
+dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
diff --git a/android/cts/master/src/vk-waivers.txt b/android/cts/master/src/vk-waivers.txt

index 8dbf1d4..ce19ead 100644 (file)
--- a/android/cts/master/src/vk-waivers.txt
+++ b/android/cts/master/src/vk-waivers.txt
@@ -66,3 +66,42 @@ dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltazero
  # accesses at device scope.
  #
  dEQP-VK.memory_model.*core11*.device.*
+
+#
+# VK-GL-CTS CL: 6171
+# VK-GL-CTS issue: 229
+# VK-GL-CTS issue: 2418
+# VK-GL-CTS issue: 2189
+#
+# IMG Rogue SNORM Waiver.
+#
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_right
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.centered
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_left
+dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_right
diff --git a/android/cts/master/vk-incremental-deqp.txt b/android/cts/master/vk-incremental-deqp.txt

new file mode 100644 (file)

index 0000000..ce0b335
--- /dev/null
+++ b/android/cts/master/vk-incremental-deqp.txt
@@ -0,0 +1,353 @@
+dEQP-VK.info.build
+dEQP-VK.info.device
+dEQP-VK.info.platform
+dEQP-VK.info.memory_limits
+dEQP-VK.info.physical_devices
+dEQP-VK.info.physical_device_groups
+dEQP-VK.info.instance_layers
+dEQP-VK.info.instance_extensions
+dEQP-VK.info.device_features
+dEQP-VK.info.device_properties
+dEQP-VK.info.device_queue_family_properties
+dEQP-VK.info.device_memory_properties
+dEQP-VK.info.device_layers
+dEQP-VK.info.device_extensions
+dEQP-VK.info.device_no_khx_extensions
+dEQP-VK.info.device_memory_budget
+dEQP-VK.info.device_mandatory_features
+dEQP-VK.info.device_group_peer_memory_features
+dEQP-VK.api.version_check.version
+dEQP-VK.api.version_check.entry_points
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.smoke.create_sampler
+dEQP-VK.api.smoke.create_shader
+dEQP-VK.api.smoke.triangle
+dEQP-VK.api.smoke.triangle_ext_structs
+dEQP-VK.api.smoke.asm_triangle
+dEQP-VK.api.smoke.asm_triangle_no_opname
+dEQP-VK.api.smoke.unused_resolve_attachment
+dEQP-VK.api.info.format_properties.r4g4_unorm_pack8
+dEQP-VK.api.info.format_properties.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.format_properties.b4g4r4a4_unorm_pack16
+dEQP-VK.api.info.format_properties.r5g6b5_unorm_pack16
+dEQP-VK.api.info.format_properties.g16b16g16r16_422_unorm
+dEQP-VK.api.info.format_properties.b16g16r16g16_422_unorm
+dEQP-VK.api.info.format_properties.g16_b16_r16_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties.3d.linear.r64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_sint
+dEQP-VK.api.info.image_format_properties.3d.linear.r64g64b64a64_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.b10g11r11_ufloat_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.d16_unorm
+dEQP-VK.api.info.image_format_properties.3d.linear.x8_d24_unorm_pack32
+dEQP-VK.api.info.image_format_properties.3d.linear.d32_sfloat
+dEQP-VK.api.info.image_format_properties.3d.linear.s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d16_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d24_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.d32_sfloat_s8_uint
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgb_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgb_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgba_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc1_rgba_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc2_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc2_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc3_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc3_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc4_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc5_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc6h_ufloat_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc6h_sfloat_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc7_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.bc7_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a1_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a1_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.etc2_r8g8b8a8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11g11_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.eac_r11g11_snorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_4x4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_4x4_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x4_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x4_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_6x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_8x8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x5_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x5_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x6_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x6_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x8_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x8_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x10_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_10x10_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x10_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x10_srgb_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_unorm_block
+dEQP-VK.api.info.image_format_properties.3d.linear.astc_12x12_srgb_block
+dEQP-VK.api.info.get_physical_device_properties2.features
+dEQP-VK.api.info.get_physical_device_properties2.properties
+dEQP-VK.api.info.get_physical_device_properties2.format_properties
+dEQP-VK.api.info.get_physical_device_properties2.queue_family_properties
+dEQP-VK.api.info.get_physical_device_properties2.memory_properties
+dEQP-VK.api.info.vulkan1p2.features
+dEQP-VK.api.info.vulkan1p2.properties
+dEQP-VK.api.info.vulkan1p2.feature_extensions_consistency
+dEQP-VK.api.info.vulkan1p2.property_extensions_consistency
+dEQP-VK.api.info.vulkan1p2.feature_bits_influence
+dEQP-VK.api.info.vulkan1p2_limits_validation.general
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_push_descriptor
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_multiview
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_discard_rectangles
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_sample_locations
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_external_memory_host
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_blend_operation_advanced
+dEQP-VK.api.info.vulkan1p2_limits_validation.khr_maintenance_3
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_conservative_rasterization
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_descriptor_indexing
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_inline_uniform_block
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_vertex_attribute_divisor
+dEQP-VK.api.info.vulkan1p2_limits_validation.nv_mesh_shader
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_transform_feedback
+dEQP-VK.api.info.vulkan1p2_limits_validation.fragment_density_map
+dEQP-VK.api.info.vulkan1p2_limits_validation.nv_ray_tracing
+dEQP-VK.api.info.vulkan1p2_limits_validation.timeline_semaphore
+dEQP-VK.api.info.vulkan1p2_limits_validation.ext_line_rasterization
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r4g4_unorm_pack8
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.optimal.b4g4r4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.optimal.r5g6b5_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.1d.linear.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_sint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r64g64b64a64_sfloat
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b10g11r11_ufloat_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.e5b9g9r9_ufloat_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d16_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.x8_d24_unorm_pack32
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d32_sfloat
+dEQP-VK.api.info.image_format_properties2.2d.optimal.s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d16_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d24_unorm_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.d32_sfloat_s8_uint
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgb_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgb_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgba_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc1_rgba_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc2_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc2_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc3_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc3_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc4_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc5_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc6h_ufloat_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc6h_sfloat_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc7_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.bc7_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a1_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a1_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.etc2_r8g8b8a8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11g11_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.eac_r11g11_snorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_4x4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_4x4_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x4_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x4_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_5x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_6x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_8x8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x5_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x5_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x6_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x6_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x8_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x8_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x10_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_10x10_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x10_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x10_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x12_unorm_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.astc_12x12_srgb_block
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8b8g8r8_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b8g8r8g8_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8r8_2plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8r8_2plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g8_b8_r8_3plane_444_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6g10x6_unorm_2pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r10x6g10x6b10x6a10x6_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6b10x6g10x6r10x6_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b10x6g10x6r10x6g10x6_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6r10x6_2plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6r10x6_2plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g10x6_b10x6_r10x6_3plane_444_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4g12x4_unorm_2pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.r12x4g12x4b12x4a12x4_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4b12x4g12x4r12x4_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b12x4g12x4r12x4g12x4_422_unorm_4pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4r12x4_2plane_420_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4r12x4_2plane_422_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g12x4_b12x4_r12x4_3plane_444_unorm_3pack16
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16b16g16r16_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.b16g16r16g16_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16r16_2plane_420_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16r16_2plane_422_unorm
+dEQP-VK.api.info.image_format_properties2.2d.optimal.g16_b16_r16_3plane_444_unorm
+dEQP-VK.api.info.image_format_properties2.2d.linear.r4g4_unorm_pack8
+dEQP-VK.api.info.image_format_properties2.2d.linear.r4g4b4a4_unorm_pack16
+dEQP-VK.api.info.image_format_properties2.2d.linear.b4g4r4a4_unorm_pack16
+dEQP-VK.api.descriptor_set.descriptor_set_layout_lifetime.graphics
+dEQP-VK.api.descriptor_set.descriptor_set_layout_lifetime.compute
+dEQP-VK.api.descriptor_set.descriptor_set_layout.empty_set.normal
+dEQP-VK.api.descriptor_set.descriptor_set_layout.empty_set.push_descriptor
+dEQP-VK.api.pipeline.renderpass.destroy_pipeline_renderpass
+dEQP-VK.api.pipeline.renderpass.framebuffer_compatible_renderpass
+dEQP-VK.api.pipeline.pipeline_layout.lifetime.graphics
+dEQP-VK.api.pipeline.pipeline_layout.lifetime.compute
+dEQP-VK.api.invariance.random
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.8192
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.65536
+dEQP-VK.memory.pipeline_barrier.host_read_host_write.1048576
+dEQP-VK.memory.pipeline_barrier.host_write_transfer_src.1024
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_never
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_less
+dEQP-VK.pipeline.stencil.format.s8_uint.states.fail_keep.pass_keep.dfail_keep.comp_equal
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.graphics_tests.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_get_data.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_geometry_stage_fragment_stage
+dEQP-VK.pipeline.cache.pipeline_from_incomplete_get_data.vertex_stage_tessellation_control_stage_tessellation_evaluation_stage_fragment_stage
+dEQP-VK.pipeline.cache.compute_tests.compute_stage
+dEQP-VK.pipeline.cache.merge.vertex_stage_fragment_stage.src_empty_dst_empty
+dEQP-VK.pipeline.cache.merge.vertex_stage_fragment_stage.src_empty_empty_dst_empty
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_vert
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_tessc
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_tesse
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_geom
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_frag
+dEQP-VK.spirv_assembly.type.vec4.u16.bitwise_and_comp
+dEQP-VK.glsl.derivate.dfdx.texture.basic.float_mediump
+dEQP-VK.glsl.derivate.dfdx.texture.basic.float_highp
+dEQP-VK.glsl.derivate.dfdx.texture.basic.vec2_mediump
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_primary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_secondary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.32bits_secondary_inherited
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_primary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_secondary
+dEQP-VK.query_pool.statistics_query.compute_shader_invocations.64bits_secondary_inherited
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_pot
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_pot
+dEQP-VK.texture.compressed.eac_r11g11_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_5x4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_pot
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc1_rgba_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc2_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc4_snorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_pot
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc6h_ufloat_block_2d_pot
+dEQP-VK.texture.compressed.bc6h_sfloat_block_2d_pot_sparse
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_pot
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_pot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8_srgb_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.etc2_r8g8b8a1_unorm_block_2d_npot
+dEQP-VK.texture.compressed.etc2_r8g8b8a1_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_npot
+dEQP-VK.texture.compressed.eac_r11_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.eac_r11g11_unorm_block_2d_npot
+dEQP-VK.texture.compressed.eac_r11g11_snorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_npot
+dEQP-VK.texture.compressed.astc_4x4_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_npot
+dEQP-VK.texture.compressed.astc_12x12_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_npot
+dEQP-VK.texture.compressed.astc_12x12_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc1_rgb_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc1_rgba_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc2_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc3_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_npot
+dEQP-VK.texture.compressed.bc3_srgb_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc4_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc5_unorm_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc5_snorm_block_2d_npot
+dEQP-VK.texture.compressed.bc6h_ufloat_block_2d_npot_sparse
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_npot
+dEQP-VK.texture.compressed.bc7_unorm_block_2d_npot_sparse
diff --git a/android/cts/master/vk-master-2019-03-01.txt b/android/cts/master/vk-master-2019-03-01.txt

index 2a26d0f..0900358 100644 (file)
--- a/android/cts/master/vk-master-2019-03-01.txt
+++ b/android/cts/master/vk-master-2019-03-01.txt
@@ -220380,7 +220380,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithi
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.iublimithigh.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.iublimithigh.uab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimithigh.sampledimglow.outimgtexlow.iublimithigh.uab.vert.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.rgen.noia.0
@@ -220646,7 +220645,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.nouab.vert.noia.9
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.frag.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimitlow.nouab.vert.noia.0
@@ -302651,8 +302649,6 @@ dEQP-VK.draw.zero_viewport_height.front_cw_cull_front
  dEQP-VK.draw.zero_viewport_height.front_cw_cull_back
  dEQP-VK.draw.zero_viewport_height.front_cw_cull_both
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltazero
-dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltasmall
-dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltaone
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_depth_range_unrestricted
  dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltasmall
  dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltaone
diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt

index 8bb9cfc..424a67c 100644 (file)
--- a/android/cts/master/vk-master-2020-03-01.txt
+++ b/android/cts/master/vk-master-2020-03-01.txt
@@ -81198,7 +81198,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimit
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgnotex.iublimithigh.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgnotex.iublimithigh.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.noiub.nouab.frag.ialimitlow.0
-dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.iublimitlow.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.iublimitlow.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.iublimithigh.nouab.frag.ialimitlow.0
@@ -81351,11 +81350,9 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.1
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.2
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.3
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.4
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.5
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.6
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.7
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.8
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.9
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.uab.frag.ialimitlow.0
@@ -81384,7 +81381,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.iublimithigh.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.iublimithigh.uab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgsingletex.iublimithigh.uab.frag.ialimithigh.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.iublimitlow.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.iublimithigh.nouab.frag.ialimitlow.0
@@ -81455,8 +81451,6 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimithigh.nouab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.iublimithigh.uab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.comp.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.frag.noia.0
-dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimitlow.uab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimitlow.uab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.iublimitlow.uab.vert.noia.0
diff --git a/android/cts/master/vk-master-2021-03-01.txt b/android/cts/master/vk-master-2021-03-01.txt

index d9cf9d9..2cea495 100644 (file)
--- a/android/cts/master/vk-master-2021-03-01.txt
+++ b/android/cts/master/vk-master-2021-03-01.txt
@@ -62933,24 +62933,12 @@ dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.normalized_coords.
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.edge_right
@@ -63077,12 +63065,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.normalized_coords.edge
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.edge_right
@@ -63101,12 +63083,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.normalized_coords.ed
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.edge_right
@@ -63269,12 +63245,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.normalized_coords.edg
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.edge_right
@@ -78678,6 +78648,7 @@ dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimitlo
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimitlow.sampledimghigh.outimgtexlow.iublimitlow.uab.chit.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimitlow.sampledimghigh.outimgtexlow.iublimitlow.uab.miss.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimitlow.sbolimitlow.sampledimghigh.outimgtexlow.iublimitlow.uab.call.noia.0
+dEQP-VK.binding_model.descriptorset_random.sets4.constant.ubolimithigh.sbolimitlow.sampledimglow.outimgtexlow.noiub.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.unifindexed.noubo.nosbo.nosampledimg.outimgonly.noiub.nouab.comp.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.unifindexed.noubo.nosbo.nosampledimg.outimgonly.noiub.nouab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.unifindexed.noubo.nosbo.nosampledimg.outimgonly.noiub.nouab.frag.ialimitlow.0
@@ -84990,6 +84961,7 @@ dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimit
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.uab.chit.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.uab.miss.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimitlow.sampledimghigh.lowimgsingletex.iublimithigh.uab.call.noia.0
+dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.nosampledimg.lowimgsingletex.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.outimgonly.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.outimgonly.noiub.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.dynindexed.ubolimitlow.sbolimithigh.sampledimglow.outimgonly.iublimitlow.nouab.frag.ialimitlow.0
@@ -87258,6 +87230,8 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.nosbo.s
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.nosbo.sampledimghigh.lowimgsingletex.iublimitlow.uab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.nosbo.sampledimghigh.lowimgsingletex.iublimithigh.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.nosbo.sampledimghigh.lowimgsingletex.iublimithigh.uab.frag.ialimitlow.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.4
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.outimgtexlow.noiub.nouab.frag.ialimitlow.8
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.noiub.nouab.frag.ialimitlow.1
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgnotex.noiub.nouab.frag.ialimitlow.2
@@ -87311,6 +87285,7 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgsingletex.iublimithigh.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgsingletex.iublimithigh.nouab.frag.ialimithigh.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.lowimgsingletex.iublimithigh.uab.frag.ialimitlow.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.nosampledimg.storageimghigh.iublimitlow.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.outimgonly.noiub.nouab.frag.ialimitlow.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.outimgonly.noiub.nouab.frag.ialimitlow.1
@@ -87680,6 +87655,7 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.frag.ialimitlow.8
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.frag.ialimitlow.9
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.frag.ialimithigh.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.rgnv.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.rgnv.noia.1
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.lowimgnotex.noiub.uab.rgnv.noia.2
@@ -88053,7 +88029,9 @@ dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimi
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.nouab.chit.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.nouab.miss.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.nouab.call.noia.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.frag.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.frag.ialimitlow.0
+dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.vert.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.rgnv.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.rgen.noia.0
  dEQP-VK.binding_model.descriptorset_random.sets4.runtimesize.ubolimitlow.sbolimitlow.sampledimglow.storageimghigh.noiub.uab.sect.noia.0
@@ -110940,7 +110918,6 @@ dEQP-VK.ssbo.phys.layout.multi_nested_struct.single_buffer.scalar_store_cols
  dEQP-VK.ssbo.phys.layout.multi_nested_struct.single_buffer.scalar_comp_access_store_cols
  dEQP-VK.ssbo.phys.layout.multi_nested_struct.single_buffer.scalar_instance_array_store_cols
  dEQP-VK.ssbo.phys.layout.multi_nested_struct.single_buffer.scalar_instance_array_comp_access_store_cols
-dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
  dEQP-VK.query_pool.concurrent_queries.primary_command_buffer
  dEQP-VK.query_pool.concurrent_queries.secondary_command_buffer
  dEQP-VK.draw.indirect_draw.sequential.indirect_draw_param_count.triangle_list
@@ -110959,6 +110936,8 @@ dEQP-VK.draw.indirect_draw.indexed.indirect_draw_param_count_instanced.no_first_
  dEQP-VK.draw.indirect_draw.indexed.indirect_draw_param_count_instanced.no_first_instance.triangle_strip
  dEQP-VK.draw.indirect_draw.indexed.indirect_draw_param_count_instanced.first_instance.triangle_list
  dEQP-VK.draw.indirect_draw.indexed.indirect_draw_param_count_instanced.first_instance.triangle_strip
+dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltasmall
+dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltaone
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltaone_bias_clamp_neg
  dEQP-VK.draw.inverted_depth_ranges.depthclamp_deltasmall_bias_clamp_pos
  dEQP-VK.draw.inverted_depth_ranges.nodepthclamp_deltaone_bias_clamp_neg
diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt

index 203b087..932426d 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -293787,24 +293787,12 @@ dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.normalized_coords.
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.normalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8b8a8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_uint.gradient.normalized_coords.edge_right
@@ -293931,12 +293919,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.normalized_coords.edge
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_sint.gradient.normalized_coords.edge_right
@@ -293955,12 +293937,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.normalized_coords.ed
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r8g8_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.b8g8r8_unorm.gradient.normalized_coords.edge_right
@@ -294123,12 +294099,6 @@ dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.normalized_coords.edg
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.gradient.unnormalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.normalized_coords.edge_right
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.centered
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_left
-dEQP-VK.pipeline.sampler.exact_sampling.r16_snorm.solid_color.unnormalized_coords.edge_right
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.centered
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.edge_left
  dEQP-VK.pipeline.sampler.exact_sampling.r32_sfloat.gradient.normalized_coords.edge_right
@@ -521062,7 +521032,6 @@ dEQP-VK.ssbo.phys.layout.random.16bit.scalar.9
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.10
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.11
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.12
-dEQP-VK.ssbo.phys.layout.random.16bit.scalar.13
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.14
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.15
  dEQP-VK.ssbo.phys.layout.random.16bit.scalar.16
diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java

index 07c38ba..bbcdd42 100644 (file)
--- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@ -25,6 +25,7 @@ import com.android.tradefed.build.IBuildInfo;
  import com.android.tradefed.config.Option;
  import com.android.tradefed.config.OptionClass;
  import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.IManagedTestDevice;
  import com.android.tradefed.device.ITestDevice;
  import com.android.tradefed.log.LogUtil.CLog;
  import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
@@ -42,6 +43,7 @@ import com.android.tradefed.testtype.IShardableTest;
  import com.android.tradefed.testtype.ITestCollector;
  import com.android.tradefed.testtype.ITestFilterReceiver;
  import com.android.tradefed.util.AbiUtils;
+import com.android.tradefed.util.FileUtil;
  import com.android.tradefed.util.IRunUtil;
  import com.android.tradefed.util.RunInterruptedException;
  import com.android.tradefed.util.RunUtil;
@@ -52,11 +54,8 @@ import java.io.FileNotFoundException;
  import java.io.FileReader;
  import java.io.IOException;
  import java.io.Reader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
  import java.util.ArrayList;
  import java.util.Collection;
-import java.util.Collections;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
@@ -85,8 +84,9 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      private static final String INCOMPLETE_LOG_MESSAGE = "Crash: Incomplete test log";
      private static final String SKIPPED_INSTANCE_LOG_MESSAGE = "Configuration skipped";
      private static final String NOT_EXECUTABLE_LOG_MESSAGE = "Abort: Test cannot be executed";
-    private static final String CASE_LIST_FILE_NAME = "/sdcard/dEQP-TestCaseList.txt";
-    private static final String LOG_FILE_NAME = "/sdcard/TestLog.qpa";
+    private static final String APP_DIR = "/sdcard/";
+    private static final String CASE_LIST_FILE_NAME = "dEQP-TestCaseList.txt";
+    private static final String LOG_FILE_NAME = "TestLog.qpa";
      public static final String FEATURE_LANDSCAPE = "android.hardware.screen.landscape";
      public static final String FEATURE_PORTRAIT = "android.hardware.screen.portrait";
      public static final String FEATURE_VULKAN_LEVEL = "android.hardware.vulkan.level";
@@ -96,6 +96,10 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      private static final int TESTCASE_BATCH_LIMIT = 1000;
      private static final int UNRESPONSIVE_CMD_TIMEOUT_MS = 10 * 60 * 1000; // 10min
  
+    private static final String ANGLE_NONE = "none";
+    private static final String ANGLE_VULKAN = "vulkan";
+    private static final String ANGLE_OPENGLES = "opengles";
+
      // !NOTE: There's a static method copyOptions() for copying options during split.
      // If you add state update copyOptions() as appropriate!
  
@@ -145,6 +149,17 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
              description="The estimated config runtime. Defaults to 200ms x num tests.")
      private long mRuntimeHint = -1;
  
+    @Option(name="deqp-use-angle",
+            description="ANGLE backend ('none', 'vulkan', 'opengles'). Defaults to 'none' (don't use ANGLE)",
+            importance=Option.Importance.NEVER)
+    private String mAngle = "none";
+
+    @Option(
+            name = "disable-watchdog",
+            description =
+                    "Disable the native testrunner's per-test watchdog.")
+    private boolean mDisableWatchdog = false;
+
      private Collection<TestDescription> mRemainingTests = null;
      private Map<TestDescription, Set<BatchRunConfiguration>> mTestInstances = null;
      private final TestInstanceResultListener mInstanceListerner = new TestInstanceResultListener();
@@ -992,31 +1007,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
          }
  
          public void recoverDevice() throws DeviceNotAvailableException {
-            // Work around the API. We need to call recoverDevice() on the test device and
-            // we know that mDevice is a TestDevice. However even though the recoverDevice()
-            // method is public suggesting it should be publicly accessible, the class itself
-            // and its super-interface (IManagedTestDevice) are package-private.
-            final Method recoverDeviceMethod;
-            try {
-                recoverDeviceMethod = mDevice.getClass().getMethod("recoverDevice");
-                recoverDeviceMethod.setAccessible(true);
-            } catch (NoSuchMethodException ex) {
-                throw new AssertionError("Test device must have recoverDevice()");
-            }
-
-            try {
-                recoverDeviceMethod.invoke(mDevice);
-            } catch (InvocationTargetException ex) {
-                if (ex.getCause() instanceof DeviceNotAvailableException) {
-                    throw (DeviceNotAvailableException)ex.getCause();
-                } else if (ex.getCause() instanceof RuntimeException) {
-                    throw (RuntimeException)ex.getCause();
-                } else {
-                    throw new AssertionError("unexpected throw", ex);
-                }
-            } catch (IllegalAccessException ex) {
-                throw new AssertionError("unexpected throw", ex);
-            }
+            ((IManagedTestDevice) mDevice).recoverDevice();
          }
  
          private void rebootDevice() throws DeviceNotAvailableException {
@@ -1424,17 +1415,19 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
          checkInterrupted(); // throws if interrupted
  
          final String testCases = generateTestCaseTrie(batch.tests);
-
-        mDevice.executeShellCommand("rm " + CASE_LIST_FILE_NAME);
-        mDevice.executeShellCommand("rm " + LOG_FILE_NAME);
-        mDevice.pushString(testCases + "\n", CASE_LIST_FILE_NAME);
+        final String testCaseFilename = APP_DIR + CASE_LIST_FILE_NAME;
+        mDevice.executeShellCommand("rm " + testCaseFilename);
+        mDevice.executeShellCommand("rm " + APP_DIR + LOG_FILE_NAME);
+        if (!mDevice.pushString(testCases + "\n", testCaseFilename)) {
+            throw new RuntimeException("Failed to write test cases to " + testCaseFilename);
+        }
  
          final String instrumentationName =
                  "com.drawelements.deqp/com.drawelements.deqp.testercore.DeqpInstrumentation";
  
          final StringBuilder deqpCmdLine = new StringBuilder();
          deqpCmdLine.append("--deqp-caselist-file=");
-        deqpCmdLine.append(CASE_LIST_FILE_NAME);
+        deqpCmdLine.append(APP_DIR + CASE_LIST_FILE_NAME);
          deqpCmdLine.append(" ");
          deqpCmdLine.append(getRunConfigDisplayCmdLine(batch.config));
  
@@ -1443,13 +1436,15 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
              deqpCmdLine.append(" --deqp-log-images=disable");
          }
  
-        deqpCmdLine.append(" --deqp-watchdog=enable");
+        if (!mDisableWatchdog) {
+            deqpCmdLine.append(" --deqp-watchdog=enable");
+        }
  
          final String command = String.format(
                  "am instrument %s -w -e deqpLogFileName \"%s\" -e deqpCmdLine \"%s\""
                      + " -e deqpLogData \"%s\" %s",
-                AbiUtils.createAbiFlag(mAbi.getName()), LOG_FILE_NAME, deqpCmdLine.toString(),
-                mLogData, instrumentationName);
+                AbiUtils.createAbiFlag(mAbi.getName()), APP_DIR + LOG_FILE_NAME,
+                deqpCmdLine.toString(), mLogData, instrumentationName);
  
          final int numRemainingInstancesBefore = getNumRemainingInstances();
          final InstrumentationParser parser = new InstrumentationParser(mInstanceListerner);
@@ -1939,6 +1934,10 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      private static Set<String> getNonPatternFilters(List<String> filters) {
          Set<String> nonPatternFilters = new HashSet<String>();
          for (String filter : filters) {
+            if (filter.startsWith("#") || filter.isEmpty()) {
+                // Skip comments and empty lines
+                continue;
+            }
              if (!filter.contains("*")) {
                  // Deqp usesly only dots for separating between parts of the names
                  // Convert last dot to hash if needed.
@@ -2052,7 +2051,13 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
              if (reader == null) {
                  File testlist = new File(mBuildHelper.getTestsDir(), mCaselistFile);
                  if (!testlist.isFile()) {
-                    throw new FileNotFoundException();
+                    // Finding file in sub directory if no matching file in the first layer of
+                    // testdir.
+                    testlist = FileUtil.findFile(mBuildHelper.getTestsDir(), mCaselistFile);
+                    if (testlist == null || !testlist.isFile()) {
+                        throw new FileNotFoundException("Cannot find deqp test list file: "
+                            + mCaselistFile);
+                    }
                  }
                  reader = new FileReader(testlist);
              }
@@ -2103,11 +2108,67 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
      }
  
      /**
+     * Set up the test environment.
+     */
+    private void setupTestEnvironment() throws DeviceNotAvailableException {
+        try {
+            // Get the system into a known state.
+            // Clear ANGLE Global.Settings values
+            mDevice.executeShellCommand("settings delete global angle_gl_driver_selection_pkgs");
+            mDevice.executeShellCommand("settings delete global angle_gl_driver_selection_values");
+
+            // ANGLE
+            if (mAngle.equals(ANGLE_VULKAN)) {
+                CLog.i("Configuring ANGLE to use: " + mAngle);
+                // Force dEQP to use ANGLE
+                mDevice.executeShellCommand(
+                    "settings put global angle_gl_driver_selection_pkgs " + DEQP_ONDEVICE_PKG);
+                mDevice.executeShellCommand(
+                    "settings put global angle_gl_driver_selection_values angle");
+                // Configure ANGLE to use Vulkan
+                mDevice.executeShellCommand("setprop debug.angle.backend 2");
+            } else if (mAngle.equals(ANGLE_OPENGLES)) {
+                CLog.i("Configuring ANGLE to use: " + mAngle);
+                // Force dEQP to use ANGLE
+                mDevice.executeShellCommand(
+                    "settings put global angle_gl_driver_selection_pkgs " + DEQP_ONDEVICE_PKG);
+                mDevice.executeShellCommand(
+                    "settings put global angle_gl_driver_selection_values angle");
+                // Configure ANGLE to use Vulkan
+                mDevice.executeShellCommand("setprop debug.angle.backend 0");
+            }
+        } catch (DeviceNotAvailableException ex) {
+            // chain forward
+            CLog.e("Failed to set up ANGLE correctly.");
+            throw new DeviceNotAvailableException("Device not available", ex,
+                mDevice.getSerialNumber());
+        }
+    }
+
+    /**
+     * Clean up the test environment.
+     */
+    private void teardownTestEnvironment() throws DeviceNotAvailableException {
+        // ANGLE
+        try {
+            CLog.i("Cleaning up ANGLE");
+            // Stop forcing dEQP to use ANGLE
+            mDevice.executeShellCommand("settings delete global angle_gl_driver_selection_pkgs");
+            mDevice.executeShellCommand("settings delete global angle_gl_driver_selection_values");
+        } catch (DeviceNotAvailableException ex) {
+            // chain forward
+            CLog.e("Failed to clean up ANGLE correctly.");
+            throw new DeviceNotAvailableException("Device not available", ex,
+                mDevice.getSerialNumber());
+        }
+    }
+
+    /**
       * {@inheritDoc}
       */
      @Override
      public void run(ITestInvocationListener listener) throws DeviceNotAvailableException {
-        final Map<String, String> emptyMap = Collections.emptyMap();
+        final HashMap<String, Metric> emptyMap = new HashMap<>();
          // If sharded, split() will load the tests.
          if (mTestInstances == null) {
              loadTests();
@@ -2136,11 +2197,13 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
              } else if (!mRemainingTests.isEmpty()) {
                  mInstanceListerner.setSink(listener);
                  mDeviceRecovery.setDevice(mDevice);
+                setupTestEnvironment();
                  runTests();
+                teardownTestEnvironment();
              }
          } catch (CapabilityQueryFailureException ex) {
              // Platform is not behaving correctly, for example crashing when trying to create
-            // a window. Instead of silenty failing, signal failure by leaving the rest of the
+            // a window. Instead of silently failing, signal failure by leaving the rest of the
              // test cases in "NotExecuted" state
              CLog.e("Capability query failed - leaving tests unexecuted.");
          } finally {
@@ -2234,6 +2297,8 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
          destination.mAbi = source.mAbi;
          destination.mLogData = source.mLogData;
          destination.mCollectTestsOnly = source.mCollectTestsOnly;
+        destination.mAngle = source.mAngle;
+        destination.mDisableWatchdog = source.mDisableWatchdog;
      }
  
      /**
diff --git a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java

index 06e5b0c..18729d7 100644 (file)
--- a/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
+++ b/android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java
@@ -22,10 +22,12 @@ import com.android.tradefed.build.IFolderBuildInfo;
  import com.android.tradefed.config.ConfigurationException;
  import com.android.tradefed.config.OptionSetter;
  import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.IManagedTestDevice;
  import com.android.tradefed.device.ITestDevice;
  import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
  import com.android.tradefed.result.ITestInvocationListener;
  import com.android.tradefed.result.TestDescription;
+import com.android.tradefed.result.error.InfraErrorIdentifier;
  import com.android.tradefed.testtype.Abi;
  import com.android.tradefed.testtype.IAbi;
  import com.android.tradefed.testtype.IRemoteTest;
@@ -63,8 +65,9 @@ import java.util.concurrent.TimeUnit;
  public class DeqpTestRunnerTest extends TestCase {
      private static final String NAME = "dEQP-GLES3";
      private static final IAbi ABI = new Abi("armeabi-v7a", "32");
-    private static final String CASE_LIST_FILE_NAME = "/sdcard/dEQP-TestCaseList.txt";
-    private static final String LOG_FILE_NAME = "/sdcard/TestLog.qpa";
+    private static final String APP_DIR = "/sdcard/";
+    private static final String CASE_LIST_FILE_NAME = "dEQP-TestCaseList.txt";
+    private static final String LOG_FILE_NAME = "TestLog.qpa";
      private static final String INSTRUMENTATION_NAME =
              "com.drawelements.deqp/com.drawelements.deqp.testercore.DeqpInstrumentation";
      private static final String QUERY_INSTRUMENTATION_NAME =
@@ -121,7 +124,7 @@ public class DeqpTestRunnerTest extends TestCase {
      private static DeqpTestRunner buildGlesTestRunner(int majorVersion,
                                                        int minorVersion,
                                                        Collection<TestDescription> tests,
-                                                      File testsDir) throws ConfigurationException, FileNotFoundException {
+                                                      File testsDir) throws ConfigurationException {
          StringWriter testlist = new StringWriter();
          for (TestDescription test : tests) {
              testlist.write(test.getClassName() + "." + test.getTestName() + "\n");
@@ -224,6 +227,16 @@ public class DeqpTestRunnerTest extends TestCase {
          if (majorVersion > requiredMajorVersion
                  || (majorVersion == requiredMajorVersion && minorVersion >= requiredMinorVersion)) {
  
+            // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+                andReturn("").once();
+
              expectRenderConfigQuery(mockDevice, requiredMajorVersion,
                      requiredMinorVersion);
  
@@ -233,7 +246,7 @@ public class DeqpTestRunnerTest extends TestCase {
                      + "--deqp-surface-type=window "
                      + "--deqp-log-images=disable "
                      + "--deqp-watchdog=enable",
-                    CASE_LIST_FILE_NAME);
+                    APP_DIR + CASE_LIST_FILE_NAME);
  
              runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine,
                      output);
@@ -248,7 +261,7 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testEnded(EasyMock.eq(testId), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -361,13 +374,23 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-surface-type=window "
                  + "--deqp-log-images=disable "
                  + "--deqp-watchdog=enable",
-                CASE_LIST_FILE_NAME);
+                APP_DIR + CASE_LIST_FILE_NAME);
  
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine, output);
  
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          mockListener.testStarted(EasyMock.eq(testId));
          EasyMock.expectLastCall().once();
  
@@ -382,7 +405,7 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testEnded(EasyMock.eq(testId), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -518,13 +541,23 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-surface-type=window "
                  + "--deqp-log-images=disable "
                  + "--deqp-watchdog=enable",
-                CASE_LIST_FILE_NAME);
+                APP_DIR + CASE_LIST_FILE_NAME);
  
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine, output);
  
          mockListener.testRunStarted(getTestId(deqpTest), testPaths.length);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          for (int i = 0; i < testPaths.length; i++) {
              mockListener.testStarted(EasyMock.eq(testIds[i]));
              EasyMock.expectLastCall().once();
@@ -535,7 +568,7 @@ public class DeqpTestRunnerTest extends TestCase {
              EasyMock.expectLastCall().once();
          }
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -605,6 +638,16 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), expectedTests.size());
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          IDevice mockIDevice = EasyMock.createMock(IDevice.class);
          if (thereAreTests)
          {
@@ -624,7 +667,7 @@ public class DeqpTestRunnerTest extends TestCase {
              }
          }
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -767,7 +810,7 @@ public class DeqpTestRunnerTest extends TestCase {
                  = EasyMock.createStrictMock(ITestInvocationListener.class);
          mockListener.testRunStarted(getTestId(deqpTest), 0);
          EasyMock.expectLastCall().once();
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockListener);
@@ -835,7 +878,7 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-surface-type=window "
                  + "--deqp-log-images=disable "
                  + "--deqp-watchdog=enable",
-                CASE_LIST_FILE_NAME);
+                APP_DIR + CASE_LIST_FILE_NAME);
  
          // first try
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice,
@@ -854,6 +897,16 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), testPaths.length);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          for (int i = 0; i < testPaths.length; i++) {
              mockListener.testStarted(EasyMock.eq(testIds[i]));
              EasyMock.expectLastCall().once();
@@ -868,7 +921,7 @@ public class DeqpTestRunnerTest extends TestCase {
              EasyMock.expectLastCall().once();
          }
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -910,8 +963,12 @@ public class DeqpTestRunnerTest extends TestCase {
  
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice);
@@ -953,7 +1010,11 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice);
@@ -1046,7 +1107,7 @@ public class DeqpTestRunnerTest extends TestCase {
                      + "--deqp-surface-type=window "
                      + "--deqp-log-images=disable "
                      + "--deqp-watchdog=enable",
-                    CASE_LIST_FILE_NAME, rotation);
+                    APP_DIR + CASE_LIST_FILE_NAME, rotation);
  
              runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine,
                      output);
@@ -1055,13 +1116,23 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          mockListener.testStarted(EasyMock.eq(testId));
          EasyMock.expectLastCall().once();
  
          mockListener.testEnded(EasyMock.eq(testId), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -1264,13 +1335,23 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          mockListener.testStarted(EasyMock.eq(testId));
          EasyMock.expectLastCall().once();
  
          mockListener.testEnded(EasyMock.eq(testId), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice);
@@ -1280,8 +1361,10 @@ public class DeqpTestRunnerTest extends TestCase {
          EasyMock.verify(mockDevice);
      }
  
-    public static interface RecoverableTestDevice extends ITestDevice {
-        public void recoverDevice() throws DeviceNotAvailableException;
+    /**
+     * Test interface to mock Tradefed device types.
+     */
+    public static interface RecoverableTestDevice extends ITestDevice, IManagedTestDevice {
      }
  
      private static enum RecoveryEvent {
@@ -1617,11 +1700,16 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-gl-minor-version=0");
  
          mockRunUtil.sleep(0);
-        EasyMock.expectLastCall().andThrow(new RunInterruptedException());
+        EasyMock.expectLastCall().andThrow(new RunInterruptedException(
+                "message", InfraErrorIdentifier.TRADEFED_SHUTTING_DOWN));
  
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
-        mockListener.testRunEnded(EasyMock.anyLong(), (Map<String, String>) EasyMock.anyObject());
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>anyObject());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -1663,6 +1751,16 @@ public class DeqpTestRunnerTest extends TestCase {
              mockListener.testRunStarted(getTestId(shard), shardTests.size());
              EasyMock.expectLastCall().once();
  
+            // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+                andReturn("").once();
+            EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+                andReturn("").once();
+
              expectRenderConfigQuery(mockDevice, 3, 0);
  
              String testOut = buildTestProcessOutput(shardTests);
@@ -1679,7 +1777,7 @@ public class DeqpTestRunnerTest extends TestCase {
                  EasyMock.expectLastCall().once();
              }
  
-            mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+            mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
              EasyMock.expectLastCall().once();
  
              EasyMock.replay(mockDevice, mockIDevice);
@@ -1806,7 +1904,7 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-surface-type=window "
                  + "--deqp-log-images=disable "
                  + "--deqp-watchdog=enable",
-                CASE_LIST_FILE_NAME);
+                APP_DIR + CASE_LIST_FILE_NAME);
  
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine,
                  output);
@@ -1814,13 +1912,19 @@ public class DeqpTestRunnerTest extends TestCase {
          mockListener.testRunStarted(getTestId(deqpTest), 1);
          EasyMock.expectLastCall().once();
  
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          mockListener.testStarted(EasyMock.eq(testId));
          EasyMock.expectLastCall().once();
  
          mockListener.testFailed(EasyMock.eq(testId), EasyMock.<String>notNull());
-        EasyMock.expectLastCall().andThrow(new RunInterruptedException());
+        EasyMock.expectLastCall().andThrow(new RunInterruptedException(
+                "message", InfraErrorIdentifier.TRADEFED_SHUTTING_DOWN));
  
-        mockListener.testRunEnded(EasyMock.anyLong(), (Map<String, String>) EasyMock.anyObject());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>anyObject());
          EasyMock.expectLastCall().once();
          EasyMock.replay(mockDevice, mockIDevice);
          EasyMock.replay(mockListener);
@@ -1963,13 +2067,23 @@ public class DeqpTestRunnerTest extends TestCase {
                  + "--deqp-surface-type=window "
                  + "--deqp-log-images=disable "
                  + "--deqp-watchdog=enable",
-                CASE_LIST_FILE_NAME);
+                APP_DIR + CASE_LIST_FILE_NAME);
  
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice, testTrie, commandLine, output);
  
          mockListener.testRunStarted(getTestId(deqpTest), testPaths.length);
          EasyMock.expectLastCall().once();
  
+        // Expect the calls twice: setupTestEnvironment() and teardownTestEnvironment()
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_pkgs"))).
+            andReturn("").once();
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("settings delete global angle_gl_driver_selection_values"))).
+            andReturn("").once();
+
          for (int i = 0; i < testPaths.length; i++) {
              mockListener.testStarted(EasyMock.eq(testIds[i]));
              EasyMock.expectLastCall().once();
@@ -1980,7 +2094,7 @@ public class DeqpTestRunnerTest extends TestCase {
              EasyMock.expectLastCall().once();
          }
  
-        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<Map<String, String>>notNull());
+        mockListener.testRunEnded(EasyMock.anyLong(), EasyMock.<HashMap<String, Metric>>notNull());
          EasyMock.expectLastCall().once();
  
          EasyMock.replay(mockDevice, mockIDevice);
@@ -2047,30 +2161,30 @@ public class DeqpTestRunnerTest extends TestCase {
              + "--deqp-surface-type=window "
              + "--deqp-log-images=disable "
              + "--deqp-watchdog=enable",
-            CASE_LIST_FILE_NAME);
+            APP_DIR + CASE_LIST_FILE_NAME);
          runInstrumentationLineAndAnswer(mockDevice, mockIDevice, null, cmd, output);
      }
  
      private void runInstrumentationLineAndAnswer(ITestDevice mockDevice, IDevice mockIDevice,
              final String testTrie, final String cmd, final String output) throws Exception {
-        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("rm " + CASE_LIST_FILE_NAME)))
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("rm " + APP_DIR + CASE_LIST_FILE_NAME)))
                  .andReturn("").once();
  
-        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("rm " + LOG_FILE_NAME)))
+        EasyMock.expect(mockDevice.executeShellCommand(EasyMock.eq("rm " + APP_DIR + LOG_FILE_NAME)))
                  .andReturn("").once();
  
          if (testTrie == null) {
-            mockDevice.pushString((String)EasyMock.anyObject(), EasyMock.eq(CASE_LIST_FILE_NAME));
+            mockDevice.pushString((String)EasyMock.anyObject(), EasyMock.eq(APP_DIR + CASE_LIST_FILE_NAME));
          }
          else {
-            mockDevice.pushString(testTrie + "\n", CASE_LIST_FILE_NAME);
+            mockDevice.pushString(testTrie + "\n", APP_DIR + CASE_LIST_FILE_NAME);
          }
          EasyMock.expectLastCall().andReturn(true).once();
  
          String command = String.format(
                  "am instrument %s -w -e deqpLogFileName \"%s\" -e deqpCmdLine \"%s\" "
                      + "-e deqpLogData \"%s\" %s",
-                AbiUtils.createAbiFlag(ABI.getName()), LOG_FILE_NAME, cmd, false,
+                AbiUtils.createAbiFlag(ABI.getName()), APP_DIR + LOG_FILE_NAME, cmd, false,
                  INSTRUMENTATION_NAME);
  
          EasyMock.expect(mockDevice.getIDevice()).andReturn(mockIDevice);
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py

index 9b72b3e..355c083 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -129,7 +129,7 @@ MASTER_GLES3_PKG                            = Package(module = GLES3_MODULE, configurations = [
                                           required              = True,
                                           filters               = MASTER_GLES3_COMMON_FILTERS,
                                           runtime               = "1h50m",
-                                         runByDefault          = False),
+                                         runByDefault  = False),
                 Configuration(name                      = "master-2020-03-01",
                                           glconfig              = "rgba8888d24s8ms0",
                                           rotation              = "unspecified",
@@ -187,6 +187,11 @@ MASTER_GLES3_PKG                           = Package(module = GLES3_MODULE, configurations = [
                                           filters               = MASTER_GLES3_COMMON_FILTERS + [include("gles3-pixelformat.txt"),
                                                                                                                                          exclude("gles3-pixelformat-issues.txt")],
                                           runtime               = "1m"),
+               # Incremental dEQP
+               Configuration(name                      = "incremental-deqp",
+                                         filters               = [include("gles3-incremental-deqp.txt")],
+                                         runtime               = "5m",
+                                         runByDefault  = False),
         ])
  
  MASTER_GLES31_COMMON_FILTERS   = [
@@ -277,7 +282,7 @@ MASTER_VULKAN_PKG                           = Package(module = VULKAN_MODULE, configurations = [
                 Configuration(name                      = "master",
                                           filters               = MASTER_VULKAN_FILTERS,
                                           runtime               = "2h39m",
-                                         runByDefault          = False),
+                                         runByDefault  = False),
                 Configuration(name                      = "master-2019-03-01",
                                           filters               = [include("vk-master-2019-03-01.txt")],
                                           runtime               = "2h29m"),
@@ -287,6 +292,10 @@ MASTER_VULKAN_PKG                          = Package(module = VULKAN_MODULE, configurations = [
                 Configuration(name                      = "master-2021-03-01",
                                           filters               = MASTER_VULKAN_FILTERS + [exclude("vk-master-2019-03-01.txt"), exclude("vk-master-2020-03-01.txt")],
                                           runtime               = "10m"),
+               Configuration(name                      = "incremental-deqp",
+                                         filters               = [include("vk-incremental-deqp.txt")],
+                                         runtime               = "5m",
+                                         runByDefault  = False),
         ])
  
  MUSTPASS_LISTS                         = [
author	Paul Thomson <paulthomson@google.com>
	Thu, 7 Oct 2021 17:37:55 +0000 (18:37 +0100)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Fri, 15 Oct 2021 19:00:40 +0000 (19:00 +0000)
android/cts/master/egl-master.txt		patch \| blob \| history
android/cts/master/gles2-master-2020-03-01.txt		patch \| blob \| history
android/cts/master/gles2-master-2021-03-01.txt		patch \| blob \| history
android/cts/master/gles2-master.txt		patch \| blob \| history
android/cts/master/gles3-incremental-deqp.txt	[new file with mode: 0644]	patch \| blob
android/cts/master/gles3-master-2021-03-01.txt		patch \| blob \| history
android/cts/master/gles3-master.txt		patch \| blob \| history
android/cts/master/gles31-master-2021-03-01.txt		patch \| blob \| history
android/cts/master/gles31-master.txt		patch \| blob \| history
android/cts/master/mustpass.xml		patch \| blob \| history
android/cts/master/src/egl-test-issues.txt		patch \| blob \| history
android/cts/master/src/gles2-master-2020-03-01.txt		patch \| blob \| history
android/cts/master/src/gles2-test-issues.txt		patch \| blob \| history
android/cts/master/src/gles3-incremental-deqp.txt	[new file with mode: 0644]	patch \| blob
android/cts/master/src/gles3-spec-issues.txt		patch \| blob \| history
android/cts/master/src/gles3-test-issues.txt		patch \| blob \| history
android/cts/master/src/gles31-driver-issues.txt		patch \| blob \| history
android/cts/master/src/gles31-temp-excluded.txt		patch \| blob \| history
android/cts/master/src/gles31-test-issues.txt		patch \| blob \| history
android/cts/master/src/vk-incremental-deqp.txt	[new file with mode: 0644]	patch \| blob
android/cts/master/src/vk-master-2019-03-01.txt		patch \| blob \| history
android/cts/master/src/vk-master-2020-03-01.txt		patch \| blob \| history
android/cts/master/src/vk-temp-excluded.txt		patch \| blob \| history
android/cts/master/src/vk-test-issues.txt		patch \| blob \| history
android/cts/master/src/vk-waivers.txt		patch \| blob \| history
android/cts/master/vk-incremental-deqp.txt	[new file with mode: 0644]	patch \| blob
android/cts/master/vk-master-2019-03-01.txt		patch \| blob \| history
android/cts/master/vk-master-2020-03-01.txt		patch \| blob \| history
android/cts/master/vk-master-2021-03-01.txt		patch \| blob \| history
android/cts/master/vk-master.txt		patch \| blob \| history
android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java		patch \| blob \| history
android/cts/runner/tests/src/com/drawelements/deqp/runner/DeqpTestRunnerTest.java		patch \| blob \| history
scripts/build_android_mustpass.py		patch \| blob \| history