Mesa (master): intel/nir: Use the correct scalar stage for consumers when linking

[GitLab Mirror]

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

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Jul 31 11:31:22 2018 -0700

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

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

---

 src/intel/compiler/brw_nir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c
index 5990427b73..17ccfa48af 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);
    }
 }