diff options
| -rw-r--r-- | src/glsl/nir/nir.h | 1 | ||||
| -rw-r--r-- | src/glsl/nir/nir_lower_io.c | 21 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_nir.c | 4 |
3 files changed, 20 insertions, 6 deletions
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index d0c7b04a49f..bf5d41d43a9 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -1822,6 +1822,7 @@ void nir_assign_var_locations(struct exec_list *var_list, int (*type_size)(const struct glsl_type *)); void nir_lower_io(nir_shader *shader, + nir_variable_mode mode, int (*type_size)(const struct glsl_type *)); void nir_lower_vars_to_ssa(nir_shader *shader); diff --git a/src/glsl/nir/nir_lower_io.c b/src/glsl/nir/nir_lower_io.c index 9f79c5606ca..f32c09d04a2 100644 --- a/src/glsl/nir/nir_lower_io.c +++ b/src/glsl/nir/nir_lower_io.c @@ -38,6 +38,7 @@ struct lower_io_state { nir_builder builder; void *mem_ctx; int (*type_size)(const struct glsl_type *type); + nir_variable_mode mode; }; void @@ -154,9 +155,17 @@ nir_lower_io_block(nir_block *block, void *void_state) nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); + if (intrin->intrinsic != nir_intrinsic_load_var && + intrin->intrinsic != nir_intrinsic_store_var) + continue; + + nir_variable_mode mode = intrin->variables[0]->var->data.mode; + + if (state->mode != -1 && state->mode != mode) + continue; + switch (intrin->intrinsic) { case nir_intrinsic_load_var: { - nir_variable_mode mode = intrin->variables[0]->var->data.mode; if (mode != nir_var_shader_in && mode != nir_var_uniform) continue; @@ -239,12 +248,15 @@ nir_lower_io_block(nir_block *block, void *void_state) } static void -nir_lower_io_impl(nir_function_impl *impl, int(*type_size)(const struct glsl_type *)) +nir_lower_io_impl(nir_function_impl *impl, + nir_variable_mode mode, + int (*type_size)(const struct glsl_type *)) { struct lower_io_state state; nir_builder_init(&state.builder, impl); state.mem_ctx = ralloc_parent(impl); + state.mode = mode; state.type_size = type_size; nir_foreach_block(impl, nir_lower_io_block, &state); @@ -254,10 +266,11 @@ nir_lower_io_impl(nir_function_impl *impl, int(*type_size)(const struct glsl_typ } void -nir_lower_io(nir_shader *shader, int(*type_size)(const struct glsl_type *)) +nir_lower_io(nir_shader *shader, nir_variable_mode mode, + int (*type_size)(const struct glsl_type *)) { nir_foreach_overload(shader, overload) { if (overload->impl) - nir_lower_io_impl(overload->impl, type_size); + nir_lower_io_impl(overload->impl, mode, type_size); } } diff --git a/src/mesa/drivers/dri/i965/brw_nir.c b/src/mesa/drivers/dri/i965/brw_nir.c index 1d4f6ab2ccd..40a83268979 100644 --- a/src/mesa/drivers/dri/i965/brw_nir.c +++ b/src/mesa/drivers/dri/i965/brw_nir.c @@ -128,7 +128,7 @@ brw_create_nir(struct brw_context *brw, type_size_scalar); nir_assign_var_locations(&nir->inputs, &nir->num_inputs, type_size_scalar); nir_assign_var_locations(&nir->outputs, &nir->num_outputs, type_size_scalar); - nir_lower_io(nir, type_size_scalar); + nir_lower_io(nir, -1, type_size_scalar); } else { nir_assign_var_locations(&nir->uniforms, &nir->num_uniforms, @@ -139,7 +139,7 @@ brw_create_nir(struct brw_context *brw, foreach_list_typed(nir_variable, var, node, &nir->outputs) var->data.driver_location = var->data.location; - nir_lower_io(nir, type_size_vec4); + nir_lower_io(nir, -1, type_size_vec4); } nir_validate_shader(nir); |