#include <msp/core/application.h>
#include <msp/core/getopt.h>
#include <msp/gl/glsl/compiler.h>
+#include <msp/gl/glsl/glsl_error.h>
#include <msp/io/print.h>
#include <msp/strings/utils.h>
{
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;
bool combined;
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),
stage(GL::SL::Stage::SHARED),
{
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");
getopt.add_option('a', "dump-ast", dump_ast, GetOpt::NO_ARG).set_help("Dump AST for debugging");
- getopt.add_option('p', "parse_only", parse_only, GetOpt::NO_ARG).set_help("Only parse the loaded source, don't compile");
+ getopt.add_option('p', "parse_only", parse_only, GetOpt::NO_ARG).set_help("Only parse the loaded source (implies -a)");
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;
+
+ if(parse_only)
+ {
+ if(!stage_str.empty())
+ throw usage_error("-s can't be used with -p");
+ dump_ast = true;
+ }
+
if(stage_str=="vertex")
stage = GL::SL::Stage::VERTEX;
else if(stage_str=="geometry")
int GlslCompiler::main()
{
- GL::SL::Compiler compiler(GL::SL::Features::all());
+ GL::SL::Compiler compiler(features);
IO::File file(source_fn);
compiler.load_source(file, source_fn);
- compiler.specialize(spec_values);
+ if(compile_mode==GL::SL::Compiler::PROGRAM)
+ compiler.specialize(spec_values);
if(!parse_only)
- compiler.compile(GL::SL::Compiler::PROGRAM);
+ {
+ try
+ {
+ compiler.compile(compile_mode);
+ string diag = compiler.get_diagnostics();
+ if(!diag.empty())
+ IO::print("Diagnostic messages from compiler:\n%s\n", diag);
+ }
+ catch(const GL::SL::invalid_shader_source &exc)
+ {
+ if(!dump_ast)
+ throw;
+
+ IO::print("Compilation resulted in errors:\n%s\n", exc.what());
+ combined = false;
+ stage = GL::SL::Stage::SHARED;
+ }
+ }
if(dump_ast)
{