From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 13 Oct 2015 00:18:51 +0000 (-0700)
Subject: i965/fs: Simplify FS in brw_nir_lower_inputs to only support scalar mode
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63728dac57c18df0f45bb2482f60188fac2d1efe;p=mesa.git

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

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

diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c
index 4f35d81fc7e..5459ab59c1a 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");