From de3dd2afdfe38be58850813f8fdbdf90152bb840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 11 Feb 2025 12:59:29 -0500 Subject: [PATCH] Revert "ac/nir: clamp vertex color outputs in the right place" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b3fc49686edb33f3a67ab4a94ef9f218785765c0. It was a rebase failure. Fixes: b3fc49686edb33f3a67a Reviewed-by: Timur Kristóf Part-of: (cherry picked from commit 177c9b173e2a91150417ef1658e839f2674147c3) --- .pick_status.json | 2 +- src/amd/common/nir/ac_nir_lower_legacy_vs.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fa099f738fb..4983abfe185 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3864,7 +3864,7 @@ "description": "Revert \"ac/nir: clamp vertex color outputs in the right place\"", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b3fc49686edb33f3a67ab4a94ef9f218785765c0", "notes": null diff --git a/src/amd/common/nir/ac_nir_lower_legacy_vs.c b/src/amd/common/nir/ac_nir_lower_legacy_vs.c index 458c05d0dcd..4cacc0293f7 100644 --- a/src/amd/common/nir/ac_nir_lower_legacy_vs.c +++ b/src/amd/common/nir/ac_nir_lower_legacy_vs.c @@ -70,9 +70,6 @@ ac_nir_lower_legacy_vs(nir_shader *nir, /* This should be after streamout and before exports. */ ac_nir_clamp_vertex_color_outputs(&b, &out); - /* This should be after streamout and before exports. */ - ac_nir_clamp_vertex_color_outputs(&b, &out); - uint64_t export_outputs = nir->info.outputs_written | VARYING_BIT_POS; if (kill_pointsize) export_outputs &= ~VARYING_BIT_PSIZ;