diff options
| author | Karol Herbst <[email protected]> | 2019-01-16 00:05:04 +0100 |
|---|---|---|
| committer | Karol Herbst <[email protected]> | 2019-01-19 20:01:41 +0100 |
| commit | 9b24028426702f8d4c8c1f563ff9d32b99532357 (patch) | |
| tree | daa3cb7bd7cac479cfd6f734e2c1b2b211a085da /src/amd | |
| parent | e5daef95877047d6c820953666dc570237c988db (diff) | |
nir: rename nir_var_function to nir_var_function_temp
Signed-off-by: Karol Herbst <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_nir_to_llvm.c | 6 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 2701ebbd78e..e3475e1e94f 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -1946,7 +1946,7 @@ static LLVMValueRef visit_load_var(struct ac_nir_context *ctx, values[chan] = ctx->abi->inputs[idx + chan + const_index * stride]; } break; - case nir_var_function: + case nir_var_function_temp: for (unsigned chan = 0; chan < ve; chan++) { if (indir_index) { unsigned count = glsl_count_attribute_slots( @@ -2078,7 +2078,7 @@ visit_store_var(struct ac_nir_context *ctx, } } break; - case nir_var_function: + case nir_var_function_temp: for (unsigned chan = 0; chan < 8; chan++) { if (!(writemask & (1 << chan))) continue; @@ -4146,7 +4146,7 @@ ac_lower_indirect_derefs(struct nir_shader *nir, enum chip_class chip_class) * See the following thread for more details of the problem: * https://lists.freedesktop.org/archives/mesa-dev/2017-July/162106.html */ - indirect_mask |= nir_var_function; + indirect_mask |= nir_var_function_temp; nir_lower_indirect_derefs(nir, indirect_mask); } diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 7d78f62c2c4..42f5e4efe6c 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -126,8 +126,8 @@ radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively, do { progress = false; - NIR_PASS(progress, shader, nir_split_array_vars, nir_var_function); - NIR_PASS(progress, shader, nir_shrink_vec_array_vars, nir_var_function); + NIR_PASS(progress, shader, nir_split_array_vars, nir_var_function_temp); + NIR_PASS(progress, shader, nir_shrink_vec_array_vars, nir_var_function_temp); NIR_PASS_V(shader, nir_lower_vars_to_ssa); NIR_PASS_V(shader, nir_lower_pack); @@ -267,7 +267,7 @@ radv_shader_compile_to_nir(struct radv_device *device, * 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_function); + NIR_PASS_V(nir, nir_lower_constant_initializers, nir_var_function_temp); NIR_PASS_V(nir, nir_lower_returns); NIR_PASS_V(nir, nir_inline_functions); NIR_PASS_V(nir, nir_opt_deref); @@ -329,7 +329,7 @@ radv_shader_compile_to_nir(struct radv_device *device, nir_split_var_copies(nir); nir_lower_global_vars_to_local(nir); - nir_remove_dead_variables(nir, nir_var_function); + nir_remove_dead_variables(nir, nir_var_function_temp); nir_lower_subgroups(nir, &(struct nir_lower_subgroups_options) { .subgroup_size = 64, .ballot_bit_size = 64, |