From 21acbe414e7507590e7b0a84fdec9435ab8223bc Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 18 Mar 2026 15:09:51 +0100 Subject: [PATCH] vulkan: rename VK_EXT_device_fault features They conflict with VK_KHR_device_fault. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_debug.c | 4 ++-- src/amd/vulkan/radv_physical_device.c | 4 ++-- src/vulkan/util/vk_physical_device_features_gen.py | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c index 7216434b61d..2b8f3ef9616 100644 --- a/src/amd/vulkan/radv_debug.c +++ b/src/amd/vulkan/radv_debug.c @@ -576,7 +576,7 @@ radv_dump_shader(struct radv_device *device, struct radv_pipeline *pipeline, str _mesa_blake3_compute(shader->dbg.spirv, shader->dbg.spirv_size, blake3); _mesa_blake3_format(blake3buf, blake3); - if (device->vk.enabled_features.deviceFaultVendorBinary) { + if (device->vk.enabled_features.deviceFaultVendorBinaryEXT) { spirv_print_asm(f, (const uint32_t *)shader->dbg.spirv, shader->dbg.spirv_size / 4); } else { fprintf(f, "SPIRV (see %s.spv)\n\n", blake3buf); @@ -979,7 +979,7 @@ radv_check_gpu_hangs(struct radv_queue *queue, const struct radv_winsys_submit_i struct radv_device *device = radv_queue_device(queue); const struct radv_physical_device *pdev = radv_device_physical(device); const struct radv_instance *instance = radv_physical_device_instance(pdev); - const bool save_hang_report = !device->vk.enabled_features.deviceFaultVendorBinary; + const bool save_hang_report = !device->vk.enabled_features.deviceFaultVendorBinaryEXT; struct radv_winsys_gpuvm_fault_info fault_info = {0}; /* Query if a VM fault happened for this GPU hang. */ diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index f0a218ade4d..5521268d29f 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -1371,8 +1371,8 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc .imageCompressionControl = pdev->info.gfx_level < GFX12, /* VK_EXT_device_fault */ - .deviceFault = true, - .deviceFaultVendorBinary = instance->debug_flags & RADV_DEBUG_HANG, + .deviceFaultEXT = true, + .deviceFaultVendorBinaryEXT = instance->debug_flags & RADV_DEBUG_HANG, /* VK_KHR_depth_clamp_zero_one */ .depthClampZeroOne = true, diff --git a/src/vulkan/util/vk_physical_device_features_gen.py b/src/vulkan/util/vk_physical_device_features_gen.py index aaa5b4337f5..e4963d595a0 100644 --- a/src/vulkan/util/vk_physical_device_features_gen.py +++ b/src/vulkan/util/vk_physical_device_features_gen.py @@ -47,6 +47,9 @@ RENAMED_FEATURES = { ('DeviceGeneratedCommandsFeaturesNV', 'deviceGeneratedCommands'): 'deviceGeneratedCommandsNV', ("RayTracingInvocationReorderFeaturesNV", "rayTracingInvocationReorder"): "rayTracingInvocationReorderNV", + + ('FaultFeaturesEXT', 'deviceFault'): 'deviceFaultEXT', + ('FaultFeaturesEXT', 'deviceFaultVendorBinary'): 'deviceFaultVendorBinaryEXT', } KNOWN_ALIASES = [