fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 10:38:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir: Make nir_ssa_undef_instr_create initialize the destination

Browse source 
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand 2014-12-15 17:44:37 -08:00
parent 951a7f23a0
commit 675ffdef30
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/nir/nir.c
View file

@ -483,13 +483,12 @@ nir_parallel_copy_instr_create(void *mem_ctx)
}
nir_ssa_undef_instr *
nir_ssa_undef_instr_create(void *mem_ctx)
nir_ssa_undef_instr_create(void *mem_ctx, unsigned num_components)
{
nir_ssa_undef_instr *instr = ralloc(mem_ctx, nir_ssa_undef_instr);
instr_init(&instr->instr, nir_instr_type_ssa_undef);
instr->def.name = NULL;
instr->def.parent_instr = &instr->instr;
nir_ssa_def_init(&instr->instr, &instr->def, num_components, NULL);
return instr;
}

3
src/glsl/nir/nir.h
View file

@ -1294,7 +1294,8 @@ nir_phi_instr *nir_phi_instr_create(void *mem_ctx);
nir_parallel_copy_instr *nir_parallel_copy_instr_create(void *mem_ctx);
nir_ssa_undef_instr *nir_ssa_undef_instr_create(void *mem_ctx);
nir_ssa_undef_instr *nir_ssa_undef_instr_create(void *mem_ctx,
unsigned num_components);
nir_deref_var *nir_deref_var_create(void *mem_ctx, nir_variable *var);
nir_deref_array *nir_deref_array_create(void *mem_ctx);

11
src/glsl/nir/nir_lower_variables.c
View file

@ -688,9 +688,9 @@ get_ssa_def_for_block(struct deref_node *node, nir_block *block,
/* If we got here then we don't have a definition that dominates the
* given block. This means that we need to add an undef and use that.
*/
nir_ssa_undef_instr *undef = nir_ssa_undef_instr_create(state->mem_ctx);
nir_ssa_def_init(&undef->instr, &undef->def,
glsl_get_vector_elements(node->type), NULL);
nir_ssa_undef_instr *undef =
nir_ssa_undef_instr_create(state->mem_ctx,
glsl_get_vector_elements(node->type));
nir_instr_insert_before_cf_list(&state->impl->body, &undef->instr);
def_stack_push(node, &undef->def, state);
return &undef->def;
@ -758,9 +758,8 @@ rename_variables_block(nir_block *block, struct lower_variables_state *state)
* should result in an undefined value.
*/
nir_ssa_undef_instr *undef =
nir_ssa_undef_instr_create(state->mem_ctx);
nir_ssa_def_init(&undef->instr, &undef->def,
intrin->num_components, NULL);
nir_ssa_undef_instr_create(state->mem_ctx,
intrin->num_components);
nir_instr_insert_before(&intrin->instr, &undef->instr);
nir_instr_remove(&intrin->instr);

5
src/glsl/nir/nir_to_ssa.c
View file

@ -159,9 +159,8 @@ static nir_ssa_def *get_ssa_src(nir_register *reg, rewrite_state *state)
* We're using an undefined register, create a new undefined SSA value
* to preserve the information that this source is undefined
*/
nir_ssa_undef_instr *instr = nir_ssa_undef_instr_create(state->mem_ctx);
nir_ssa_def_init(&instr->instr, &instr->def,
reg->num_components, NULL);
nir_ssa_undef_instr *instr =
nir_ssa_undef_instr_create(state->mem_ctx, reg->num_components);
/*
* We could just insert the undefined instruction before the instruction