Mesa (master): st/nir: Gather info after applying lowering FS variant features

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3a78b46e59318e58aba87e44689925a3bc84fa88
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a78b46e59318e58aba87e44689925a3bc84fa88

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Nov  1 11:57:09 2018 -0700

st/nir: Gather info after applying lowering FS variant features

DrawPixels lowering, for example, adds new varyings that need to be
accounted for in inputs_read.  The earlier info gathering at link time
cannot account for this.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_program.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 3bc7b0649c..422b7b2a59 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1103,6 +1103,10 @@ st_create_fp_variant(struct st_context *st,
                     key->external.lower_iyuv);
       }
 
+      /* Some of the lowering above may have introduced new varyings */
+      nir_shader_gather_info(tgsi.ir.nir,
+                             nir_shader_get_entrypoint(tgsi.ir.nir));
+
       variant->driver_shader = pipe->create_fs_state(pipe, &tgsi);
       variant->key = *key;