X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;fp=tools%2Fglslcompiler.cpp;h=4a166ba6d640d0fad01eb8b51c6eff19b2e12a57;hp=b7b8097e88768a3d77ca12723fe83ef3e1fd069d;hb=8c4d64c71df5c4dcab1838d81412d7a7244ada58;hpb=22d5405729048ee2677a1e45e309e6328de64a26 diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp index b7b8097e..4a166ba6 100644 --- a/tools/glslcompiler.cpp +++ b/tools/glslcompiler.cpp @@ -36,12 +36,19 @@ GlslCompiler::GlslCompiler(int argc, char **argv): 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_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile"); getopt(argc, argv); + 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")