Mesa (master): radeonsi: clear dirty_states if si_pm4_bind_state is unbinding or no-op

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 488cd3b93fc894689544b0c9b6436b88adc3559a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=488cd3b93fc894689544b0c9b6436b88adc3559a

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Jan  9 07:59:11 2021 -0500

radeonsi: clear dirty_states if si_pm4_bind_state is unbinding or no-op

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8653>

---

 src/gallium/drivers/radeonsi/si_state.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index a293787487a..a4ce4e77337 100644
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -478,7 +478,10 @@ struct si_buffer_resources {
 #define si_pm4_bind_state(sctx, member, value)                                                     \
    do {                                                                                            \
       (sctx)->queued.named.member = (value);                                                       \
-      (sctx)->dirty_states |= SI_STATE_BIT(member);                                                \
+      if (value && value != (sctx)->emitted.named.member)                                          \
+         (sctx)->dirty_states |= SI_STATE_BIT(member);                                             \
+      else                                                                                         \
+         (sctx)->dirty_states &= ~SI_STATE_BIT(member);                                            \
    } while (0)
 
 #define si_pm4_delete_state(sctx, member, value)                                                   \