Test dynamic patch control points without tessellation

Bind and use a pipeline with dynamic patch control points and no
tessellation before attempting to bind and use a proper pipeline with
dynamic patch control points and tessellation. The fact that the first
pipeline has no tessellation should not affect the dynamic state in the
command buffer, as needed and used by the second pipeline.

New tests:
dEQP-VK.pipeline.*.extended_dynamic_state.*.patch_control_points_extra_pipeline

Affected tests:
dEQP-VK.pipeline.*.extended_dynamic_state.*

Components: Vulkan
VK-GL-CTS issue: 3737

Change-Id: Icf25f2805b2bd9377210cb36b594b08033ab8e5c

diff --git a/android/cts/main/vk-master-2022-03-01/pipeline.txt b/android/cts/main/vk-master-2022-03-01/pipeline.txt
index 7fd8287..9c3a89d 100644 (file)
--- a/android/cts/main/vk-master-2022-03-01/pipeline.txt
+++ b/android/cts/main/vk-master-2022-03-01/pipeline.txt
@@ -208586,6 +208586,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -209977,6 +209978,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.enable_rast
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_patch
@@ -211368,6 +211370,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -212759,6 +212762,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.enable_
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -214150,6 +214154,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.enab
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_patch
@@ -215541,6 +215546,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -216931,6 +216937,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_patch
@@ -275817,6 +275824,7 @@ dEQP-VK.pipeline.monolithic.blend_operation_advanced.independent.color_attachmen
 dEQP-VK.pipeline.monolithic.blend_operation_advanced.independent.color_attachments_16_blend_overlap_uncorrelated_ext_3_r8g8b8a8_unorm
 dEQP-VK.pipeline.monolithic.blend_operation_advanced.coherent.barrier_color_attachments_1_blend_overlap_uncorrelated_ext_0_r8g8b8a8_unorm
 dEQP-VK.pipeline.monolithic.blend_operation_advanced.coherent.color_attachments_1_blend_overlap_uncorrelated_ext_1_r8g8b8a8_unorm
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.zero_stride_with_offset
@@ -275824,6 +275832,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.depth_bias_e
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.zero_stride_with_offset
@@ -275831,6 +275840,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.depth_bias_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.zero_stride_with_offset
@@ -275838,6 +275848,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.depth_bias_
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.zero_stride_with_offset
@@ -275845,6 +275856,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.depth_bias_en
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.zero_stride_with_offset
@@ -275852,12 +275864,14 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.depth_bias
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.depth_bias_enable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.depth_bias_disable_dynamic_bias_params
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.vertex_input_no_dyn_stride
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.vertex_input_multiple_bindings
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch_geom
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.depth_bias_enable_dynamic_bias_params
@@ -484956,6 +484970,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -486347,6 +486362,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.enable_r
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_patch
@@ -487738,6 +487754,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -489129,6 +489146,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.enab
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -490520,6 +490538,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.e
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_patch
@@ -491911,6 +491930,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -493301,6 +493321,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/android/cts/main/vk-master/pipeline/fast-linked-library.txt b/android/cts/main/vk-master/pipeline/fast-linked-library.txt
index 8732b3b..22f71f0 100644 (file)
--- a/android/cts/main/vk-master/pipeline/fast-linked-library.txt
+++ b/android/cts/main/vk-master/pipeline/fast-linked-library.txt
@@ -208586,6 +208586,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -209977,6 +209978,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.enable_r
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_patch
@@ -211368,6 +211370,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -212759,6 +212762,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.enab
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -214150,6 +214154,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.e
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_patch
@@ -215541,6 +215546,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -216931,6 +216937,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/android/cts/main/vk-master/pipeline/monolithic.txt b/android/cts/main/vk-master/pipeline/monolithic.txt
index 3f1e6e6..1fb93a4 100644 (file)
--- a/android/cts/main/vk-master/pipeline/monolithic.txt
+++ b/android/cts/main/vk-master/pipeline/monolithic.txt
@@ -209134,6 +209134,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.enable_raste
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -210525,6 +210526,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.enable_raster
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch
@@ -211916,6 +211918,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.enable_rast
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch
@@ -213307,6 +213310,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.enable_raster
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch
@@ -214698,6 +214702,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.enable_ras
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch
@@ -216089,6 +216094,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.enable_rast
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -217479,6 +217485,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.enable_raste
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/android/cts/main/vk-master/pipeline/pipeline-library.txt b/android/cts/main/vk-master/pipeline/pipeline-library.txt
index fb0ae51..da4f17d 100644 (file)
--- a/android/cts/main/vk-master/pipeline/pipeline-library.txt
+++ b/android/cts/main/vk-master/pipeline/pipeline-library.txt
@@ -208586,6 +208586,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -209977,6 +209978,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.enable_rast
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_patch
@@ -211368,6 +211370,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -212759,6 +212762,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.enable_
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -214150,6 +214154,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.enab
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_patch
@@ -215541,6 +215546,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -216931,6 +216937,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/android/cts/main/vksc-main/pipeline.txt b/android/cts/main/vksc-main/pipeline.txt
index 60298ec..e6af82c 100644 (file)
--- a/android/cts/main/vksc-main/pipeline.txt
+++ b/android/cts/main/vksc-main/pipeline.txt
@@ -153986,6 +153986,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.enab
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -155377,6 +155378,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.enable_ra
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_patch
@@ -156768,6 +156770,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.ena
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -158159,6 +158162,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.enabl
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -159550,6 +159554,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.en
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_patch
@@ -160941,6 +160946,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.ena
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -162331,6 +162337,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.enab
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_patch
@@ -318993,6 +319000,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.enable_ras
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -320384,6 +320392,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.enable_raster
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch
@@ -321775,6 +321784,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.enable_ra
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch
@@ -323166,6 +323176,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.enable_rast
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch
@@ -324557,6 +324568,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.enable_r
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch
@@ -325948,6 +325960,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.enable_ra
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -327338,6 +327351,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.enable_ras
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch
@@ -483539,6 +483553,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.e
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -484930,6 +484945,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_patch
@@ -486321,6 +486337,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -487712,6 +487729,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.en
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -489103,6 +489121,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_patch
@@ -490494,6 +490513,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -491884,6 +491904,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.e
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
index 6c9455b..ed1d83c 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
@@ -837,6 +837,10 @@ struct TestConfig
        vk::VkDeviceSize                                vertexDataOffset;
        vk::VkDeviceSize                                vertexDataExtraBytes;
 
