From 6f2d97ef412b5d1f1795875db2d3d56d4758dacc Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Mon, 26 Jan 2026 19:17:01 -0800 Subject: [PATCH] Revert "panvk: advertise VK_EXT_primitives_generated_query on v10+" This reverts commit 6eadcaa851d2826eaeeacfb76f01f31d6cd2dd27. VK_EXT_primitives_generated_query has a dependency on VK_EXT_transform_feedback, which we do not implement yet. This is breaking the android CTS. It will be reenabled once transform feedback is in. Signed-off-by: Olivia Lee Reviewed-by: Erik Faye-Lund Reviewed-by: Valentine Burley Part-of: (cherry picked from commit 4959f45e99e62619cf334b972337abc526632f8a) --- .pick_status.json | 2 +- src/panfrost/vulkan/panvk_vX_physical_device.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 87984794ae1..04f448c65c1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -254,7 +254,7 @@ "description": "Revert \"panvk: advertise VK_EXT_primitives_generated_query on v10+\"", "nominated": true, "nomination_type": 3, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "6eadcaa851d2826eaeeacfb76f01f31d6cd2dd27", "notes": null diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c index 95bf68b8d09..b3f751998fc 100644 --- a/src/panfrost/vulkan/panvk_vX_physical_device.c +++ b/src/panfrost/vulkan/panvk_vX_physical_device.c @@ -166,7 +166,6 @@ panvk_per_arch(get_physical_device_extensions)( .EXT_pipeline_robustness = true, .EXT_private_data = true, .EXT_primitive_topology_list_restart = true, - .EXT_primitives_generated_query = PAN_ARCH >= 10, .EXT_provoking_vertex = true, .EXT_queue_family_foreign = true, .EXT_robustness2 = PAN_ARCH >= 10, @@ -474,12 +473,6 @@ panvk_per_arch(get_physical_device_features)( .primitiveTopologyListRestart = true, .primitiveTopologyPatchListRestart = false, - /* VK_EXT_primitives_generated_query */ - .primitivesGeneratedQuery = PAN_ARCH >= 10, - .primitivesGeneratedQueryWithRasterizerDiscard = PAN_ARCH >= 10, - /* TODO: xfb */ - .primitivesGeneratedQueryWithNonZeroStreams = false, - /* VK_EXT_provoking_vertex */ .provokingVertexLast = true, .transformFeedbackPreservesProvokingVertex = false,