From 5f12ed0774bdeab69bc35eb2537de90e35b49b6d Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 9 Nov 2023 13:51:38 +0200 Subject: [PATCH] anv: fix CC_VIEWPORT pointer dirty after blorp/simple-shaders Signed-off-by: Lionel Landwerlin Fixes: 50f6903bd9 ("anv: add new low level emission & dirty state tracking") Reviewed-by: Ian Romanick Part-of: (cherry picked from commit 1257d08bcb9d7068ec24acbcf281a388e7ff015f) --- .pick_status.json | 2 +- src/intel/vulkan/genX_blorp_exec.c | 1 + src/intel/vulkan/genX_simple_shader.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 01fc530..8cab969 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -784,7 +784,7 @@ "description": "anv: fix CC_VIEWPORT pointer dirty after blorp/simple-shaders", "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 a983197..8585f4f 100644 --- a/src/intel/vulkan/genX_blorp_exec.c +++ b/src/intel/vulkan/genX_blorp_exec.c @@ -358,6 +358,7 @@ blorp_exec_on_render(struct blorp_batch *batch, #if GFX_VER >= 12 BITSET_SET(hw_state->dirty, ANV_GFX_STATE_PRIMITIVE_REPLICATION); #endif + BITSET_SET(hw_state->dirty, ANV_GFX_STATE_VIEWPORT_CC); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_STREAMOUT); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_RASTER); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_CLIP); diff --git a/src/intel/vulkan/genX_simple_shader.c b/src/intel/vulkan/genX_simple_shader.c index ee87eb6..6ce78b5 100644 --- a/src/intel/vulkan/genX_simple_shader.c +++ b/src/intel/vulkan/genX_simple_shader.c @@ -310,6 +310,7 @@ genX(emit_simpler_shader_init_fragment)(struct anv_simple_shader *state) BITSET_SET(hw_state->dirty, ANV_GFX_STATE_PRIMITIVE_REPLICATION); #endif BITSET_SET(hw_state->dirty, ANV_GFX_STATE_STREAMOUT); + BITSET_SET(hw_state->dirty, ANV_GFX_STATE_VIEWPORT_CC); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_CLIP); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_RASTER); BITSET_SET(hw_state->dirty, ANV_GFX_STATE_SAMPLE_MASK); -- 2.7.4