+       // Bind and draw with a pipeline that uses dynamic patch control points but doesn't actually use a tessellation
+       // shader, before using the real pipelines being tested.
+       bool                                                    useExtraDynPCPPipeline;
+
        // Static and dynamic pipeline configuration.
        VertexGeneratorConfig                   vertexGenerator;
        CullModeConfig                                  cullModeConfig;
@@ -877,6 +881,7 @@ struct TestConfig
                , singleVertexDrawCount                 (0)
                , vertexDataOffset                              (0ull)
                , vertexDataExtraBytes                  (0ull)
+               , useExtraDynPCPPipeline                (false)
                , vertexGenerator                               (makeVertexGeneratorConfig(staticVertexGenerator, dynamicVertexGenerator))
                , cullModeConfig                                (static_cast<vk::VkCullModeFlags>(vk::VK_CULL_MODE_NONE))
                , frontFaceConfig                               (vk::VK_FRONT_FACE_COUNTER_CLOCKWISE)
@@ -1100,7 +1105,8 @@ struct TestConfig
                    || rastDiscardEnableConfig.dynamicValue
                    || depthBiasEnableConfig.dynamicValue
                    || logicOpConfig.dynamicValue
-                   || primRestartEnableConfig.dynamicValue)
+                   || primRestartEnableConfig.dynamicValue
+                       || useExtraDynPCPPipeline)
                {
                        extensions.push_back("VK_EXT_extended_dynamic_state2");
                }
