tu: tu: Clear patchControlPoints dirty state with static patchControlPoints

Noticed by inspection after the previous issue.

Fixes: 68f3c38c801 ("tu: Implement extendedDynamicState2PatchControlPoints")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18912>
(cherry picked from commit 4466f9aa02dec99c6879e5e357788843c3b573e5)

diff --git a/.pick_status.json b/.pick_status.json
index 4b4658f..da27178 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2002,7 +2002,7 @@
         "description": "tu: tu: Clear patchControlPoints dirty state with static patchControlPoints",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "68f3c38c8011e3ff304a67b6ffb33fd21ee65b0c"
     },

diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c
index db18d28..d8b92af 100644 (file)
--- a/src/freedreno/vulkan/tu_cmd_buffer.c
+++ b/src/freedreno/vulkan/tu_cmd_buffer.c
@@ -2594,10 +2594,12 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer,
       cmd->state.rp.has_tess = true;
 
       if (!(pipeline->dynamic_state_mask &
-            BIT(TU_DYNAMIC_STATE_PATCH_CONTROL_POINTS)))
+            BIT(TU_DYNAMIC_STATE_PATCH_CONTROL_POINTS))) {
          cmd->state.patch_control_points = pipeline->tess.patch_control_points;
-      else
+         cmd->state.dirty &= ~TU_CMD_DIRTY_PATCH_CONTROL_POINTS;
+      } else {
          cmd->state.dirty |= TU_CMD_DIRTY_PATCH_CONTROL_POINTS;
+      }
    }
 
    cmd->state.line_mode = pipeline->rast.line_mode;