Add a target version option to the command-line GLSL compiler

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index c6fe8bcd6673032424cc2c93e80f7b777be557bc..fdc2f1f18cb0593816528e5479acbdf1c71bb73e 100644 (file)
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -9,6 +9,7 @@ class GlslCompiler: public Msp::RegisteredApplication<GlslCompiler>
 {
 private:
        std::string source_fn;
+       Msp::GL::SL::Features features;
        Msp::GL::SL::Compiler::Mode compile_mode;
        std::map<std::string, int> 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<string> 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)