KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nir: Translate glsl shared var load intrinsic to nir intrinsic 

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
This commit is contained in:
Jordan Justen 2015-07-28 15:11:37 -07:00
parent 1078d712d7
commit 03b0439938
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/glsl/nir/glsl_to_nir.cpp
View File

@ -727,6 +727,8 @@ nir_visitor::visit(ir_call *ir)
op = nir_intrinsic_memory_barrier_image;
} else if (strcmp(ir->callee_name(), "__intrinsic_memory_barrier_shared") == 0) {
op = nir_intrinsic_memory_barrier_shared;
} else if (strcmp(ir->callee_name(), "__intrinsic_load_shared") == 0) {
op = nir_intrinsic_load_shared;
} else {
unreachable("not reached");
}
@ -974,6 +976,33 @@ nir_visitor::visit(ir_call *ir)
nir_builder_instr_insert(&b, &instr->instr);
break;
}
case nir_intrinsic_load_shared: {
exec_node *param = ir->actual_parameters.get_head();
ir_rvalue *offset = ((ir_instruction *)param)->as_rvalue();
/* Check if we need the indirect version */
ir_constant *const_offset = offset->as_constant();
if (!const_offset) {
op = nir_intrinsic_load_shared_indirect;
ralloc_free(instr);
instr = nir_intrinsic_instr_create(shader, op);
instr->src[0] = nir_src_for_ssa(evaluate_rvalue(offset));
instr->const_index[0] = 0;
dest = &instr->dest;
} else {
instr->const_index[0] = const_offset->value.u[0];
}
const glsl_type *type = ir->return_deref->var->type;
instr->num_components = type->vector_elements;
/* Setup destination register */
nir_ssa_dest_init(&instr->instr, &instr->dest,
type->vector_elements, NULL);
nir_builder_instr_insert(&b, &instr->instr);
break;
}
default:
unreachable("not reached");
}

1
src/glsl/nir/nir_intrinsics.h
View File

@ -258,6 +258,7 @@ LOAD(per_vertex_input, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REO
LOAD(ssbo, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE)
LOAD(output, 0, 1, NIR_INTRINSIC_CAN_ELIMINATE)
LOAD(per_vertex_output, 1, 1, NIR_INTRINSIC_CAN_ELIMINATE)
LOAD(shared, 0, 1, NIR_INTRINSIC_CAN_ELIMINATE)
/*
* Stores work the same way as loads, except now the first register input is