OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Share get_io_offset handling in nir_lower_io.

Browse Source 
The load/store/atomic cases all duplicated the get_io_offset code, with
a few tiny differences: stores didn't bother checking for per-vertex
inputs, because they can't be stored to, and atomics didn't check at
all, since shared variables aren't per-vertex.

However, it's harmless to check, and allows us to share more code.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke
2016-07-12 02:16:30 -07:00
parent 7171a9a87d
commit 349fe79c9b
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/compiler/nir/nir_lower_io.c
View File

@@ -279,19 +279,18 @@ nir_lower_io_block(nir_block *block,
b->cursor = nir_before_instr(instr); b->cursor = nir_before_instr(instr);
const bool per_vertex =
is_per_vertex_input(state, var) || is_per_vertex_output(state, var);
nir_ssa_def *offset;
nir_ssa_def *vertex_index;
offset = get_io_offset(b, intrin->variables[0],
per_vertex ? &vertex_index : NULL,
state->type_size);
switch (intrin->intrinsic) { switch (intrin->intrinsic) {
case nir_intrinsic_load_var: { case nir_intrinsic_load_var: {
const bool per_vertex =
is_per_vertex_input(state, var) ||
is_per_vertex_output(state, var);
nir_ssa_def *offset;
nir_ssa_def *vertex_index;
offset = get_io_offset(b, intrin->variables[0],
per_vertex ? &vertex_index : NULL,
state->type_size);
nir_intrinsic_instr *load = nir_intrinsic_instr *load =
nir_intrinsic_instr_create(state->mem_ctx, nir_intrinsic_instr_create(state->mem_ctx,
load_op(mode, per_vertex)); load_op(mode, per_vertex));
@@ -330,15 +329,6 @@ nir_lower_io_block(nir_block *block,
case nir_intrinsic_store_var: { case nir_intrinsic_store_var: {
assert(mode == nir_var_shader_out || mode == nir_var_shared); assert(mode == nir_var_shader_out || mode == nir_var_shared);
nir_ssa_def *offset;
nir_ssa_def *vertex_index;
const bool per_vertex = is_per_vertex_output(state, var);
offset = get_io_offset(b, intrin->variables[0],
per_vertex ? &vertex_index : NULL,
state->type_size);
nir_intrinsic_instr *store = nir_intrinsic_instr *store =
nir_intrinsic_instr_create(state->mem_ctx, nir_intrinsic_instr_create(state->mem_ctx,
store_op(state, mode, per_vertex)); store_op(state, mode, per_vertex));
@@ -375,11 +365,6 @@ nir_lower_io_block(nir_block *block,
case nir_intrinsic_var_atomic_comp_swap: { case nir_intrinsic_var_atomic_comp_swap: {
assert(mode == nir_var_shared); assert(mode == nir_var_shared);
nir_ssa_def *offset;
offset = get_io_offset(b, intrin->variables[0],
NULL, state->type_size);
nir_intrinsic_instr *atomic = nir_intrinsic_instr *atomic =
nir_intrinsic_instr_create(state->mem_ctx, nir_intrinsic_instr_create(state->mem_ctx,
atomic_op(intrin->intrinsic)); atomic_op(intrin->intrinsic));