From 4b5a101e0a41092519b825c7a95f886023ca19f6 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Fri, 17 Apr 2026 15:31:16 +0200 Subject: [PATCH] panvk: do not enable extension without required feature The Vulkan spec states that if VK_ARM_shader_core_builtins is supported, shaderCoreBuiltins is a required feature. So let's not enable that extension unless we can... Fixes: dff1d91c64e ("panvk: Enable VK_ARM_shader_core_builtins") Reviewed-by: Daniel Stone (cherry picked from commit 8cb89853b8f9993febb848ac83c5f6cf85aec11a) Part-of: --- .pick_status.json | 2 +- docs/features.txt | 2 +- src/panfrost/vulkan/panvk_vX_physical_device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 875e6654e46..2f664f24032 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1144,7 +1144,7 @@ "description": "panvk: do not enable extension without required feature", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "dff1d91c64e55541174141b528d90a7aeab9b0da", "notes": null diff --git a/docs/features.txt b/docs/features.txt index 7aff2b44854..5148319ffb2 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -721,7 +721,7 @@ Khronos extensions that are not part of any Vulkan version: VK_ANDROID_native_buffer DONE (anv, lvp, panvk, radv, tu, v3dv, vn) VK_ARM_rasterization_order_attachment_access DONE (lvp, tu, vn) VK_ARM_scheduling_controls DONE (panvk/v10+) - VK_ARM_shader_core_builtins DONE (panvk) + VK_ARM_shader_core_builtins DONE (panvk/v9+) VK_ARM_shader_core_properties DONE (panvk/v10+) VK_GOOGLE_decorate_string DONE (anv, hasvk, hk, kk, lvp, nvk, panvk, radv, tu, vn) VK_GOOGLE_hlsl_functionality1 DONE (anv, hasvk, hk, kk, lvp, nvk, panvk, radv, tu, vn) diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c index ed875d16ac9..40de99afcdf 100644 --- a/src/panfrost/vulkan/panvk_vX_physical_device.c +++ b/src/panfrost/vulkan/panvk_vX_physical_device.c @@ -221,7 +221,7 @@ panvk_per_arch(get_physical_device_extensions)( .VALVE_mutable_descriptor_type = PAN_ARCH >= 9, - .ARM_shader_core_builtins = true, + .ARM_shader_core_builtins = PAN_ARCH >= 9, .ARM_shader_core_properties = has_vk1_1, .ARM_scheduling_controls = PAN_ARCH >= 10, };