diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2016-02-24 23:44:46 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2016-02-26 15:55:59 -0800 |
| commit | a0294c2cf3d23943c7f365abf84765afa0f383a2 (patch) | |
| tree | 3cebf03241ddfa2ac8b85b398e5fd6ede2463df9 /src/mesa/drivers/dri/i965/brw_nir.c | |
| parent | 8151003ade952c3e9d8284fada9237e1311cf173 (diff) | |
| download | external_mesa3d-a0294c2cf3d23943c7f365abf84765afa0f383a2.zip external_mesa3d-a0294c2cf3d23943c7f365abf84765afa0f383a2.tar.gz external_mesa3d-a0294c2cf3d23943c7f365abf84765afa0f383a2.tar.bz2 | |
i965: Simplify brw_nir_lower_vue_inputs() slightly.
The same code appeared in both branches; pull it above the if statement.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_nir.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 883603e..a5949d5 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -249,19 +249,14 @@ void brw_nir_lower_vue_inputs(nir_shader *nir, bool is_scalar, const struct brw_vue_map *vue_map) { - if (!is_scalar && nir->stage == MESA_SHADER_GEOMETRY) { - foreach_list_typed(nir_variable, var, node, &nir->inputs) { - var->data.driver_location = var->data.location; - } - nir_lower_io(nir, nir_var_shader_in, type_size_vec4); - } else { - foreach_list_typed(nir_variable, var, node, &nir->inputs) { - var->data.driver_location = var->data.location; - } + foreach_list_typed(nir_variable, var, node, &nir->inputs) { + var->data.driver_location = var->data.location; + } - /* Inputs are stored in vec4 slots, so use type_size_vec4(). */ - nir_lower_io(nir, nir_var_shader_in, type_size_vec4); + /* Inputs are stored in vec4 slots, so use type_size_vec4(). */ + nir_lower_io(nir, nir_var_shader_in, type_size_vec4); + if (is_scalar || nir->stage != MESA_SHADER_GEOMETRY) { /* This pass needs actual constants */ nir_opt_constant_folding(nir); |