Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

author Alexander Galazin <alexander.galazin@arm.com>

Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)

committer Alexander Galazin <alexander.galazin@arm.com>

Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
diff --cc AndroidGen.mk
Simple merge
diff --cc android/cts/master/vk-master.txt

index 8079130,2861fbd..f5affee
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@@ -313576,12 -313739,228 +313756,234 @@@ dEQP-VK.query_pool.statistics_query.hos
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_graphic
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_compute
+ +dEQP-VK.query_pool.performance_query.query_graphic
+ +dEQP-VK.query_pool.performance_query.query_compute
+ +dEQP-VK.query_pool.performance_query.multiple_pools_graphic
+ +dEQP-VK.query_pool.performance_query.multiple_pools_compute
   dEQP-VK.draw.simple_draw.simple_draw_triangle_list
   dEQP-VK.draw.simple_draw.simple_draw_triangle_strip
   dEQP-VK.draw.simple_draw.simple_draw_instanced_triangle_list
diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl

index 0c39375,461969f..b36d29c
--- 1/external/vulkancts/framework/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@@ -664,7 -658,7 +669,8 @@@ enum VkQueryTyp
         VK_QUERY_TYPE_PIPELINE_STATISTICS                       = 1,
         VK_QUERY_TYPE_TIMESTAMP                                         = 2,
         VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT     = 1000028004,
+ +      VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR                     = 1000116000,
+       VK_QUERY_TYPE_MAX_ENUM                                          = 0x7FFFFFFF,
   };
   
   enum VkSharingMode
@@@ -1126,46 -1128,9 +1140,47 @@@ enum VkPresentModeKH
         VK_PRESENT_MODE_FIFO_RELAXED_KHR                                = 3,
         VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR               = 1000111000,
         VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR   = 1000111001,
+       VK_PRESENT_MODE_MAX_ENUM_KHR                                    = 0x7FFFFFFF,
   };
   
- 
-       VK_PERFORMANCE_COUNTER_UNIT_KHR_LAST
+ +enum VkPerformanceCounterUnitKHR
+ +{
+ +      VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR                         = 0,
+ +      VK_PERFORMANCE_COUNTER_UNIT_PERCENTAGE_KHR                      = 1,
+ +      VK_PERFORMANCE_COUNTER_UNIT_NANOSECONDS_KHR                     = 2,
+ +      VK_PERFORMANCE_COUNTER_UNIT_BYTES_KHR                           = 3,
+ +      VK_PERFORMANCE_COUNTER_UNIT_BYTES_PER_SECOND_KHR        = 4,
+ +      VK_PERFORMANCE_COUNTER_UNIT_KELVIN_KHR                          = 5,
+ +      VK_PERFORMANCE_COUNTER_UNIT_WATTS_KHR                           = 6,
+ +      VK_PERFORMANCE_COUNTER_UNIT_VOLTS_KHR                           = 7,
+ +      VK_PERFORMANCE_COUNTER_UNIT_AMPS_KHR                            = 8,
+ +      VK_PERFORMANCE_COUNTER_UNIT_HERTZ_KHR                           = 9,
+ +      VK_PERFORMANCE_COUNTER_UNIT_CYCLES_KHR                          = 10,
-       VK_QUERY_SCOPE_COMMAND_BUFFER_KHR       = 0,
-       VK_QUERY_SCOPE_RENDER_PASS_KHR          = 1,
-       VK_QUERY_SCOPE_COMMAND_KHR                      = 2,
- 
-       VK_PERFORMANCE_COUNTER_SCOPE_KHR_LAST
++      VK_PERFORMANCE_COUNTER_UNIT_KHR_LAST,
++      VK_PERFORMANCE_COUNTER_UNIT_MAX_ENUM_KHR                        = 0x7FFFFFFF,
+ +};
+ +
+ +enum VkPerformanceCounterScopeKHR
+ +{
- 
-       VK_PERFORMANCE_COUNTER_STORAGE_KHR_LAST
++      VK_QUERY_SCOPE_COMMAND_BUFFER_KHR                       = 0,
++      VK_QUERY_SCOPE_RENDER_PASS_KHR                          = 1,
++      VK_QUERY_SCOPE_COMMAND_KHR                                      = 2,
++      VK_PERFORMANCE_COUNTER_SCOPE_KHR_LAST,
++      VK_PERFORMANCE_COUNTER_SCOPE_MAX_ENUM_KHR       = 0x7FFFFFFF,
+ +};
+ +
+ +enum VkPerformanceCounterStorageKHR
+ +{
+ +      VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR        = 0,
+ +      VK_PERFORMANCE_COUNTER_STORAGE_INT64_KHR        = 1,
+ +      VK_PERFORMANCE_COUNTER_STORAGE_UINT32_KHR       = 2,
+ +      VK_PERFORMANCE_COUNTER_STORAGE_UINT64_KHR       = 3,
+ +      VK_PERFORMANCE_COUNTER_STORAGE_FLOAT32_KHR      = 4,
+ +      VK_PERFORMANCE_COUNTER_STORAGE_FLOAT64_KHR      = 5,
++      VK_PERFORMANCE_COUNTER_STORAGE_KHR_LAST,
++      VK_PERFORMANCE_COUNTER_STORAGE_MAX_ENUM_KHR     = 0x7FFFFFFF,
+ +};
+ +
   enum VkDebugReportObjectTypeEXT
   {
         VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT                                                 = 0,
@@@ -1627,15 -1618,10 +1668,17 @@@ enum VkDescriptorPoolCreateFlagBit
   };
   typedef deUint32 VkDescriptorPoolCreateFlags;
   
