From 90c6ed5af2f1f1d4d8fa8be22da0b065eeb8877a Mon Sep 17 00:00:00 2001 From: Natalie Vock Date: Fri, 23 Aug 2024 18:47:02 +0200 Subject: [PATCH] radv: Only expose indirect raytracing on gfx7+ It relies on unaligned indirect dispatches which are broken on gfx6. Cc: mesa-stable Part-of: (cherry picked from commit 4de3a5cce374646ea89e12fefb4c21b9089fbd27) --- .pick_status.json | 2 +- src/amd/vulkan/radv_physical_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 00b9a97834a..f9f65d826a0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -904,7 +904,7 @@ "description": "radv: Only expose indirect raytracing on gfx7+", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index ffb1a57830c..a815d294c1a 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -1131,12 +1131,12 @@ radv_physical_device_get_features(const struct radv_physical_device *pdev, struc .rayTracingPipeline = true, .rayTracingPipelineShaderGroupHandleCaptureReplay = true, .rayTracingPipelineShaderGroupHandleCaptureReplayMixed = false, - .rayTracingPipelineTraceRaysIndirect = true, + .rayTracingPipelineTraceRaysIndirect = pdev->info.gfx_level >= GFX7, .rayTraversalPrimitiveCulling = true, /* VK_KHR_ray_tracing_maintenance1 */ .rayTracingMaintenance1 = true, - .rayTracingPipelineTraceRaysIndirect2 = radv_enable_rt(pdev), + .rayTracingPipelineTraceRaysIndirect2 = radv_enable_rt(pdev) && pdev->info.gfx_level >= GFX7, /* VK_KHR_ray_tracing_position_fetch */ .rayTracingPositionFetch = true,