From ccabaf9a1942a3b7a1d048b6dabaee41614e1123 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sat, 3 Apr 2021 19:54:26 +0300 Subject: [PATCH] Add a target version option to the command-line GLSL compiler --- tools/glslcompiler.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp index c6fe8bcd..fdc2f1f1 100644 --- a/tools/glslcompiler.cpp +++ b/tools/glslcompiler.cpp @@ -9,6 +9,7 @@ class GlslCompiler: public Msp::RegisteredApplication { private: std::string source_fn; + Msp::GL::SL::Features features; Msp::GL::SL::Compiler::Mode compile_mode; std::map spec_values; bool parse_only; @@ -26,6 +27,7 @@ using namespace std; using namespace Msp; GlslCompiler::GlslCompiler(int argc, char **argv): + features(GL::SL::Features::latest()), compile_mode(GL::SL::Compiler::PROGRAM), parse_only(false), combined(false), @@ -35,6 +37,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv): string stage_str; vector spec_values_in; bool as_module = false; + unsigned target_version = 0; GetOpt getopt; getopt.add_option('c', "combined", combined, GetOpt::NO_ARG).set_help("Output combined GLSL"); @@ -43,9 +46,13 @@ GlslCompiler::GlslCompiler(int argc, char **argv): getopt.add_option('e', "specialize", spec_values_in, GetOpt::REQUIRED_ARG).set_help("Set specialization constant", "NAME:VALUE"); 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_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile"); getopt(argc, argv); + if(target_version) + features = GL::SL::Features::from_version(GL::Version(target_version/100, target_version%100)); + if(as_module) compile_mode = GL::SL::Compiler::MODULE; @@ -83,7 +90,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv): int GlslCompiler::main() { - GL::SL::Compiler compiler(GL::SL::Features::latest()); + GL::SL::Compiler compiler(features); IO::File file(source_fn); compiler.load_source(file, source_fn); if(compile_mode==GL::SL::Compiler::PROGRAM) -- 2.43.0