From 984f16bbd729646a27a474cf351e11445b8d0b8b Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 15 Sep 2016 11:26:28 -0700 Subject: [PATCH] glsl: Generate strings that are the enum names without the ir_*op_ prefix MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For many expressions, this is different from the printable name. The printable name for ir_binop_add is "+", but we want "add". This is needed for ir_builder_print_visitor. Signed-off-by: Ian Romanick Reviewed-by: Iago Toral Quiroga Reviewed-by: Nicolai Hähnle --- src/compiler/glsl/ir.h | 1 + src/compiler/glsl/ir_expression_operation.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index 433ba193801..24f510ea990 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -1471,6 +1471,7 @@ public: #include "ir_expression_operation.h" extern const char *const ir_expression_operation_strings[ir_last_opcode + 1]; +extern const char *const ir_expression_operation_enum_strings[ir_last_opcode + 1]; class ir_expression : public ir_rvalue { public: diff --git a/src/compiler/glsl/ir_expression_operation.py b/src/compiler/glsl/ir_expression_operation.py index 9aa08d3cabe..58a585b741d 100644 --- a/src/compiler/glsl/ir_expression_operation.py +++ b/src/compiler/glsl/ir_expression_operation.py @@ -707,6 +707,12 @@ const char *const ir_expression_operation_strings[] = { % for item in values: "${item.printable_name}", % endfor +}; + +const char *const ir_expression_operation_enum_strings[] = { +% for item in values: + "${item.name}", +% endfor };""") constant_template = mako.template.Template("""\ -- 2.30.2