fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_vec_to_movs: Pass the shader around directly

Browse source 
Previously, we were passing the shader around, we were just calling it
"mem_ctx".  However, the nir_shader is (and must be for the purposes of
mark-and-sweep) the mem_ctx so we might as well pass it around explicitly.

Reviewed-by: Eduardo Lima Mitev <elima@igalia.com>
This commit is contained in:
Jason Ekstrand 2015-09-09 12:58:58 -07:00
parent cadd7dd384
commit b7eeced3c7
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/glsl/nir/nir_lower_vec_to_movs.c
View file

@ -54,12 +54,12 @@ src_matches_dest_reg(nir_dest *dest, nir_src *src)
*/
static unsigned
insert_mov(nir_alu_instr *vec, unsigned start_channel,
unsigned start_src_idx, void *mem_ctx)
unsigned start_src_idx, nir_shader *shader)
{
unsigned src_idx = start_src_idx;
assert(src_idx < nir_op_infos[vec->op].num_inputs);
nir_alu_instr *mov = nir_alu_instr_create(mem_ctx, nir_op_imov);
nir_alu_instr *mov = nir_alu_instr_create(shader, nir_op_imov);
nir_alu_src_copy(&mov->src[0], &vec->src[src_idx], mov);
nir_alu_dest_copy(&mov->dest, &vec->dest, mov);
@ -84,7 +84,7 @@ insert_mov(nir_alu_instr *vec, unsigned start_channel,
}
static bool
lower_vec_to_movs_block(nir_block *block, void *mem_ctx)
lower_vec_to_movs_block(nir_block *block, void *shader)
{
nir_foreach_instr_safe(block, instr) {
if (instr->type != nir_instr_type_alu)
@ -115,7 +115,7 @@ lower_vec_to_movs_block(nir_block *block, void *mem_ctx)
continue;
if (src_matches_dest_reg(&vec->dest.dest, &vec->src[src_idx].src)) {
finished_write_mask |= insert_mov(vec, i, src_idx, mem_ctx);
finished_write_mask |= insert_mov(vec, i, src_idx, shader);
break;
}
src_idx++;
@ -127,7 +127,7 @@ lower_vec_to_movs_block(nir_block *block, void *mem_ctx)
continue;
if (!(finished_write_mask & (1 << i)))
finished_write_mask |= insert_mov(vec, i, src_idx, mem_ctx);
finished_write_mask |= insert_mov(vec, i, src_idx, shader);
src_idx++;
}
@ -142,7 +142,9 @@ lower_vec_to_movs_block(nir_block *block, void *mem_ctx)
static void
nir_lower_vec_to_movs_impl(nir_function_impl *impl)
{
nir_foreach_block(impl, lower_vec_to_movs_block, ralloc_parent(impl));
nir_shader *shader = impl->overload->function->shader;
nir_foreach_block(impl, lower_vec_to_movs_block, shader);
}
void