diff --git a/.pick_status.json b/.pick_status.json index 0c7f51e2ff6..167fc5c5331 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2394,7 +2394,7 @@ "description": "radv: fix when incomplete rt pipeline libraries are loaded from cache", "nominated": true, "nomination_type": 4, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index b84042d268a..3a8cd636434 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -674,7 +674,7 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca bool can_use_monolithic = !library && pipeline->stage_count < 50; for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { - if (rt_stages[i].shader || rt_stages[i].nir) + if (rt_stages[i].nir) continue; int64_t stage_start = os_time_get_nano(); @@ -749,7 +749,7 @@ radv_rt_compile_shaders(struct radv_device *device, struct vk_pipeline_cache *ca inline_any_hit_shaders |= raygen_lowering_mode == RADV_RT_LOWERING_MODE_MONOLITHIC && !raygen_imported; for (uint32_t idx = 0; idx < pCreateInfo->stageCount; idx++) { - if (rt_stages[idx].shader || rt_stages[idx].nir) + if (rt_stages[idx].nir) continue; int64_t stage_start = os_time_get_nano();