From a5b2131b4bec043b71dc37a50a53193b0f629a69 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Wed, 12 Jul 2017 19:28:29 -0700 Subject: [PATCH] add instruction_start_index operand to spirv::Parser_callbacks::handle_instruction_* --- src/generate_spirv_parser/generate.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generate_spirv_parser/generate.cpp b/src/generate_spirv_parser/generate.cpp index 4db144f..072e3bd 100644 --- a/src/generate_spirv_parser/generate.cpp +++ b/src/generate_spirv_parser/generate.cpp @@ -1600,10 +1600,10 @@ ss << ")" << operand_kind.operand_kind->kind { parser_callbacks_class << "virtual void " << instruction.cpp_parse_callback_name << "(" << instruction.cpp_struct_name - << " instruction) = 0;\n"; + << " instruction, std::size_t instruction_start_index) = 0;\n"; dump_callbacks_class << "virtual void " << instruction.cpp_parse_callback_name << "(" << instruction.cpp_struct_name - << R"( instruction) override + << R"( instruction, std::size_t instruction_start_index) override { ss << ")"; if(instruction.extension_instruction_set) @@ -2141,7 +2141,7 @@ return static_cast(read_word(word_index++, ins { std::vector args(shader_words + word_index, shader_words + instruction_end_index); word_index = instruction_end_index; - parser_callbacks.handle_instruction_op_ext_inst(Op_ext_inst(result_type, result, instruction_set_id, instruction_integer, std::move(args))); + parser_callbacks.handle_instruction_op_ext_inst(Op_ext_inst(result_type, result, instruction_set_id, instruction_integer, std::move(args)), instruction_start_index); break; } @+@+@+@+)"; @@ -2218,7 +2218,7 @@ return static_cast(read_word(word_index++, ins + get_instruction_name_for_diagnostics(&extension_instruction_set, instruction.json_name)); parser_class << "@_parser_callbacks." << instruction.cpp_parse_callback_name - << R"((std::move(instruction)); + << R"((std::move(instruction), instruction_start_index); break; } )"; @@ -2275,7 +2275,7 @@ return static_cast(read_word(word_index++, ins "instruction properties operand count mismatch: " + get_instruction_name_for_diagnostics(nullptr, instruction.json_name)); parser_class << "@_parser_callbacks." << instruction.cpp_parse_callback_name - << R"((std::move(instruction)); + << R"((std::move(instruction), instruction_start_index); break; } )"; -- 2.30.2