From 23cfa683d5496bdbf8b014c095059c36be7ab149 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 18 Dec 2015 11:45:59 -0800 Subject: [PATCH] nir: move nir_copy_var from anv_nir_builder to nir_builder --- src/glsl/nir/nir_builder.h | 10 ++++++++++ src/vulkan/anv_nir_builder.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/glsl/nir/nir_builder.h b/src/glsl/nir/nir_builder.h index cb7787f1006..cbbc26d1cc6 100644 --- a/src/glsl/nir/nir_builder.h +++ b/src/glsl/nir/nir_builder.h @@ -353,6 +353,16 @@ nir_store_var(nir_builder *build, nir_variable *var, nir_ssa_def *value) nir_builder_instr_insert(build, &store->instr); } +static inline void +nir_copy_var(nir_builder *build, nir_variable *dest, nir_variable *src) +{ + nir_intrinsic_instr *copy = + nir_intrinsic_instr_create(build->shader, nir_intrinsic_copy_var); + copy->variables[0] = nir_deref_var_create(copy, dest); + copy->variables[1] = nir_deref_var_create(copy, src); + nir_builder_instr_insert(build, ©->instr); +} + static inline nir_ssa_def * nir_load_system_value(nir_builder *build, nir_intrinsic_op op, int index) { diff --git a/src/vulkan/anv_nir_builder.h b/src/vulkan/anv_nir_builder.h index f26cb046a6b..74637579ad4 100644 --- a/src/vulkan/anv_nir_builder.h +++ b/src/vulkan/anv_nir_builder.h @@ -44,13 +44,3 @@ nir_builder_init_simple_shader(nir_builder *b, gl_shader_stage stage) b->impl = nir_function_impl_create(overload); b->cursor = nir_after_cf_list(&b->impl->body); } - -static inline void -nir_copy_var(nir_builder *build, nir_variable *dest, nir_variable *src) -{ - nir_intrinsic_instr *copy = - nir_intrinsic_instr_create(build->shader, nir_intrinsic_copy_var); - copy->variables[0] = nir_deref_var_create(copy, dest); - copy->variables[1] = nir_deref_var_create(copy, src); - nir_builder_instr_insert(build, ©->instr); -}