-       VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR = 0x00000001,
+ +enum VkFramebufferCreateFlagBits
+ +{
++      VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR         = 0x00000001,
++      VK_FRAMEBUFFER_CREATE_FLAG_BITS_MAX_ENUM        = 0x7FFFFFFF,
+ +};
+ +typedef deUint32 VkFramebufferCreateFlags;
+ +
   enum VkAttachmentDescriptionFlagBits
   {
-       VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT = 0x00000001,
+       VK_ATTACHMENT_DESCRIPTION_MAY_ALIAS_BIT                 = 0x00000001,
+       VK_ATTACHMENT_DESCRIPTION_FLAG_BITS_MAX_ENUM    = 0x7FFFFFFF,
   };
   typedef deUint32 VkAttachmentDescriptionFlags;
   
@@@ -1871,20 -1882,14 +1939,22 @@@ enum VkDisplayPlaneAlphaFlagBitsKH
   };
   typedef deUint32 VkDisplayPlaneAlphaFlagsKHR;
   
+ +enum VkPerformanceCounterDescriptionFlagBitsKHR
+ +{
+ +      VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_KHR    = 0x00000001,
+ +      VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR    = 0x00000002,
++      VK_PERFORMANCE_COUNTER_DESCRIPTION_FLAG_BITS_MAX_ENUM_KHR               = 0x7FFFFFFF,
+ +};
+ +typedef deUint32 VkPerformanceCounterDescriptionFlagsKHR;
+ +
   enum VkResolveModeFlagBitsKHR
   {
-       VK_RESOLVE_MODE_NONE_KHR                        = 0,
-       VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR     = 0x00000001,
-       VK_RESOLVE_MODE_AVERAGE_BIT_KHR         = 0x00000002,
-       VK_RESOLVE_MODE_MIN_BIT_KHR                     = 0x00000004,
-       VK_RESOLVE_MODE_MAX_BIT_KHR                     = 0x00000008,
+       VK_RESOLVE_MODE_NONE_KHR                                = 0,
+       VK_RESOLVE_MODE_SAMPLE_ZERO_BIT_KHR             = 0x00000001,
+       VK_RESOLVE_MODE_AVERAGE_BIT_KHR                 = 0x00000002,
+       VK_RESOLVE_MODE_MIN_BIT_KHR                             = 0x00000004,
+       VK_RESOLVE_MODE_MAX_BIT_KHR                             = 0x00000008,
+       VK_RESOLVE_MODE_FLAG_BITS_MAX_ENUM_KHR  = 0x7FFFFFFF,
   };
   typedef deUint32 VkResolveModeFlagsKHR;
   
diff --cc external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkPrograms.cpp
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkSpirVAsm.cpp

