From caa1ba767c01124a9c5a9941a0c11cadb66b0f4b Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Tue, 23 May 2023 11:25:01 +0200 Subject: [PATCH] ac/nir: fix slots in clamping legacy colors fixes: 7c41cdb81f564ef52404e5f313ccfe2d723896e6 Reviewed-by: Qiang Yu Part-of: (cherry picked from commit e36761766807745f285874a57ef4d936553fa6c7) --- .pick_status.json | 2 +- src/amd/common/ac_nir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ea2f01fbc73..885ed7cb5a4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1156,7 +1156,7 @@ "description": "ac/nir: fix slots in clamping legacy colors", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7c41cdb81f564ef52404e5f313ccfe2d723896e6" }, diff --git a/src/amd/common/ac_nir.c b/src/amd/common/ac_nir.c index b4afb897ae9..a81f4118966 100644 --- a/src/amd/common/ac_nir.c +++ b/src/amd/common/ac_nir.c @@ -585,7 +585,7 @@ ac_nir_create_gs_copy_shader(const nir_shader *gs_nir, /* clamp legacy color output */ if (i == VARYING_SLOT_COL0 || i == VARYING_SLOT_COL1 || - i == VARYING_SLOT_BFC0 || i == VARYING_SLOT_BFC0) { + i == VARYING_SLOT_BFC0 || i == VARYING_SLOT_BFC1) { nir_ssa_def *color = outputs.data[i][j]; nir_ssa_def *clamp = nir_load_clamp_vertex_color_amd(&b); outputs.data[i][j] = nir_bcsel(&b, clamp, nir_fsat(&b, color), color);