Mesa (staging/20.1): panfrost: Fix blend leak for render targets 5-8

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 99c3201e4c90691ca2a66451a8392dea77fd0065
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99c3201e4c90691ca2a66451a8392dea77fd0065

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Mon Aug 17 19:57:54 2020 -0400

panfrost: Fix blend leak for render targets 5-8

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Fixes: 375d4c2c74d ("panfrost: Extend blending to MRT")
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6373>
(cherry picked from commit ba4fc67812cd052a4c89cac0f376326f52da1fda)

---

 .pick_status.json                            | 2 +-
 src/gallium/drivers/panfrost/pan_blend_cso.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index e7ec36462e7..6d0d01163ee 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -778,7 +778,7 @@
         "description": "panfrost: Fix blend leak for render targets 5-8",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "375d4c2c74d5a7003e03c4e610b466bd0d7d1a53"
     },
diff --git a/src/gallium/drivers/panfrost/pan_blend_cso.c b/src/gallium/drivers/panfrost/pan_blend_cso.c
index d0824ed488f..52575cb0389 100644
--- a/src/gallium/drivers/panfrost/pan_blend_cso.c
+++ b/src/gallium/drivers/panfrost/pan_blend_cso.c
@@ -166,7 +166,7 @@ panfrost_delete_blend_state(struct pipe_context *pipe,
 {
         struct panfrost_blend_state *blend = (struct panfrost_blend_state *) cso;
 
-        for (unsigned c = 0; c < 4; ++c) {
+        for (unsigned c = 0; c < PIPE_MAX_COLOR_BUFS; ++c) {
                 struct panfrost_blend_rt *rt = &blend->rt[c];
                 _mesa_hash_table_u64_clear(rt->shaders, panfrost_delete_blend_shader);
         }