diff options
| author | Emma Anholt <emma@anholt.net> | 2022-04-20 16:30:37 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-05-02 10:46:38 -0700 |
| commit | d6accbe0400bab0cf7e80360635f03fd2739f067 (patch) | |
| tree | 2b54d0b073b03cd1db122a37b6fd23c6c9ac0ecb /.pick_status.json | |
| parent | 9b6b1445f753cde0f0cc305faa9c1d063c2448ad (diff) | |
nouveau/nir: Move FS output stores to the end of the last block.
The nir_move/sink caused instructions to sink interleaved into the output
stores at the end of the shader. nouveau's RA doesn't track liveness of
FS outputs in registers after the export instruction, so they could end up
overwritten. To work around it, after normal NIR move/sink, move the
output stores back to the end of the shader.
Fixes: b1fa2068b8e8 ("nouveau/nir: Enable nir_opt_move/sink.")
Reviewed-by: M Henning <drawoc@darkrefraction.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15949>
(cherry picked from commit 3ddc505400ee91905cc4ee0762947b8377db5504)
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 82d87e11608..a30e3ddf2a7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -958,7 +958,7 @@ "description": "nouveau/nir: Move FS output stores to the end of the last block.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b1fa2068b8e87474e1a0e3c98e2bff0e744348f3" }, |