Mesa (staging/22.1): intel/blorp: Dirty depth bounds dynamic state bits after blorp

[GitLab Mirror]

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

Author: Sviatoslav Peleshko <sviatoslav.peleshko at globallogic.com>
Date:   Fri Jun 24 10:43:09 2022 +0300

intel/blorp: Dirty depth bounds dynamic state bits after blorp

Blorp emits its own 3DSTATE_DEPTH_BOUNDS, so we'll have to re-emit the
expected state after that.

Signed-off-by: Sviatoslav Peleshko <sviatoslav.peleshko at globallogic.com>
Fixes: 56ef501e3aa4 ("blorp: disable depth bounds")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17205>
(cherry picked from commit 3f6edbc7258ae4a92ebaf17749df1a824d2a4de1)

---

 .pick_status.json                  | 2 +-
 src/intel/vulkan/genX_blorp_exec.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f0b14466458..35719bca391 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -103,7 +103,7 @@
         "description": "intel/blorp: Dirty depth bounds dynamic state bits after blorp",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "56ef501e3aa4b12f41c0520bbc5fa920b0efa0f8"
     },
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 9ac9f258051..c73c7219383 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -337,11 +337,9 @@ blorp_exec_on_render(struct blorp_batch *batch,
     * Flush everything else.
     */
    anv_cmd_dirty_mask_t skip_bits = ANV_CMD_DIRTY_DYNAMIC_SCISSOR |
-                                    ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS |
                                     ANV_CMD_DIRTY_INDEX_BUFFER |
                                     ANV_CMD_DIRTY_XFB_ENABLE |
                                     ANV_CMD_DIRTY_DYNAMIC_LINE_STIPPLE |
-                                    ANV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE |
                                     ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS |
                                     ANV_CMD_DIRTY_DYNAMIC_SHADING_RATE |
                                     ANV_CMD_DIRTY_DYNAMIC_PRIMITIVE_RESTART_ENABLE;