@@ -1184,6 +1190,9 @@ ExtendedDynamicStateTest::ExtendedDynamicStateTest (tcu::TestContext& testCtx, c
        // Make sure these are consistent.
        DE_ASSERT(!(m_testConfig.testPatchControlPoints() && !m_testConfig.patchesTopology()));
        DE_ASSERT(!(m_testConfig.patchesTopology() && m_testConfig.getActivePatchControlPoints() <= 1u));
+
+       // Do not use an extra dynamic patch control points pipeline if we're not testing them.
+       DE_ASSERT(!m_testConfig.useExtraDynPCPPipeline || m_testConfig.testPatchControlPoints());
 }
 
 void ExtendedDynamicStateTest::checkSupport (Context& context) const
@@ -1204,7 +1213,7 @@ void ExtendedDynamicStateTest::checkSupport (Context& context) const
                if (m_testConfig.testLogicOp() && !eds2Features.extendedDynamicState2LogicOp)
                        TCU_THROW(NotSupportedError, "VK_EXT_extended_dynamic_state2 : changing LogicOp dynamically is not supported");
 
-               if (m_testConfig.testPatchControlPoints() && !eds2Features.extendedDynamicState2PatchControlPoints)
+               if ((m_testConfig.testPatchControlPoints() || m_testConfig.useExtraDynPCPPipeline) && !eds2Features.extendedDynamicState2PatchControlPoints)
                        TCU_THROW(NotSupportedError, "VK_EXT_extended_dynamic_state2 : changing patch control points dynamically is not supported");
        }
 
@@ -1451,6 +1460,36 @@ void ExtendedDynamicStateTest::initPrograms (vk::SourceCollections& programColle
                programCollection.glslSources.add("tesc") << glu::TessellationControlSource(tescSource.str());
                programCollection.glslSources.add("tese") << glu::TessellationEvaluationSource(teseSource.str());
        }
+
+       // Extra vert and frag shaders for the extra patch control points pipeline. These draw offscreen.
+       if (m_testConfig.useExtraDynPCPPipeline)
+       {
+               std::ostringstream vertDPCP;
+               vertDPCP
+                       << "#version 450\n"
+                       << "\n"
+                       << "vec2 positions[3] = vec2[](\n"
+                       << "    vec2(-1.0, -1.0),\n"
+                       << "    vec2( 3.0, -1.0),\n"
+                       << "    vec2(-1.0,  3.0)\n"
+                       << ");\n"
+                       << "\n"
+                       << "void main() {\n"
+                       << "    gl_Position = vec4(positions[gl_VertexIndex] + 10.0 + 1.0 * float(gl_VertexIndex), 0.0, 1.0);\n"
+                       << "}\n"
+                       ;
+               programCollection.glslSources.add("vertDPCP") << glu::VertexSource(vertDPCP.str());
+
+               std::ostringstream fragDPCP;
+               fragDPCP
+                       << "#version 450\n"
+                       << "layout(location=0) out " << vecType << " color;\n"
+                       << "void main() {\n"
+                       << "    color = " << vecType << "(1.0, 1.0, 1.0, 1.0);\n"
+                       << "}\n"
+                       ;
+               programCollection.glslSources.add("fragDPCP") << glu::FragmentSource(fragDPCP.str());
+       }
 }
 
 TestInstance* ExtendedDynamicStateTest::createInstance (Context& context) const
@@ -2074,6 +2113,8 @@ tcu::TestStatus ExtendedDynamicStateInstance::iterate (void)
        vk::Move<vk::VkShaderModule>    geomModule;
        vk::Move<vk::VkShaderModule>    tescModule;
        vk::Move<vk::VkShaderModule>    teseModule;
