Mesa (master): i965: Use NIR for scalar VS when INTEL_USE_NIR is set.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Mar  9 01:58:59 2015 -0700

i965: Use NIR for scalar VS when INTEL_USE_NIR is set.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/mesa/drivers/dri/i965/brw_fs.cpp |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 6d7cf0e..8702ea8 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3840,12 +3840,17 @@ fs_visitor::run_vs()
    if (INTEL_DEBUG & DEBUG_SHADER_TIME)
       emit_shader_time_begin();
 
-   foreach_in_list(ir_instruction, ir, shader->base.ir) {
-      base_ir = ir;
-      this->result = reg_undef;
-      ir->accept(this);
+   if (getenv("INTEL_USE_NIR") != NULL) {
+      emit_nir_code();
+   } else {
+      foreach_in_list(ir_instruction, ir, shader->base.ir) {
+         base_ir = ir;
+         this->result = reg_undef;
+         ir->accept(this);
+      }
+      base_ir = NULL;
    }
-   base_ir = NULL;
+
    if (failed)
       return false;