Mesa (staging/21.2): crocus/gen6: don't reemit the svbi when debugging

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 84f8a144c0d4dd6f682d35bf560ac7343aee6793
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84f8a144c0d4dd6f682d35bf560ac7343aee6793

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Sep 15 07:08:53 2021 +1000

crocus/gen6: don't reemit the svbi when debugging

This messes up the counts, stops some tests failing when reemit
is enabled

Fixes: f3630548f1da ("crocus: initial gallium driver for Intel gfx 4-7")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13188>
(cherry picked from commit f2bc6e400eff85850080fac0e039f2d918019253)

Conflicts:
	src/gallium/drivers/crocus/crocus_draw.c

---

 .pick_status.json                        | 2 +-
 src/gallium/drivers/crocus/crocus_draw.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 593ad98e1a4..3b432d1b881 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2821,7 +2821,7 @@
         "description": "crocus/gen6: don't reemit the svbi when debugging",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f3630548f1da904ec6c63b43ece7e68afdb8867e"
     },
diff --git a/src/gallium/drivers/crocus/crocus_draw.c b/src/gallium/drivers/crocus/crocus_draw.c
index cdfe6a63b26..73af322219c 100644
--- a/src/gallium/drivers/crocus/crocus_draw.c
+++ b/src/gallium/drivers/crocus/crocus_draw.c
@@ -406,8 +406,8 @@ crocus_draw_vbo(struct pipe_context *ctx,
    /* We can't safely re-emit 3DSTATE_SO_BUFFERS because it may zero the
     * write offsets, changing the behavior.
     */
-   if (unlikely(INTEL_DEBUG & DEBUG_REEMIT)) {
-      ice->state.dirty |= CROCUS_ALL_DIRTY_FOR_RENDER & ~CROCUS_DIRTY_GEN7_SO_BUFFERS;
+   if (INTEL_DEBUG & DEBUG_REEMIT) {
+      ice->state.dirty |= CROCUS_ALL_DIRTY_FOR_RENDER & ~(CROCUS_DIRTY_GEN7_SO_BUFFERS | CROCUS_DIRTY_GEN6_SVBI);
       ice->state.stage_dirty |= CROCUS_ALL_STAGE_DIRTY_FOR_RENDER;
    }