aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/glsl_to_nir.cpp10
-rw-r--r--src/compiler/nir/nir.c4
-rw-r--r--src/compiler/nir/nir.h6
-rw-r--r--src/compiler/nir/nir_inline_functions.c4
-rw-r--r--src/compiler/nir/nir_lower_constant_initializers.c2
-rw-r--r--src/compiler/nir/nir_lower_global_vars_to_local.c2
-rw-r--r--src/compiler/nir/nir_lower_locals_to_regs.c4
-rw-r--r--src/compiler/nir/nir_lower_vars_to_ssa.c8
-rw-r--r--src/compiler/nir/nir_opt_copy_prop_vars.c4
-rw-r--r--src/compiler/nir/nir_opt_dead_write_vars.c2
-rw-r--r--src/compiler/nir/nir_opt_find_array_copies.c4
-rw-r--r--src/compiler/nir/nir_opt_large_constants.c14
-rw-r--r--src/compiler/nir/nir_print.c4
-rw-r--r--src/compiler/nir/nir_remove_dead_variables.c4
-rw-r--r--src/compiler/nir/nir_split_vars.c20
-rw-r--r--src/compiler/nir/nir_validate.c2
-rw-r--r--src/compiler/nir/tests/vars_tests.cpp20
-rw-r--r--src/compiler/spirv/vtn_cfg.c2
-rw-r--r--src/compiler/spirv/vtn_variables.c2
19 files changed, 59 insertions, 59 deletions
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index f04e0d59ab1..7a96957f27e 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -326,12 +326,12 @@ nir_visitor::visit(ir_variable *ir)
if (is_global)
var->data.mode = nir_var_shader_temp;
else
- var->data.mode = nir_var_function;
+ var->data.mode = nir_var_function_temp;
break;
case ir_var_function_in:
case ir_var_const_in:
- var->data.mode = nir_var_function;
+ var->data.mode = nir_var_function_temp;
break;
case ir_var_shader_in:
@@ -460,7 +460,7 @@ nir_visitor::visit(ir_variable *ir)
var->interface_type = ir->get_interface_type();
- if (var->data.mode == nir_var_function)
+ if (var->data.mode == nir_var_function_temp)
nir_function_impl_add_variable(impl, var);
else
nir_shader_add_variable(shader, var);
@@ -654,7 +654,7 @@ nir_visitor::visit(ir_return *ir)
if (ir->value != NULL) {
nir_deref_instr *ret_deref =
nir_build_deref_cast(&b, nir_load_param(&b, 0),
- nir_var_function, ir->value->type, 0);
+ nir_var_function_temp, ir->value->type, 0);
nir_ssa_def *val = evaluate_rvalue(ir->value);
nir_store_deref(&b, ret_deref, val, ~0);
@@ -2261,7 +2261,7 @@ nir_visitor::visit(ir_dereference_variable *ir)
}
this->deref = nir_build_deref_cast(&b, nir_load_param(&b, i),
- nir_var_function, ir->type, 0);
+ nir_var_function_temp, ir->type, 0);
return;
}
diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 8a92be9f225..57ae2afc2e7 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -125,7 +125,7 @@ nir_shader_add_variable(nir_shader *shader, nir_variable *var)
assert(!"invalid mode");
break;
- case nir_var_function:
+ case nir_var_function_temp:
assert(!"nir_shader_add_variable cannot be used for local variables");
break;
@@ -189,7 +189,7 @@ nir_local_variable_create(nir_function_impl *impl,
nir_variable *var = rzalloc(impl->function->shader, nir_variable);
var->name = ralloc_strdup(var, name);
var->type = type;
- var->data.mode = nir_var_function;
+ var->data.mode = nir_var_function_temp;
nir_function_impl_add_variable(impl, var);
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 534bdcd01c6..f09d0ddaea3 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -98,7 +98,7 @@ typedef enum {
nir_var_shader_in = (1 << 0),
nir_var_shader_out = (1 << 1),
nir_var_shader_temp = (1 << 2),
- nir_var_function = (1 << 3),
+ nir_var_function_temp = (1 << 3),
nir_var_uniform = (1 << 4),
nir_var_ubo = (1 << 5),
nir_var_system_value = (1 << 6),
@@ -441,7 +441,7 @@ typedef struct nir_variable {
static inline bool
nir_variable_is_global(const nir_variable *var)
{
- return var->data.mode != nir_var_function;
+ return var->data.mode != nir_var_function_temp;
}
typedef struct nir_register {
@@ -2324,7 +2324,7 @@ void nir_shader_add_variable(nir_shader *shader, nir_variable *var);
static inline void
nir_function_impl_add_variable(nir_function_impl *impl, nir_variable *var)
{
- assert(var->data.mode == nir_var_function);
+ assert(var->data.mode == nir_var_function_temp);
exec_list_push_tail(&impl->locals, &var->node);
}
diff --git a/src/compiler/nir/nir_inline_functions.c b/src/compiler/nir/nir_inline_functions.c
index 4e0bb8fcba1..c57e16d2b44 100644
--- a/src/compiler/nir/nir_inline_functions.c
+++ b/src/compiler/nir/nir_inline_functions.c
@@ -141,7 +141,7 @@ inline_function_impl(nir_function_impl *impl, struct set *inlined)
* For most use-cases, function inlining is a multi-step process. The general
* pattern employed by SPIR-V consumers and others is as follows:
*
- * 1. nir_lower_constant_initializers(shader, nir_var_function)
+ * 1. nir_lower_constant_initializers(shader, nir_var_function_temp)
*
* This is needed because local variables from the callee are simply added
* to the locals list for the caller and the information about where the
@@ -196,7 +196,7 @@ inline_function_impl(nir_function_impl *impl, struct set *inlined)
* spirv_to_nir returns the root function and so we can just use == whereas
* with GL, you may have to look for a function named "main".
*
- * 6. nir_lower_constant_initializers(shader, ~nir_var_function)
+ * 6. nir_lower_constant_initializers(shader, ~nir_var_function_temp)
*
* Lowering constant initializers on inputs, outputs, global variables,
* etc. requires that we know the main entrypoint so that we know where to
diff --git a/src/compiler/nir/nir_lower_constant_initializers.c b/src/compiler/nir/nir_lower_constant_initializers.c
index cc100dde63c..f165f220f43 100644
--- a/src/compiler/nir/nir_lower_constant_initializers.c
+++ b/src/compiler/nir/nir_lower_constant_initializers.c
@@ -109,7 +109,7 @@ nir_lower_constant_initializers(nir_shader *shader, nir_variable_mode modes)
if ((modes & nir_var_system_value) && function->is_entrypoint)
impl_progress |= lower_const_initializer(&builder, &shader->system_values);
- if (modes & nir_var_function)
+ if (modes & nir_var_function_temp)
impl_progress |= lower_const_initializer(&builder, &function->impl->locals);
if (impl_progress) {
diff --git a/src/compiler/nir/nir_lower_global_vars_to_local.c b/src/compiler/nir/nir_lower_global_vars_to_local.c
index 64eb6a670ae..4df87aba366 100644
--- a/src/compiler/nir/nir_lower_global_vars_to_local.c
+++ b/src/compiler/nir/nir_lower_global_vars_to_local.c
@@ -91,7 +91,7 @@ nir_lower_global_vars_to_local(nir_shader *shader)
if (impl != NULL) {
exec_node_remove(&var->node);
- var->data.mode = nir_var_function;
+ var->data.mode = nir_var_function_temp;
exec_list_push_tail(&impl->locals, &var->node);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance |
diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c
index 3b77119b6f8..88599f49789 100644
--- a/src/compiler/nir/nir_lower_locals_to_regs.c
+++ b/src/compiler/nir/nir_lower_locals_to_regs.c
@@ -192,7 +192,7 @@ lower_locals_to_regs_block(nir_block *block,
switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
b->cursor = nir_before_instr(&intrin->instr);
@@ -218,7 +218,7 @@ lower_locals_to_regs_block(nir_block *block,
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
b->cursor = nir_before_instr(&intrin->instr);
diff --git a/src/compiler/nir/nir_lower_vars_to_ssa.c b/src/compiler/nir/nir_lower_vars_to_ssa.c
index 62f9ad8bcca..065280fb9b8 100644
--- a/src/compiler/nir/nir_lower_vars_to_ssa.c
+++ b/src/compiler/nir/nir_lower_vars_to_ssa.c
@@ -208,7 +208,7 @@ get_deref_node(nir_deref_instr *deref, struct lower_variables_state *state)
/* This pass only works on local variables. Just ignore any derefs with
* a non-local mode.
*/
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
return NULL;
struct deref_node *node = get_deref_node_recur(deref, state);
@@ -504,7 +504,7 @@ rename_variables(struct lower_variables_state *state)
switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
struct deref_node *node = get_deref_node(deref, state);
@@ -554,7 +554,7 @@ rename_variables(struct lower_variables_state *state)
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
struct deref_node *node = get_deref_node(deref, state);
@@ -680,7 +680,7 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl)
assert(path->path[0]->deref_type == nir_deref_type_var);
/* We don't build deref nodes for non-local variables */
- assert(path->path[0]->var->data.mode == nir_var_function);
+ assert(path->path[0]->var->data.mode == nir_var_function_temp);
if (path_may_be_aliased(path, &state)) {
exec_node_remove(&node->direct_derefs_link);
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c
index 21e58b578f4..dee48247549 100644
--- a/src/compiler/nir/nir_opt_copy_prop_vars.c
+++ b/src/compiler/nir/nir_opt_copy_prop_vars.c
@@ -134,7 +134,7 @@ gather_vars_written(struct copy_prop_var_state *state,
if (instr->type == nir_instr_type_call) {
written->modes |= nir_var_shader_out |
nir_var_shader_temp |
- nir_var_function |
+ nir_var_function_temp |
nir_var_ssbo |
nir_var_shared;
continue;
@@ -625,7 +625,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
if (instr->type == nir_instr_type_call) {
apply_barrier_for_modes(copies, nir_var_shader_out |
nir_var_shader_temp |
- nir_var_function |
+ nir_var_function_temp |
nir_var_ssbo |
nir_var_shared);
continue;
diff --git a/src/compiler/nir/nir_opt_dead_write_vars.c b/src/compiler/nir/nir_opt_dead_write_vars.c
index d8411e3cad9..01f3ce4a975 100644
--- a/src/compiler/nir/nir_opt_dead_write_vars.c
+++ b/src/compiler/nir/nir_opt_dead_write_vars.c
@@ -120,7 +120,7 @@ remove_dead_write_vars_local(void *mem_ctx, nir_block *block)
if (instr->type == nir_instr_type_call) {
clear_unused_for_modes(&unused_writes, nir_var_shader_out |
nir_var_shader_temp |
- nir_var_function |
+ nir_var_function_temp |
nir_var_ssbo |
nir_var_shared);
continue;
diff --git a/src/compiler/nir/nir_opt_find_array_copies.c b/src/compiler/nir/nir_opt_find_array_copies.c
index 40ba5e21f2c..e50264c5900 100644
--- a/src/compiler/nir/nir_opt_find_array_copies.c
+++ b/src/compiler/nir/nir_opt_find_array_copies.c
@@ -225,7 +225,7 @@ opt_find_array_copies_block(nir_builder *b, nir_block *block,
* continue on because it won't affect local stores or read-only
* variables.
*/
- if (dst_deref->mode != nir_var_function)
+ if (dst_deref->mode != nir_var_function_temp)
continue;
/* We keep track of the SSA indices where the two last-written
@@ -273,7 +273,7 @@ opt_find_array_copies_block(nir_builder *b, nir_block *block,
*/
const nir_variable_mode read_only_modes =
nir_var_shader_in | nir_var_uniform | nir_var_system_value;
- if (!(src_deref->mode & (nir_var_function | read_only_modes)))
+ if (!(src_deref->mode & (nir_var_function_temp | read_only_modes)))
goto reset;
/* If we don't yet have an active copy, then make this instruction the
diff --git a/src/compiler/nir/nir_opt_large_constants.c b/src/compiler/nir/nir_opt_large_constants.c
index 282c73a40bd..74d9ceef877 100644
--- a/src/compiler/nir/nir_opt_large_constants.c
+++ b/src/compiler/nir/nir_opt_large_constants.c
@@ -196,9 +196,9 @@ nir_opt_large_constants(nir_shader *shader,
continue;
}
- if (dst_deref && dst_deref->mode == nir_var_function) {
+ if (dst_deref && dst_deref->mode == nir_var_function_temp) {
nir_variable *var = nir_deref_instr_get_variable(dst_deref);
- assert(var->data.mode == nir_var_function);
+ assert(var->data.mode == nir_var_function_temp);
/* We only consider variables constant if they only have constant
* stores, all the stores come before any reads, and all stores
@@ -210,9 +210,9 @@ nir_opt_large_constants(nir_shader *shader,
info->is_constant = false;
}
- if (src_deref && src_deref->mode == nir_var_function) {
+ if (src_deref && src_deref->mode == nir_var_function_temp) {
nir_variable *var = nir_deref_instr_get_variable(src_deref);
- assert(var->data.mode == nir_var_function);
+ assert(var->data.mode == nir_var_function_temp);
var_infos[var->data.index].found_read = true;
}
@@ -258,7 +258,7 @@ nir_opt_large_constants(nir_shader *shader,
switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
nir_variable *var = nir_deref_instr_get_variable(deref);
@@ -276,7 +276,7 @@ nir_opt_large_constants(nir_shader *shader,
case nir_intrinsic_store_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
nir_variable *var = nir_deref_instr_get_variable(deref);
@@ -292,7 +292,7 @@ nir_opt_large_constants(nir_shader *shader,
case nir_intrinsic_copy_deref: {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[1]);
- if (deref->mode != nir_var_function)
+ if (deref->mode != nir_var_function_temp)
continue;
nir_variable *var = nir_deref_instr_get_variable(deref);
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index f0142ab3b92..7e1ad61915b 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -423,8 +423,8 @@ get_variable_mode_str(nir_variable_mode mode, bool want_local_global_mode)
return "shared";
case nir_var_shader_temp:
return want_local_global_mode ? "shader_temp" : "";
- case nir_var_function:
- return want_local_global_mode ? "function" : "";
+ case nir_var_function_temp:
+ return want_local_global_mode ? "function_temp" : "";
default:
return "";
}
diff --git a/src/compiler/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c
index 8804dfe6105..8b28cb28118 100644
--- a/src/compiler/nir/nir_remove_dead_variables.c
+++ b/src/compiler/nir/nir_remove_dead_variables.c
@@ -71,7 +71,7 @@ add_var_use_deref(nir_deref_instr *deref, struct set *live)
* all means we need to keep it alive.
*/
assert(deref->mode == deref->var->data.mode);
- if (!(deref->mode & (nir_var_function | nir_var_shader_temp | nir_var_shared)) ||
+ if (!(deref->mode & (nir_var_function_temp | nir_var_shader_temp | nir_var_shared)) ||
deref_used_for_not_store(deref))
_mesa_set_add(live, deref->var);
}
@@ -186,7 +186,7 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes)
if (modes & nir_var_shared)
progress = remove_dead_vars(&shader->shared, live) || progress;
- if (modes & nir_var_function) {
+ if (modes & nir_var_function_temp) {
nir_foreach_function(function, shader) {
if (function->impl) {
if (remove_dead_vars(&function->impl->locals, live))
diff --git a/src/compiler/nir/nir_split_vars.c b/src/compiler/nir/nir_split_vars.c
index 6d4df61521a..244ffd6dcf0 100644
--- a/src/compiler/nir/nir_split_vars.c
+++ b/src/compiler/nir/nir_split_vars.c
@@ -115,7 +115,7 @@ init_field_for_type(struct field *field, struct field *parent,
var_type = wrap_type_in_array(var_type, f->type);
nir_variable_mode mode = state->base_var->data.mode;
- if (mode == nir_var_function) {
+ if (mode == nir_var_function_temp) {
field->var = nir_local_variable_create(state->impl, var_type, name);
} else {
field->var = nir_variable_create(state->shader, mode, var_type, name);
@@ -259,7 +259,7 @@ nir_split_struct_vars(nir_shader *shader, nir_variable_mode modes)
struct hash_table *var_field_map =
_mesa_pointer_hash_table_create(mem_ctx);
- assert((modes & (nir_var_shader_temp | nir_var_function)) == modes);
+ assert((modes & (nir_var_shader_temp | nir_var_function_temp)) == modes);
bool has_global_splits = false;
if (modes & nir_var_shader_temp) {
@@ -274,7 +274,7 @@ nir_split_struct_vars(nir_shader *shader, nir_variable_mode modes)
continue;
bool has_local_splits = false;
- if (modes & nir_var_function) {
+ if (modes & nir_var_function_temp) {
has_local_splits = split_var_list_structs(shader, function->impl,
&function->impl->locals,
var_field_map, mem_ctx);
@@ -454,7 +454,7 @@ create_split_array_vars(struct array_var_info *var_info,
name = ralloc_asprintf(mem_ctx, "(%s)", name);
nir_variable_mode mode = var_info->base_var->data.mode;
- if (mode == nir_var_function) {
+ if (mode == nir_var_function_temp) {
split->var = nir_local_variable_create(impl,
var_info->split_var_type, name);
} else {
@@ -794,7 +794,7 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
void *mem_ctx = ralloc_context(NULL);
struct hash_table *var_info_map = _mesa_pointer_hash_table_create(mem_ctx);
- assert((modes & (nir_var_shader_temp | nir_var_function)) == modes);
+ assert((modes & (nir_var_shader_temp | nir_var_function_temp)) == modes);
bool has_global_array = false;
if (modes & nir_var_shader_temp) {
@@ -808,7 +808,7 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
continue;
bool has_local_array = false;
- if (modes & nir_var_function) {
+ if (modes & nir_var_function_temp) {
has_local_array = init_var_list_array_infos(&function->impl->locals,
var_info_map, mem_ctx);
}
@@ -838,7 +838,7 @@ nir_split_array_vars(nir_shader *shader, nir_variable_mode modes)
continue;
bool has_local_splits = false;
- if (modes & nir_var_function) {
+ if (modes & nir_var_function_temp) {
has_local_splits = split_var_list_arrays(shader, function->impl,
&function->impl->locals,
var_info_map, mem_ctx);
@@ -1494,7 +1494,7 @@ function_impl_has_vars_with_modes(nir_function_impl *impl,
if ((modes & nir_var_shader_temp) && !exec_list_is_empty(&shader->globals))
return true;
- if ((modes & nir_var_function) && !exec_list_is_empty(&impl->locals))
+ if ((modes & nir_var_function_temp) && !exec_list_is_empty(&impl->locals))
return true;
return false;
@@ -1512,7 +1512,7 @@ function_impl_has_vars_with_modes(nir_function_impl *impl,
bool
nir_shrink_vec_array_vars(nir_shader *shader, nir_variable_mode modes)
{
- assert((modes & (nir_var_shader_temp | nir_var_function)) == modes);
+ assert((modes & (nir_var_shader_temp | nir_var_function_temp)) == modes);
void *mem_ctx = ralloc_context(NULL);
@@ -1549,7 +1549,7 @@ nir_shrink_vec_array_vars(nir_shader *shader, nir_variable_mode modes)
continue;
bool locals_shrunk = false;
- if (modes & nir_var_function) {
+ if (modes & nir_var_function_temp) {
locals_shrunk = shrink_vec_var_list(&function->impl->locals,
var_usage_map);
}
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index c9732edda14..43757858207 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -395,7 +395,7 @@ validate_var_use(nir_variable *var, validate_state *state)
{
struct hash_entry *entry = _mesa_hash_table_search(state->var_defs, var);
validate_assert(state, entry);
- if (var->data.mode == nir_var_function)
+ if (var->data.mode == nir_var_function_temp)
validate_assert(state, (nir_function_impl *) entry->data == state->impl);
}
diff --git a/src/compiler/nir/tests/vars_tests.cpp b/src/compiler/nir/tests/vars_tests.cpp
index 43d87f378ad..c94fab95c1b 100644
--- a/src/compiler/nir/tests/vars_tests.cpp
+++ b/src/compiler/nir/tests/vars_tests.cpp
@@ -34,14 +34,14 @@ protected:
~nir_vars_test();
nir_variable *create_int(nir_variable_mode mode, const char *name) {
- if (mode == nir_var_function)
+ if (mode == nir_var_function_temp)
return nir_local_variable_create(b->impl, glsl_int_type(), name);
return nir_variable_create(b->shader, mode, glsl_int_type(), name);
}
nir_variable *create_ivec2(nir_variable_mode mode, const char *name) {
const glsl_type *var_type = glsl_vector_type(GLSL_TYPE_INT, 2);
- if (mode == nir_var_function)
+ if (mode == nir_var_function_temp)
return nir_local_variable_create(b->impl, var_type, name);
return nir_variable_create(b->shader, mode, var_type, name);
}
@@ -258,9 +258,9 @@ TEST_F(nir_redundant_load_vars_test, invalidate_live_load_in_the_end_of_loop)
TEST_F(nir_copy_prop_vars_test, simple_copies)
{
- nir_variable *in = create_int(nir_var_shader_in, "in");
- nir_variable *temp = create_int(nir_var_function, "temp");
- nir_variable *out = create_int(nir_var_shader_out, "out");
+ nir_variable *in = create_int(nir_var_shader_in, "in");
+ nir_variable *temp = create_int(nir_var_function_temp, "temp");
+ nir_variable *out = create_int(nir_var_shader_out, "out");
nir_copy_var(b, temp, in);
nir_copy_var(b, out, temp);
@@ -284,7 +284,7 @@ TEST_F(nir_copy_prop_vars_test, simple_copies)
TEST_F(nir_copy_prop_vars_test, simple_store_load)
{
- nir_variable **v = create_many_ivec2(nir_var_function, "v", 2);
+ nir_variable **v = create_many_ivec2(nir_var_function_temp, "v", 2);
unsigned mask = 1 | 2;
nir_ssa_def *stored_value = nir_imm_ivec2(b, 10, 20);
@@ -312,7 +312,7 @@ TEST_F(nir_copy_prop_vars_test, simple_store_load)
TEST_F(nir_copy_prop_vars_test, store_store_load)
{
- nir_variable **v = create_many_ivec2(nir_var_function, "v", 2);
+ nir_variable **v = create_many_ivec2(nir_var_function_temp, "v", 2);
unsigned mask = 1 | 2;
nir_ssa_def *first_value = nir_imm_ivec2(b, 10, 20);
@@ -345,7 +345,7 @@ TEST_F(nir_copy_prop_vars_test, store_store_load)
TEST_F(nir_copy_prop_vars_test, store_store_load_different_components)
{
- nir_variable **v = create_many_ivec2(nir_var_function, "v", 2);
+ nir_variable **v = create_many_ivec2(nir_var_function_temp, "v", 2);
nir_ssa_def *first_value = nir_imm_ivec2(b, 10, 20);
nir_store_var(b, v[0], first_value, 1 << 1);
@@ -384,7 +384,7 @@ TEST_F(nir_copy_prop_vars_test, store_store_load_different_components)
TEST_F(nir_copy_prop_vars_test, store_store_load_different_components_in_many_blocks)
{
- nir_variable **v = create_many_ivec2(nir_var_function, "v", 2);
+ nir_variable **v = create_many_ivec2(nir_var_function_temp, "v", 2);
nir_ssa_def *first_value = nir_imm_ivec2(b, 10, 20);
nir_store_var(b, v[0], first_value, 1 << 1);
@@ -459,7 +459,7 @@ TEST_F(nir_copy_prop_vars_test, memory_barrier_in_two_blocks)
TEST_F(nir_copy_prop_vars_test, simple_store_load_in_two_blocks)
{
- nir_variable **v = create_many_ivec2(nir_var_function, "v", 2);
+ nir_variable **v = create_many_ivec2(nir_var_function_temp, "v", 2);
unsigned mask = 1 | 2;
nir_ssa_def *stored_value = nir_imm_ivec2(b, 10, 20);
diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c
index dde5b972a29..36dbb540463 100644
--- a/src/compiler/spirv/vtn_cfg.c
+++ b/src/compiler/spirv/vtn_cfg.c
@@ -908,7 +908,7 @@ vtn_emit_cf_list(struct vtn_builder *b, struct list_head *cf_list,
glsl_get_bare_type(b->func->type->return_type->type);
nir_deref_instr *ret_deref =
nir_build_deref_cast(&b->nb, nir_load_param(&b->nb, 0),
- nir_var_function, ret_type, 0);
+ nir_var_function_temp, ret_type, 0);
vtn_local_store(b, src, ret_deref);
}
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 9f42039aa25..16cc7aadd71 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1698,7 +1698,7 @@ vtn_storage_class_to_mode(struct vtn_builder *b,
break;
case SpvStorageClassFunction:
mode = vtn_variable_mode_function;
- nir_mode = nir_var_function;
+ nir_mode = nir_var_function_temp;
break;
case SpvStorageClassWorkgroup:
mode = vtn_variable_mode_workgroup;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 20:40:42 +0000