From 4ab14de32f3ed44f6b8bd6ed8e9974e9ad7056e5 Mon Sep 17 00:00:00 2001
From: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Date: Thu, 14 Nov 2024 11:14:42 +0100
Subject: [PATCH] panvk: Set fs.multisampled sysval for v10+

This allows us to observe writes to SampleMask, which would otherwise be
ignored.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32132>
---
 src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
index 4657ee3edb2..7df186bc786 100644
--- a/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
+++ b/src/panfrost/vulkan/csf/panvk_vX_cmd_draw.c
@@ -225,6 +225,12 @@ prepare_sysvals(struct panvk_cmd_buffer *cmdbuf)
    const struct vk_rasterization_state *rs =
       &cmdbuf->vk.dynamic_graphics_state.rs;
 
+   struct pan_fb_info *fbinfo = &cmdbuf->state.gfx.render.fb.info;
+   if (sysvals->fs.multisampled != (fbinfo->nr_samples > 1)) {
+      sysvals->fs.multisampled = fbinfo->nr_samples > 1;
+      cmdbuf->state.gfx.push_uniforms = 0;
+   }
+
    if (is_dirty(cmdbuf, CB_BLEND_CONSTANTS)) {
       for (unsigned i = 0; i < ARRAY_SIZE(cb->blend_constants); i++)
          sysvals->blend.constants[i] =