From e834ac4863376f90c30f8b2cf3fa2b10ef19133b Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 17 Aug 2020 19:57:54 -0400 Subject: [PATCH] panfrost: Fix blend leak for render targets 5-8 Signed-off-by: Alyssa Rosenzweig Fixes: 375d4c2c74d ("panfrost: Extend blending to MRT") Reviewed-by: Tomeu Vizoso Part-of: (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 cb53afb72d9..62264175c70 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -589,7 +589,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 01b4fd33a10..aa4619b5dd1 100644 --- a/src/gallium/drivers/panfrost/pan_blend_cso.c +++ b/src/gallium/drivers/panfrost/pan_blend_cso.c @@ -165,7 +165,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); }