index 1b36568,28b84bd..33ae860
--- 1/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp
--- 2/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp
+++ b/external/vulkancts/framework/vulkan/vkSpirVAsm.cpp
@@@ -151,8 -147,13 +151,13 @@@ void disassembleSpirV (size_t binarySiz
   
   bool validateSpirV (size_t binarySizeInWords, const deUint32* binary, std::ostream* infoLog, const SpirvValidatorOptions &val_options)
   {
-       const spv_context       context         = spvContextCreate(getSpirvToolsEnvForValidatorOptions(val_options));
-       spv_diagnostic          diagnostic      = DE_NULL;
- -      const spv_context               context         = spvContextCreate(mapVulkanVersionToSpirvToolsEnv(val_options.vulkanVersion));
++      const spv_context               context         = spvContextCreate(getSpirvToolsEnvForValidatorOptions(val_options));
+       spv_diagnostic                  diagnostic      = DE_NULL;
+       spv_validator_options   options         = DE_NULL;
+       spv_text                                disasmText      = DE_NULL;
+ 
+       if (!context)
+               throw std::bad_alloc();
   
         try
         {
diff --cc external/vulkancts/framework/vulkan/vkStrUtil.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl

index b8e8872,90e64de..849ccb3
--- 1/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
--- 2/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
@@@ -691,7 -690,7 +701,8 @@@ const char* getQueryTypeName (VkQueryTy
                 case VK_QUERY_TYPE_PIPELINE_STATISTICS:                         return "VK_QUERY_TYPE_PIPELINE_STATISTICS";
                 case VK_QUERY_TYPE_TIMESTAMP:                                           return "VK_QUERY_TYPE_TIMESTAMP";
                 case VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT:       return "VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT";
+ +              case VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR:                       return "VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR";
+               case VK_QUERY_TYPE_MAX_ENUM:                                            return "VK_QUERY_TYPE_MAX_ENUM";
                 default:                                                                                        return DE_NULL;
         }
   }
@@@ -1243,50 -1276,6 +1288,53 @@@ const char* getPresentModeKHRName (VkPr
         }
   }
   
-               case VK_QUERY_SCOPE_COMMAND_BUFFER_KHR: return "VK_QUERY_SCOPE_COMMAND_BUFFER_KHR";
-               case VK_QUERY_SCOPE_RENDER_PASS_KHR:    return "VK_QUERY_SCOPE_RENDER_PASS_KHR";
-               case VK_QUERY_SCOPE_COMMAND_KHR:                return "VK_QUERY_SCOPE_COMMAND_KHR";
-               default:                                                                return DE_NULL;
+ +const char* getPerformanceCounterUnitKHRName (VkPerformanceCounterUnitKHR value)
+ +{
+ +      switch (value)
+ +      {
+ +              case VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR:                   return "VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_PERCENTAGE_KHR:                return "VK_PERFORMANCE_COUNTER_UNIT_PERCENTAGE_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_NANOSECONDS_KHR:               return "VK_PERFORMANCE_COUNTER_UNIT_NANOSECONDS_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_BYTES_KHR:                             return "VK_PERFORMANCE_COUNTER_UNIT_BYTES_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_BYTES_PER_SECOND_KHR:  return "VK_PERFORMANCE_COUNTER_UNIT_BYTES_PER_SECOND_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_KELVIN_KHR:                    return "VK_PERFORMANCE_COUNTER_UNIT_KELVIN_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_WATTS_KHR:                             return "VK_PERFORMANCE_COUNTER_UNIT_WATTS_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_VOLTS_KHR:                             return "VK_PERFORMANCE_COUNTER_UNIT_VOLTS_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_AMPS_KHR:                              return "VK_PERFORMANCE_COUNTER_UNIT_AMPS_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_HERTZ_KHR:                             return "VK_PERFORMANCE_COUNTER_UNIT_HERTZ_KHR";
+ +              case VK_PERFORMANCE_COUNTER_UNIT_CYCLES_KHR:                    return "VK_PERFORMANCE_COUNTER_UNIT_CYCLES_KHR";
++              case VK_PERFORMANCE_COUNTER_UNIT_MAX_ENUM_KHR:                  return "VK_PERFORMANCE_COUNTER_UNIT_MAX_ENUM_KHR";
+ +              default:                                                                                                return DE_NULL;
+ +      }
+ +}
+ +
+ +const char* getPerformanceCounterScopeKHRName (VkPerformanceCounterScopeKHR value)
+ +{
+ +      switch (value)
+ +      {
++              case VK_QUERY_SCOPE_COMMAND_BUFFER_KHR:                 return "VK_QUERY_SCOPE_COMMAND_BUFFER_KHR";
++              case VK_QUERY_SCOPE_RENDER_PASS_KHR:                    return "VK_QUERY_SCOPE_RENDER_PASS_KHR";
++              case VK_QUERY_SCOPE_COMMAND_KHR:                                return "VK_QUERY_SCOPE_COMMAND_KHR";
++              case VK_PERFORMANCE_COUNTER_SCOPE_MAX_ENUM_KHR: return "VK_PERFORMANCE_COUNTER_SCOPE_MAX_ENUM_KHR";
++              default:                                                                                return DE_NULL;
+ +      }
+ +}
+ +
+ +const char* getPerformanceCounterStorageKHRName (VkPerformanceCounterStorageKHR value)
+ +{
+ +      switch (value)
+ +      {
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR:          return "VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR";
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_INT64_KHR:          return "VK_PERFORMANCE_COUNTER_STORAGE_INT64_KHR";
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_UINT32_KHR:         return "VK_PERFORMANCE_COUNTER_STORAGE_UINT32_KHR";
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_UINT64_KHR:         return "VK_PERFORMANCE_COUNTER_STORAGE_UINT64_KHR";
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_FLOAT32_KHR:        return "VK_PERFORMANCE_COUNTER_STORAGE_FLOAT32_KHR";
+ +              case VK_PERFORMANCE_COUNTER_STORAGE_FLOAT64_KHR:        return "VK_PERFORMANCE_COUNTER_STORAGE_FLOAT64_KHR";
++              case VK_PERFORMANCE_COUNTER_STORAGE_MAX_ENUM_KHR:       return "VK_PERFORMANCE_COUNTER_STORAGE_MAX_ENUM_KHR";
+ +              default:                                                                                        return DE_NULL;
+ +      }
+ +}
+ +
   const char* getDebugReportObjectTypeEXTName (VkDebugReportObjectTypeEXT value)
   {
         switch (value)
@@@ -1849,15 -1877,6 +1936,16 @@@ tcu::Format::Bitfield<32> getDescriptor
         return tcu::Format::Bitfield<32>(value, DE_ARRAY_BEGIN(s_desc), DE_ARRAY_END(s_desc));
   }
   
+ +tcu::Format::Bitfield<32> getFramebufferCreateFlagsStr (VkFramebufferCreateFlags value)
+ +{
+ +      static const tcu::Format::BitDesc s_desc[] =
+ +      {
+ +              tcu::Format::BitDesc(VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR,   "VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR"),
++              tcu::Format::BitDesc(VK_FRAMEBUFFER_CREATE_FLAG_BITS_MAX_ENUM,  "VK_FRAMEBUFFER_CREATE_FLAG_BITS_MAX_ENUM"),
+ +      };
+ +      return tcu::Format::Bitfield<32>(value, DE_ARRAY_BEGIN(s_desc), DE_ARRAY_END(s_desc));
+ +}
+ +
   tcu::Format::Bitfield<32> getAttachmentDescriptionFlagsStr (VkAttachmentDescriptionFlags value)
   {
         static const tcu::Format::BitDesc s_desc[] =
@@@ -2174,16 -2219,6 +2288,17 @@@ tcu::Format::Bitfield<32> getDisplayPla
         return tcu::Format::Bitfield<32>(value, DE_ARRAY_BEGIN(s_desc), DE_ARRAY_END(s_desc));
   }
   
+ +tcu::Format::Bitfield<32> getPerformanceCounterDescriptionFlagsKHRStr (VkPerformanceCounterDescriptionFlagsKHR value)
+ +{
+ +      static const tcu::Format::BitDesc s_desc[] =
+ +      {
+ +              tcu::Format::BitDesc(VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_KHR,      "VK_PERFORMANCE_COUNTER_DESCRIPTION_PERFORMANCE_IMPACTING_KHR"),
+ +              tcu::Format::BitDesc(VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR,      "VK_PERFORMANCE_COUNTER_DESCRIPTION_CONCURRENTLY_IMPACTED_KHR"),
++              tcu::Format::BitDesc(VK_PERFORMANCE_COUNTER_DESCRIPTION_FLAG_BITS_MAX_ENUM_KHR,         "VK_PERFORMANCE_COUNTER_DESCRIPTION_FLAG_BITS_MAX_ENUM_KHR"),
+ +      };
+ +      return tcu::Format::Bitfield<32>(value, DE_ARRAY_BEGIN(s_desc), DE_ARRAY_END(s_desc));
+ +}
+ +
   tcu::Format::Bitfield<32> getResolveModeFlagsKHRStr (VkResolveModeFlagsKHR value)
   {
         static const tcu::Format::BitDesc s_desc[] =
diff --cc external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/vktTestCase.cpp

index 1ea070b,e2a3a17..671ad54
--- 1/external/vulkancts/modules/vulkan/vktTestCase.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@@ -328,9 -327,9 +328,10 @@@ public
         VkPhysicalDeviceCooperativeMatrixFeaturesNV                     cooperativeMatrixFeatures;
         VkPhysicalDeviceHostQueryResetFeaturesEXT                       hostQueryResetFeatures;
         VkPhysicalDeviceTransformFeedbackFeaturesEXT            transformFeedbackFeatures;
+ +      VkPhysicalDevicePerformanceCounterFeaturesKHR           performanceCounterFeatures;
         VkPhysicalDeviceMemoryPriorityFeaturesEXT                       memoryPriorityFeatures;
         VkPhysicalDeviceUniformBufferStandardLayoutFeaturesKHR  uniformBufferStandardLayoutFeatures;
+       VkPhysicalDeviceMultiviewFeatures                                       multiviewFeatures;
   
         DeviceFeatures (const InstanceInterface&        vki,
                                         const deUint32                          apiVersion,
@@@ -359,9 -357,9 +360,10 @@@
                 deMemset(&cooperativeMatrixFeatures, 0, sizeof(cooperativeMatrixFeatures));
                 deMemset(&hostQueryResetFeatures, 0, sizeof(hostQueryResetFeatures));
                 deMemset(&transformFeedbackFeatures, 0, sizeof(transformFeedbackFeatures));
+ +              deMemset(&performanceCounterFeatures, 0, sizeof(performanceCounterFeatures));
                 deMemset(&memoryPriorityFeatures, 0, sizeof(memoryPriorityFeatures));
                 deMemset(&uniformBufferStandardLayoutFeatures, 0, sizeof(uniformBufferStandardLayoutFeatures));
+               deMemset(&multiviewFeatures, 0, sizeof(multiviewFeatures));
   
                 coreFeatures.sType                                              = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
                 samplerYCbCrConversionFeatures.sType    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES;
@@@ -559,7 -546,8 +567,9 @@@ public
         const VkPhysicalDeviceCooperativeMatrixFeaturesNV&              getCooperativeMatrixFeatures            (void) const    { return m_deviceFeatures.cooperativeMatrixFeatures;    }
         const VkPhysicalDeviceHostQueryResetFeaturesEXT&                getHostQueryResetFeatures                       (void) const    { return m_deviceFeatures.hostQueryResetFeatures;                       }
         const VkPhysicalDeviceTransformFeedbackFeaturesEXT&             getTransformFeedbackFeatures            (void) const    { return m_deviceFeatures.transformFeedbackFeatures;            }
+ +      const VkPhysicalDevicePerformanceCounterFeaturesKHR&    getPerformanceCounterFeatures           (void) const    { return m_deviceFeatures.performanceCounterFeatures;           }
+       const VkPhysicalDeviceMultiviewFeatures&                                getMultiviewFeatures                            (void) const    { return m_deviceFeatures.multiviewFeatures;                            }
+ 
         const VkPhysicalDeviceMemoryPriorityFeaturesEXT&                getMemoryPriorityFeatures                       (void) const    { return m_deviceFeatures.memoryPriorityFeatures;                       }
         VkDevice                                                                                                getDevice                                                       (void) const    { return *m_device;                                                                                     }
         const DeviceInterface&                                                                  getDeviceInterface                                      (void) const    { return m_deviceInterface;                                                                     }
@@@ -718,10 -704,10 +728,12 @@@ const vk::VkPhysicalDeviceHostQueryRese
                                                                                 Context::getHostQueryResetFeatures              (void) const { return m_device->getHostQueryResetFeatures();    }
   const vk::VkPhysicalDeviceTransformFeedbackFeaturesEXT&
                                                                                 Context::getTransformFeedbackFeatures   (void) const { return m_device->getTransformFeedbackFeatures(); }
+ +const vk::VkPhysicalDevicePerformanceCounterFeaturesKHR&
+ +                                                                              Context::getPerformanceCounterFeatures  (void) const { return m_device->getPerformanceCounterFeatures();        }
   const vk::VkPhysicalDeviceMemoryPriorityFeaturesEXT&
                                                                                 Context::getMemoryPriorityFeatures              (void) const { return m_device->getMemoryPriorityFeatures();    }
+ const vk::VkPhysicalDeviceMultiviewFeatures&
+                                                                               Context::getMultiviewFeatures                   (void) const { return m_device->getMultiviewFeatures();                 }
   const vk::VkPhysicalDeviceProperties& Context::getDeviceProperties                    (void) const { return m_device->getDeviceProperties();                  }
   const vector<string>&                                 Context::getDeviceExtensions                    (void) const { return m_device->getDeviceExtensions();                  }
   vk::VkDevice                                                  Context::getDevice                                              (void) const { return m_device->getDevice();                                    }
diff --cc external/vulkancts/modules/vulkan/vktTestCase.hpp

index 7bcf086,cfd6231..2a45519
--- 1/external/vulkancts/modules/vulkan/vktTestCase.hpp
--- 2/external/vulkancts/modules/vulkan/vktTestCase.hpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.hpp
@@@ -104,10 -102,10 +104,12 @@@ public
                                                                                                 getHostQueryResetFeatures               (void) const;
         const vk::VkPhysicalDeviceTransformFeedbackFeaturesEXT&
                                                                                                 getTransformFeedbackFeatures    (void) const;
+ +      const vk::VkPhysicalDevicePerformanceCounterFeaturesKHR&
+ +                                                                                              getPerformanceCounterFeatures   (void) const;
         const vk::VkPhysicalDeviceMemoryPriorityFeaturesEXT&
                                                                                                 getMemoryPriorityFeatures               (void) const;
+       const vk::VkPhysicalDeviceMultiviewFeatures&
+                                                                                               getMultiviewFeatures                    (void) const;
         const vk::VkPhysicalDeviceProperties&           getDeviceProperties                             (void) const;
         const std::vector<std::string>&                         getDeviceExtensions                             (void) const;
         vk::VkDevice                                                            getDevice                                               (void) const;
diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt

index 3bfd791,b6a0d06..aa2a552
--- 1/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
--- 2/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
@@@ -313709,12 -313872,228 +313889,234 @@@ dEQP-VK.query_pool.statistics_query.hos
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_graphic
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_compute
+ +dEQP-VK.query_pool.performance_query.query_graphic
+ +dEQP-VK.query_pool.performance_query.query_compute
+ +dEQP-VK.query_pool.performance_query.multiple_pools_graphic
+ +dEQP-VK.query_pool.performance_query.multiple_pools_compute
   dEQP-VK.draw.simple_draw.simple_draw_triangle_list
   dEQP-VK.draw.simple_draw.simple_draw_triangle_strip
   dEQP-VK.draw.simple_draw.simple_draw_instanced_triangle_list
diff --cc external/vulkancts/mustpass/master/vk-default.txt

index 8903371,6f8e0fa..73889d3
--- 1/external/vulkancts/mustpass/master/vk-default.txt
--- 2/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@@ -313671,12 -313834,228 +313851,234 @@@ dEQP-VK.query_pool.statistics_query.hos
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
   dEQP-VK.query_pool.statistics_query.host_query_reset.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.compute_shader_invocations.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.primary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_vertices.secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.input_assembly_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.vertex_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.fragment_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.geometry_shader_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_invocations.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.primary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.point_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_fan
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.line_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_list_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.clipping_primitives.secondary_inherited.triangle_strip_with_adjacency
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_control_patches.tes_control_patches_secondary_inherited
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary
+ dEQP-VK.query_pool.statistics_query.reset_before_copy.tes_evaluation_shader_invocations.tes_evaluation_shader_invocations_secondary_inherited
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_graphic
+ +dEQP-VK.query_pool.performance_query.enumerate_and_validate_compute
+ +dEQP-VK.query_pool.performance_query.query_graphic
+ +dEQP-VK.query_pool.performance_query.query_compute
+ +dEQP-VK.query_pool.performance_query.multiple_pools_graphic
+ +dEQP-VK.query_pool.performance_query.multiple_pools_compute
   dEQP-VK.draw.simple_draw.simple_draw_triangle_list
   dEQP-VK.draw.simple_draw.simple_draw_triangle_strip
   dEQP-VK.draw.simple_draw.simple_draw_instanced_triangle_list
diff --cc external/vulkancts/scripts/src/vulkan.h.in
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 20 May 2019 13:14:32 +0000 (15:14 +0200)
		1	2
AndroidGen.mk	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkBasicTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkPrograms.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkSpirVAsm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtil.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStructTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkVulkan_c.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/vktTestCase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/vktTestCase.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/scripts/src/vulkan.h.in	patch \|	diff1 \|	diff2 \|	blob \| history