diff --git a/.pick_status.json b/.pick_status.json index 885ed7cb5a4..813d40228aa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -967,7 +967,7 @@ "description": "radv: do not enable VRS flat shading if the VRS builtin is read", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index be5fa2f7fa4..ff80c395136 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -597,7 +597,8 @@ gather_shader_info_fs(const struct radv_device *device, const nir_shader *nir, info->ps.allow_flat_shading = !(uses_persp_or_linear_interp || info->ps.needs_sample_positions || - info->ps.writes_memory || nir->info.fs.needs_quad_helper_invocations || + info->ps.reads_frag_shading_rate || info->ps.writes_memory || + nir->info.fs.needs_quad_helper_invocations || BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_FRAG_COORD) || BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_POINT_COORD) || BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_SAMPLE_ID) ||