From 5bc24ab4e232241a9e4696787e22f2cb0c3602d8 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 9 Apr 2021 16:45:34 +0300 Subject: [PATCH] Add an output file option to the command-line GLSL compiler --- tools/glslcompiler.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp index fdc2f1f1..7af8c80b 100644 --- a/tools/glslcompiler.cpp +++ b/tools/glslcompiler.cpp @@ -16,6 +16,7 @@ private: bool combined; Msp::GL::SL::Stage::Type stage; bool dump_ast; + std::string out_filename; public: GlslCompiler(int, char **); @@ -47,6 +48,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv): getopt.add_option('s', "stage", stage_str, GetOpt::REQUIRED_ARG).set_help("Output GLSL for STAGE", "STAGE"); getopt.add_option('m', "module", as_module, GetOpt::NO_ARG).set_help("Compile as unspecialized module"); getopt.add_option('t', "target-version", target_version, GetOpt::REQUIRED_ARG).set_help("Specify target GLSL version", "VER"); + getopt.add_option('o', "out-file", out_filename, GetOpt::REQUIRED_ARG).set_help("Write output to file instead of stdout", "FILE"); getopt.add_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile"); getopt(argc, argv); @@ -122,10 +124,18 @@ int GlslCompiler::main() IO::print("%s\n", compiler.get_stage_debug(*i)); } + IO::Base *out = &IO::cout; + RefPtr out_file; + if(!out_filename.empty()) + { + out_file = new IO::File(out_filename, IO::M_WRITE); + out = out_file.get(); + } + if(combined) - IO::print("%s\n", compiler.get_combined_glsl()); + IO::print(*out, "%s\n", compiler.get_combined_glsl()); else if(stage!=GL::SL::Stage::SHARED) - IO::print("%s\n", compiler.get_stage_glsl(stage)); + IO::print(*out, "%s\n", compiler.get_stage_glsl(stage)); return 0; } -- 2.45.2