anv: fix dirty state tracking for 3DSTATE_PUSH_CONSTANT_ALLOC

ANV_CMD_DIRTY_PIPELINE also includes reprogramming of
3DSTATE_PUSH_CONSTANT_ALLOC_* instructions.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 50f6903bd9 ("anv: add new low level emission & dirty state tracking")
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26247>
(cherry picked from commit 9689607f10bb150df0a75d189fc02b522410887f)

diff --git a/.pick_status.json b/.pick_status.json
index 8cab969..bc8cb2c 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -774,7 +774,7 @@
         "description": "anv: fix dirty state tracking for 3DSTATE_PUSH_CONSTANT_ALLOC",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "50f6903bd9c472eef2af2cbf62027df3bbe0ca8a",
         "notes": null

diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 8585f4f..a8ee4f7 100644 (file)
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -387,8 +387,7 @@ blorp_exec_on_render(struct blorp_batch *batch,
       BITSET_SET(hw_state->dirty, ANV_GFX_STATE_PS_BLEND);
    }
 
-   anv_cmd_dirty_mask_t dirty = ~(ANV_CMD_DIRTY_PIPELINE |
-                                  ANV_CMD_DIRTY_INDEX_BUFFER |
+   anv_cmd_dirty_mask_t dirty = ~(ANV_CMD_DIRTY_INDEX_BUFFER |
                                   ANV_CMD_DIRTY_XFB_ENABLE);
 
    cmd_buffer->state.gfx.vb_dirty = ~0;