Module: Mesa Branch: staging/22.3 Commit: 68f5d7acc3ac204d6dde65f117ff4b285e0f54e4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=68f5d7acc3ac204d6dde65f117ff4b285e0f54e4
Author: Rhys Perry <[email protected]> Date: Wed Jan 25 19:19:17 2023 +0000 aco: set has_color_exports with GPL Signed-off-by: Rhys Perry <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Fixes: 192486b7aa5 ("aco/gfx11: export mrtz in discard early exit for non-color shaders") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20937> (cherry picked from commit 695cf75266f43c0f9d123c5030b136bbdf061d4c) --- .pick_status.json | 2 +- src/amd/compiler/aco_instruction_selection.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 39ec1db16e2..8c540f6b6ba 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -220,7 +220,7 @@ "description": "aco: set has_color_exports with GPL", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "192486b7aa5ef3b24516e16b0e219fad7032fb7c" }, diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 7ab54194197..75776be6225 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -11497,6 +11497,9 @@ create_fs_exports(isel_context* ctx) if (ctx->program->info.ps.has_epilog) { create_fs_jump_to_epilog(ctx); + + /* FS epilogs always have at least one color/null export. */ + ctx->program->has_color_exports = true; } else { struct aco_export_mrt mrts[8]; unsigned compacted_mrt_index = 0;
