radv: fix amount of sample shading with required sample shaded inputs

The Vulkan spec says:

If a fragment shader entry point statically uses an input variable
decorated with a BuiltIn of SampleId or SamplePosition,
sample shading is enabled and a value of 1.0 is used instead of minSampleShading.
If a fragment shader entry point statically uses an input variable decorated
with Sample, sample shading may be enabled and a value of 1.0 will be
used instead of minSampleShading if it is.

This means we have to overwrite the command buffer state entirely.

Cc: mesa-stable

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
(cherry picked from commit e7a035df65)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41540>
This commit is contained in:
Georg Lehmann 2026-05-11 14:55:25 +02:00 committed by Eric Engestrom
parent 6f58212969
commit df3a0e127f
2 changed files with 8 additions and 2 deletions

View file

@ -794,7 +794,7 @@
"description": "radv: fix amount of sample shading with required sample shaded inputs",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -1969,13 +1969,19 @@ radv_is_sample_shading_enabled(struct radv_cmd_buffer *cmd_buffer, float *min_sa
if (min_sample_shading)
*min_sample_shading = 1.0f;
/* If the PS requires sample shading for inputs,
* min_sample_shading is overwritten to 1.0.
*/
if (ps && ps->info.ps.uses_sample_shading)
return true;
if (cmd_buffer->state.ms.sample_shading_enable) {
if (min_sample_shading)
*min_sample_shading = cmd_buffer->state.ms.min_sample_shading;
return true;
}
return ps ? ps->info.ps.uses_sample_shading : false;
return false;
}
static ALWAYS_INLINE unsigned