diff options
Diffstat (limited to 'src/intel')
| -rw-r--r-- | src/intel/compiler/brw_nir.c | 10 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index 9ba3fca4e0c..77c6c4e0e5a 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -527,7 +527,7 @@ brw_nir_no_indirect_mask(const struct brw_compiler *compiler, if (compiler->glsl_compiler_options[stage].EmitNoIndirectOutput) indirect_mask |= nir_var_shader_out; if (compiler->glsl_compiler_options[stage].EmitNoIndirectTemp) - indirect_mask |= nir_var_local; + indirect_mask |= nir_var_function; return indirect_mask; } @@ -542,8 +542,8 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, bool progress; do { progress = false; - OPT(nir_split_array_vars, nir_var_local); - OPT(nir_shrink_vec_array_vars, nir_var_local); + OPT(nir_split_array_vars, nir_var_function); + OPT(nir_shrink_vec_array_vars, nir_var_function); OPT(nir_lower_vars_to_ssa); if (allow_copies) { /* Only run this pass in the first call to brw_nir_optimize. Later @@ -627,7 +627,7 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, /* Workaround Gfxbench unused local sampler variable which will trigger an * assert in the opt_large_constants pass. */ - OPT(nir_remove_dead_variables, nir_var_local); + OPT(nir_remove_dead_variables, nir_var_function); return nir; } @@ -692,7 +692,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir) OPT(nir_lower_global_vars_to_local); OPT(nir_split_var_copies); - OPT(nir_split_struct_vars, nir_var_local); + OPT(nir_split_struct_vars, nir_var_function); /* Run opt_algebraic before int64 lowering so we can hopefully get rid * of some int64 instructions. diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 750e258c2d2..d1efaaf060b 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -185,7 +185,7 @@ anv_shader_compile_to_nir(struct anv_pipeline *pipeline, * inline functions. That way they get properly initialized at the top * of the function and not at the top of its caller. */ - NIR_PASS_V(nir, nir_lower_constant_initializers, nir_var_local); + NIR_PASS_V(nir, nir_lower_constant_initializers, nir_var_function); NIR_PASS_V(nir, nir_lower_returns); NIR_PASS_V(nir, nir_inline_functions); NIR_PASS_V(nir, nir_opt_deref); @@ -788,7 +788,7 @@ anv_pipeline_link_fs(const struct brw_compiler *compiler, !(stage->key.wm.color_outputs_valid & (1 << rt))) { /* Unused or out-of-bounds, throw it away */ deleted_output = true; - var->data.mode = nir_var_local; + var->data.mode = nir_var_function; exec_node_remove(&var->node); exec_list_push_tail(&impl->locals, &var->node); continue; |