Mesa (staging/21.1): mesa: clear shader_info::is_lowered in prog_to_nir

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: e1edeff0ae5c241fbd7a75da782c8642a2084434
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1edeff0ae5c241fbd7a75da782c8642a2084434

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Jun 29 10:10:17 2021 +0200

mesa: clear shader_info::is_lowered in prog_to_nir

This needs to be resetted each time prog_to_nir is called because it
turns st_nir_assign_vs_in_locations into a no-op when set.

Fixes: 81d106d6eca ("radeonsi: lower IO intrinsics - complete rewrite of input/output scanning")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5001
Reviewed-by: Isaac Bosompem <mrisaacb at google.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11636>
(cherry picked from commit bcf8c7910d05a40fc11caf7b6e0f592741303cd1)

---

 .pick_status.json              | 2 +-
 src/mesa/program/prog_to_nir.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 54484564403..93b8854b278 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -868,7 +868,7 @@
         "description": "mesa: clear shader_info::is_lowered in prog_to_nir",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "81d106d6ecab326c96fb9f8db8e7f39621c9816e"
     },
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c
index 72f4dcdc487..c5dd37fd976 100644
--- a/src/mesa/program/prog_to_nir.c
+++ b/src/mesa/program/prog_to_nir.c
@@ -1024,6 +1024,7 @@ prog_to_nir(const struct gl_program *prog,
    s->info.clip_distance_array_size = 0;
    s->info.cull_distance_array_size = 0;
    s->info.separate_shader = false;
+   s->info.io_lowered = false;
 
 fail:
    if (c->error) {