diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-05-06 09:42:55 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-05-07 10:08:37 -0700 |
| commit | 9109f99add0593d2496d1bfc78afd5c1b9761623 (patch) | |
| tree | b713e1d2e0dd1020aba7f5fa29c840eb850c9b8f /.pick_status.json | |
| parent | c6a65843ff12fea102fa11ee499cbc30af284353 (diff) | |
radeonsi: fix compilation of monolithic PS
This was totally broken. Monolithic PS is only used if FBFETCH or
interpolateAtSample are used.
When the PS prolog was built, it overwrote ctx->main_fn.
Discovered by @eefano.
Fixes: 8832a884345686e6a8b2c0c8aa7515ad3f775b9e "radeonsi: move PS LLVM code into si_shader_llvm_ps.c"
Closes: #2814
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4918>
(cherry picked from commit 29da52128090a1ef8ef782188c0f67c7f5ec8d19)
Diffstat (limited to '.pick_status.json')
| -rw-r--r-- | .pick_status.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 5150e5e3144..ca57c965209 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -283,7 +283,7 @@ "description": "radeonsi: fix compilation of monolithic PS", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "8832a884345686e6a8b2c0c8aa7515ad3f775b9e" }, |