Mesa (staging/22.1): anv: don't emit 3DSTATE_DEPTH_BOUNDS in pipeline batch

[GitLab Mirror]

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

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Thu Apr 28 10:42:44 2022 +0300

anv: don't emit 3DSTATE_DEPTH_BOUNDS in 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 48229d11bab48569250e8ef43d6476f2ef3b9281)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 009fc464df5..ec66119343a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -940,7 +940,7 @@
         "description": "anv: don't emit 3DSTATE_DEPTH_BOUNDS in 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 cd917031b17..e56c90f9b70 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1258,17 +1258,6 @@ emit_ds_state(struct anv_graphics_pipeline *pipeline,
 #else
    GENX(3DSTATE_WM_DEPTH_STENCIL_pack)(NULL, depth_stencil_dw, &depth_stencil);
 #endif
-
-#if GFX_VER >= 12
-   if ((dynamic_states & (ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS |
-                          ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE)) == 0) {
-      anv_batch_emit(&pipeline->base.batch, GENX(3DSTATE_DEPTH_BOUNDS), db) {
-         db.DepthBoundsTestEnable = pCreateInfo->depthBoundsTestEnable;
-         db.DepthBoundsTestMinValue = pCreateInfo->minDepthBounds;
-         db.DepthBoundsTestMaxValue = pCreateInfo->maxDepthBounds;
-      }
-   }
-#endif
 }
 
 static bool
diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c
index c2164d01503..d229d1f603e 100644
--- a/src/intel/vulkan/gfx8_cmd_buffer.c
+++ b/src/intel/vulkan/gfx8_cmd_buffer.c
@@ -560,8 +560,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
 #endif
 
 #if GFX_VER >= 12
-   if(cmd_buffer->state.gfx.dirty & (ANV_CMD_DIRTY_PIPELINE |
-                                     ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS |
+   if(cmd_buffer->state.gfx.dirty & (ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS |
                                      ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE)) {
       anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_DEPTH_BOUNDS), db) {
          db.DepthBoundsTestEnable = d->depth_bounds_test_enable;