+       vk::Move<vk::VkShaderModule>    vertDPCPModule;
+       vk::Move<vk::VkShaderModule>    fragDPCPModule;
 
        if (m_testConfig.needsGeometryShader())
                geomModule = vk::createShaderModule(vkd, device, m_context.getBinaryCollection().get("geom"), 0u);
@@ -2245,22 +2286,53 @@ tcu::TestStatus ExtendedDynamicStateInstance::iterate (void)
                                                                                                           kSequenceOrdering == SequenceOrdering::TWO_DRAWS_DYNAMIC);
        const bool                                      useStaticPipeline       = (bindStaticFirst || kReversed);
 
+       // Create extra dynamic patch control points pipeline if needed.
+       vk::Move<vk::VkPipeline> extraDynPCPPipeline;
+
+       if (m_testConfig.useExtraDynPCPPipeline)
+       {
+               vertDPCPModule = vk::createShaderModule(vkd, device, m_context.getBinaryCollection().get("vertDPCP"));
+               fragDPCPModule = vk::createShaderModule(vkd, device, m_context.getBinaryCollection().get("fragDPCP"));
+
+               const vk::VkPipelineVertexInputStateCreateInfo  extraDPCPInputState             = vk::initVulkanStructure();
+               const vk::VkDynamicState                                                extraDynamicState               = vk::VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT;
+               const vk::VkPipelineDynamicStateCreateInfo              extraDynamicStateInfo   =
+               {
+                       vk::VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO,       //      VkStructureType                                         sType;
+                       nullptr,                                                                                                        //      const void*                                                     pNext;
+                       0u,                                                                                                                     //      VkPipelineDynamicStateCreateFlags       flags;
+                       1u,                                                                                                                     //      uint32_t                                                        dynamicStateCount;
+                       &extraDynamicState,                                                                                             //      const VkDynamicState*                           pDynamicStates;
+               };
+
+               const auto extraPipelineLayout = vk::makePipelineLayout(vkd, device);
+
+               const auto viewports    = m_testConfig.viewportConfig.staticValue;
+               const auto scissors             = m_testConfig.scissorConfig.staticValue;
+
+               extraDynPCPPipeline = vk::makeGraphicsPipeline(
+                       vkd, device, *extraPipelineLayout,
+                       vertDPCPModule.get(), DE_NULL, DE_NULL, DE_NULL, fragDPCPModule.get(),
+                       renderPass.get(), viewports, scissors, vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, 0u, 0u,
+                       &extraDPCPInputState, nullptr, nullptr, nullptr, nullptr, &extraDynamicStateInfo);
+       }
+
        // Create static pipeline when needed.
        if (useStaticPipeline)
        {
                auto viewports  = m_testConfig.viewportConfig.staticValue;
-               auto scisors    = m_testConfig.scissorConfig.staticValue;
+               auto scissors   = m_testConfig.scissorConfig.staticValue;
 
                // The viewport and scissor counts must match in the static part, which will be used by the static pipeline.
                const auto minStaticCount = static_cast<deUint32>(std::min(m_testConfig.viewportConfig.staticValue.size(), m_testConfig.scissorConfig.staticValue.size()));
                viewports.resize(minStaticCount);
-               scisors.resize(minStaticCount);
+               scissors.resize(minStaticCount);
 
                staticPipeline.setDefaultPatchControlPoints(m_testConfig.patchControlPointsConfig.staticValue)
                                          .setupVertexInputStete(&vertexInputStateCreateInfo, &inputAssemblyStateCreateInfo)
                                          .setupPreRasterizationShaderState(
                                                                                        viewports,
-                                                                                       scisors,
+                                                                                       scissors,
                                                                                        *pipelineLayout,
                                                                                        *renderPass,
                                                                                        0u,
@@ -2279,7 +2351,7 @@ tcu::TestStatus ExtendedDynamicStateInstance::iterate (void)
        vk::GraphicsPipelineWrapper graphicsPipeline(vkd, device, m_testConfig.pipelineConstructionType);
        {
                auto viewports  = m_testConfig.viewportConfig.staticValue;
-               auto scisors    = m_testConfig.scissorConfig.staticValue;
+               auto scissors   = m_testConfig.scissorConfig.staticValue;
 
                const auto finalDynamicViewportCount = (m_testConfig.viewportConfig.dynamicValue
                        ? m_testConfig.viewportConfig.dynamicValue.get().size()
@@ -2303,17 +2375,17 @@ tcu::TestStatus ExtendedDynamicStateInstance::iterate (void)
                if (m_testConfig.scissorConfig.dynamicValue)
                {
                        graphicsPipeline.setDefaultScissorsCount();
-                       scisors = std::vector<vk::VkRect2D>();
+                       scissors = std::vector<vk::VkRect2D>();
                }
                else
-                       scisors.resize(minDynamicCount);
+                       scissors.resize(minDynamicCount);
 
                graphicsPipeline.setDynamicState(&dynamicStateCreateInfo)
                                                .setDefaultPatchControlPoints(m_testConfig.patchControlPointsConfig.staticValue)
                                                .setupVertexInputStete(&vertexInputStateCreateInfo, &inputAssemblyStateCreateInfo)
                                                .setupPreRasterizationShaderState(
                                                                                        viewports,
-                                                                                       scisors,
+                                                                                       scissors,
                                                                                        *pipelineLayout,
                                                                                        *renderPass,
                                                                                        0u,
@@ -2373,6 +2445,17 @@ tcu::TestStatus ExtendedDynamicStateInstance::iterate (void)
                                (kSequenceOrdering == SequenceOrdering::TWO_DRAWS_DYNAMIC && iteration > 0u) ||
                                (kSequenceOrdering == SequenceOrdering::TWO_DRAWS_STATIC && iteration == 0u))
                        {
+                               if (m_testConfig.useExtraDynPCPPipeline)
+                               {
+                                       vkd.cmdBindPipeline(cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, extraDynPCPPipeline.get());
+
+                                       // In these two sequence orderings, the right dynamic state value will have been set before and we would be
+                                       // setting it to a wrong value here, resulting in test failures. We keep the right value instead.
+                                       if (kSequenceOrdering != SequenceOrdering::CMD_BUFFER_START && kSequenceOrdering != SequenceOrdering::BETWEEN_PIPELINES)
+                                               vkd.cmdSetPatchControlPointsEXT(cmdBuffer, m_testConfig.patchControlPointsConfig.staticValue);
+
+                                       vkd.cmdDraw(cmdBuffer, 3u, 1u, 0u, 0u);
+                               }
                                vkd.cmdBindPipeline(cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, graphicsPipeline.getPipeline());
                        }
 
@@ -2721,11 +2804,22 @@ tcu::TestCaseGroup* createExtendedDynamicStateTests (tcu::TestContext& testCtx,
 
                // Dynamically change the number of primitive control points
                {
-                       TestConfig config(pipelineConstructionType, kOrdering);
-                       config.topologyConfig.staticValue = vk::VK_PRIMITIVE_TOPOLOGY_PATCH_LIST;
-                       config.patchControlPointsConfig.staticValue = 1;
-                       config.patchControlPointsConfig.dynamicValue = 3;
-                       orderingGroup->addChild(new ExtendedDynamicStateTest(testCtx, "patch_control_points", "Dynamically change patch control points", config));
+                       for (int i = 0; i < 2; ++i)
+                       {
+                               const bool useExtraPipeline = (i > 0);
+
+                               TestConfig config(pipelineConstructionType, kOrdering);
+                               config.topologyConfig.staticValue = vk::VK_PRIMITIVE_TOPOLOGY_PATCH_LIST;
+                               config.patchControlPointsConfig.staticValue = 1;
+                               config.patchControlPointsConfig.dynamicValue = 3;
+                               config.useExtraDynPCPPipeline = useExtraPipeline;
+
+                               const auto testName     = std::string("patch_control_points") + (useExtraPipeline ? "_extra_pipeline" : "");
+                               const auto testDesc     = std::string("Dynamically change patch control points")
+                                                                       + (useExtraPipeline ? " and draw first with a pipeline using the state and no tessellation shaders" : "");
+
+                               orderingGroup->addChild(new ExtendedDynamicStateTest(testCtx, testName, testDesc, config));
+                       }
                }
 
                // Dynamic topology.

diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
index aa2e8eb..acd6800 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/fast-linked-library.txt
@@ -208627,6 +208627,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -210018,6 +210019,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.enable_r
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_patch
@@ -211409,6 +211411,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -212800,6 +212803,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.enab
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -214191,6 +214195,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.e
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_patch
@@ -215582,6 +215587,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.en
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -216972,6 +216978,7 @@ dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.ena
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
index a902739..19f129a 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/monolithic.txt
@@ -209175,6 +209175,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.enable_raste
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -210566,6 +210567,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.enable_raster
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch
@@ -211957,6 +211959,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.enable_rast
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch
@@ -213348,6 +213351,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.enable_raster
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch
@@ -214739,6 +214743,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.enable_ras
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch
@@ -216130,6 +216135,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.enable_rast
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -217520,6 +217526,7 @@ dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.enable_raste
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt b/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
index 216d83d..bda7b4d 100644 (file)
--- a/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
+++ b/external/vulkancts/mustpass/main/vk-default/pipeline/pipeline-library.txt
@@ -208627,6 +208627,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -210018,6 +210019,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.enable_rast
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_patch
@@ -211409,6 +211411,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -212800,6 +212803,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.enable_
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -214191,6 +214195,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.enab
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_patch
@@ -215582,6 +215587,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.enabl
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -216972,6 +216978,7 @@ dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VK.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_patch

diff --git a/external/vulkancts/mustpass/main/vksc-default/pipeline.txt b/external/vulkancts/mustpass/main/vksc-default/pipeline.txt
index 60298ec..e6af82c 100644 (file)
--- a/external/vulkancts/mustpass/main/vksc-default/pipeline.txt
+++ b/external/vulkancts/mustpass/main/vksc-default/pipeline.txt
@@ -153986,6 +153986,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.enab
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -155377,6 +155378,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.enable_ra
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_draw.topology_patch
@@ -156768,6 +156770,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.ena
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -158159,6 +158162,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.enabl
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -159550,6 +159554,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.en
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.before_good_static.topology_patch
@@ -160941,6 +160946,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.ena
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -162331,6 +162337,7 @@ dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.enab
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.pipeline_library.extended_dynamic_state.two_draws_static.topology_patch
@@ -318993,6 +319000,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.enable_ras
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -320384,6 +320392,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.enable_raster
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_draw.topology_patch
@@ -321775,6 +321784,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.enable_ra
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.between_pipelines.topology_patch
@@ -323166,6 +323176,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.enable_rast
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.after_pipelines.topology_patch
@@ -324557,6 +324568,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.enable_r
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.before_good_static.topology_patch
@@ -325948,6 +325960,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.enable_ra
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -327338,6 +327351,7 @@ dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.enable_ras
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.monolithic.extended_dynamic_state.two_draws_static.topology_patch
@@ -483539,6 +483553,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.e
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.cmd_buffer_start.topology_patch
@@ -484930,6 +484945,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_draw.topology_patch
@@ -486321,6 +486337,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.between_pipelines.topology_patch
@@ -487712,6 +487729,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.en
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.after_pipelines.topology_patch
@@ -489103,6 +489121,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.before_good_static.topology_patch
@@ -490494,6 +490513,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_dynamic.topology_patch
@@ -491884,6 +491904,7 @@ dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.e
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.logic_op_or
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.prim_restart_enable
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points
+dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.patch_control_points_extra_pipeline
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_triangle
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_line
 dEQP-VKSC.pipeline.fast_linked_library.extended_dynamic_state.two_draws_static.topology_patch