From 6706537dd4d6794f71de4fe105ec99bc84b526e0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 27 Jan 2015 16:42:38 -0800 Subject: [PATCH] nir: Slightly simplify algebraic code generation by reusing a struct. Reviewed-by: Jason Ekstrand --- src/glsl/nir/nir_algebraic.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/glsl/nir/nir_algebraic.py b/src/glsl/nir/nir_algebraic.py index ea7f5fc65f9..4929745dfa5 100644 --- a/src/glsl/nir/nir_algebraic.py +++ b/src/glsl/nir/nir_algebraic.py @@ -179,10 +179,7 @@ struct transform { ${xform.replace.render()} % endfor -static const struct { - const nir_search_expression *search; - const nir_search_value *replace; -} ${pass_name}_${opcode}_xforms[] = { +static const struct transform ${pass_name}_${opcode}_xforms[] = { % for xform in xform_list: { &${xform.search.name}, ${xform.replace.c_ptr} }, % endfor @@ -211,8 +208,8 @@ ${pass_name}_block(nir_block *block, void *void_state) % for opcode in xform_dict.keys(): case nir_op_${opcode}: for (unsigned i = 0; i < ARRAY_SIZE(${pass_name}_${opcode}_xforms); i++) { - if (nir_replace_instr(alu, ${pass_name}_${opcode}_xforms[i].search, - ${pass_name}_${opcode}_xforms[i].replace, + const struct transform *xform = &${pass_name}_${opcode}_xforms[i]; + if (nir_replace_instr(alu, xform->search, xform->replace, state->mem_ctx)) { state->progress = true; break;