summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2023-05-16 11:58:42 +0200
committerMarge Bot <emma+marge@anholt.net>2023-05-17 06:12:19 +0000
commit518425d107f578207836ad4e4b2f26b12487b36f (patch)
tree3a2366130bb8534880f71fd43afc79af3e62b78d
parentcc99fd42f6d04e7adea0f6eb59750e34af764734 (diff)
downloadmesa-518425d107f578207836ad4e4b2f26b12487b36f.tar.gz
radv: fix emitting VRS state with a null fragment shader
Found this while debugging a VRS issue with Valhalla. Fixes: 87245c6e8e6 ("radv: handle NULL fragment shaders when recording cmdbuf") Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23050>
-rw-r--r--src/amd/vulkan/radv_cmd_buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 03583d1b287..0eaad288512 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2354,7 +2354,7 @@ radv_emit_fragment_shading_rate(struct radv_cmd_buffer *cmd_buffer)
* 2) the fragment shader reads gl_SampleMaskIn because the 16-bit sample coverage mask isn't
* enough for MSAA8x and 2x2 coarse shading isn't enough.
*/
- if (cmd_buffer->state.ms.sample_shading_enable || ps->info.ps.reads_sample_mask_in) {
+ if (cmd_buffer->state.ms.sample_shading_enable || (ps && ps->info.ps.reads_sample_mask_in)) {
pa_cl_vrs_cntl |= S_028848_SAMPLE_ITER_COMBINER_MODE(V_028848_SC_VRS_COMB_MODE_OVERRIDE);
}