From 024ccb1c4ba301aefcf0c58b6466637f6f0e6760 Mon Sep 17 00:00:00 2001 From: Danylo Piliaiev Date: Thu, 1 May 2025 19:00:07 +0200 Subject: [PATCH] tu: Fix disable_fs state update condition tu_calc_disable_fs depends on FS, so it should be updated on TU_CMD_DIRTY_FS. Fixes: be481e66159 ("tu: Disable FS in certain cases even if FS is not empty") Signed-off-by: Danylo Piliaiev Part-of: (cherry picked from commit 2797f42451ced49cdca1836350bf058c121e97ef) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_pipeline.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9c7ea0e4b5a..9a1bc470a96 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -594,7 +594,7 @@ "description": "tu: Fix disable_fs state update condition", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "be481e66159316b7147d82be3d87b0b63c9e624d", "notes": null diff --git a/src/freedreno/vulkan/tu_pipeline.cc b/src/freedreno/vulkan/tu_pipeline.cc index ca5a061c99b..9b4a63e6279 100644 --- a/src/freedreno/vulkan/tu_pipeline.cc +++ b/src/freedreno/vulkan/tu_pipeline.cc @@ -3955,7 +3955,7 @@ tu_emit_draw_state(struct tu_cmd_buffer *cmd) if (!cmd->state.pipeline_disable_fs && (EMIT_STATE(disable_fs) || - (cmd->state.dirty & TU_CMD_DIRTY_SUBPASS))) { + (cmd->state.dirty & (TU_CMD_DIRTY_SUBPASS | TU_CMD_DIRTY_FS)))) { bool disable_fs = tu_calc_disable_fs( &cmd->vk.dynamic_graphics_state.cb, &cmd->state.vk_rp, cmd->vk.dynamic_graphics_state.ms.alpha_to_coverage_enable,