Mesa (staging/21.3): anv: don't set color state when input state was requested

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 52903cdd8fb649f8b69dc3fe039feb88cdcf4eb3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=52903cdd8fb649f8b69dc3fe039feb88cdcf4eb3

Author: Marcin Ślusarz <marcin.slusarz at intel.com>
Date:   Tue Feb  1 14:39:39 2022 +0100

anv: don't set color state when input state was requested

Fixes: 814dc669359 ("anv: Allocate surface states per-subpass")

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15081>
(cherry picked from commit 037e98a10c4a4e719fe243f9a39074d3f77c00d7)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 801465dba57..44662d6d400 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -148,7 +148,7 @@
         "description": "anv: don't set color state when input state was requested",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "814dc6693593c51d7d89da54ab6191dbf862397e"
     },
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index a3964c222a5..8b249093b31 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -1706,7 +1706,6 @@ genX(cmd_buffer_alloc_att_surf_states)(struct anv_cmd_buffer *cmd_buffer,
       else
          continue;
 
-      state->attachments[att].color.state = next_state;
       next_state.offset += ss_stride;
       next_state.map += ss_stride;
    }