From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 31 Jul 2018 18:31:22 +0000 (-0700)
Subject: intel/nir: Use the correct scalar stage for consumers when linking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e060385e9c46892535d2d62313d5e53f175c0f5;p=mesa.git

intel/nir: Use the correct scalar stage for consumers when linking

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 5990427b731..17ccfa48af6 100644
--- a/src/intel/compiler/brw_nir.c
+++ b/src/intel/compiler/brw_nir.c
@@ -730,7 +730,7 @@ brw_nir_link_shaders(const struct brw_compiler *compiler,
       *producer = brw_nir_optimize(*producer, compiler, p_is_scalar);
 
       const bool c_is_scalar =
-         compiler->scalar_stage[(*producer)->info.stage];
+         compiler->scalar_stage[(*consumer)->info.stage];
       *consumer = brw_nir_optimize(*consumer, compiler, c_is_scalar);
    }
 }