Mesa (staging/22.1): anv: never emit 3DSTATE_CPS in the pipeline batch

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 579a90e3c4327944b64b5808b518f75a3b8e1fa0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=579a90e3c4327944b64b5808b518f75a3b8e1fa0

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Apr 28 09:15:02 2022 +0300

anv: never emit 3DSTATE_CPS in the pipeline batch

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16220>
(cherry picked from commit ce8bb293429142aeb89e424ba7879934def74637)

---

 .pick_status.json                  |  2 +-
 src/intel/vulkan/genX_pipeline.c   | 15 ---------------
 src/intel/vulkan/gfx8_cmd_buffer.c |  3 ++-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index ca51e90b8f5..2724483a02a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -976,7 +976,7 @@
         "description": "anv: never emit 3DSTATE_CPS in the pipeline batch",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 7069620f3f6..568ac99da16 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -949,19 +949,6 @@ emit_ms_state(struct anv_graphics_pipeline *pipeline,
    }
 }
 
-static void
-emit_3dstate_cps(struct anv_graphics_pipeline *pipeline, uint32_t dynamic_states)
-{
-#if GFX_VER >= 11
-   if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE) &&
-       pipeline->base.device->vk.enabled_extensions.KHR_fragment_shading_rate) {
-      genX(emit_shading_rate)(&pipeline->base.batch,
-                              pipeline,
-                              &pipeline->dynamic_state);
-   }
-#endif
-}
-
 const uint32_t genX(vk_to_intel_logic_op)[] = {
    [VK_LOGIC_OP_COPY]                        = LOGICOP_COPY,
    [VK_LOGIC_OP_CLEAR]                       = LOGICOP_CLEAR,
@@ -2905,8 +2892,6 @@ genX(graphics_pipeline_create)(
 
       emit_3dstate_vf_statistics(pipeline);
 
-      emit_3dstate_cps(pipeline, dynamic_states);
-
       emit_3dstate_streamout(pipeline, pCreateInfo->pRasterizationState,
                              dynamic_states);
 #if GFX_VERx10 >= 125
diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c
index 4f5c11885ba..7d100cf120d 100644
--- a/src/intel/vulkan/gfx8_cmd_buffer.c
+++ b/src/intel/vulkan/gfx8_cmd_buffer.c
@@ -323,7 +323,8 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
    struct anv_dynamic_state *d = &cmd_buffer->state.gfx.dynamic;
 
 #if GFX_VER >= 11
-   if (cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE)
+   if (cmd_buffer->device->vk.enabled_extensions.KHR_fragment_shading_rate &&
+       cmd_buffer->state.gfx.dirty & ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE)
       genX(emit_shading_rate)(&cmd_buffer->batch, pipeline, d);
 #endif /* GFX_VER >= 11 */