Mesa (master): i965/fs: Simplify FS in brw_nir_lower_inputs to only support scalar mode

[Jordan Justen]

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

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Mon Oct 12 17:18:51 2015 -0700

i965/fs: Simplify FS in brw_nir_lower_inputs to only support scalar mode

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/brw_nir.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
index 4f35d81..5459ab5 100644
--- a/src/mesa/drivers/dri/i965/brw_nir.c
+++ b/src/mesa/drivers/dri/i965/brw_nir.c
@@ -96,8 +96,9 @@ brw_nir_lower_inputs(nir_shader *nir, bool is_scalar)
       }
       break;
    case MESA_SHADER_FRAGMENT:
+      assert(is_scalar);
       nir_assign_var_locations(&nir->inputs, &nir->num_inputs,
-                               is_scalar ? type_size_scalar : type_size_vec4);
+                               type_size_scalar);
       break;
    default:
       unreachable("unsupported shader stage");