X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=24df1f2bbc28f48721542843a321ee814340dd16;hb=c9425c6ea4ed54925cb10d31a8d4bb0aca9aa866;hp=b7b8097e88768a3d77ca12723fe83ef3e1fd069d;hpb=66af404fba419b0e8d167de46fc10a037c991a99;p=libs%2Fgl.git

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index b7b8097e..24df1f2b 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")
@@ -78,6 +85,9 @@ int GlslCompiler::main()
 		try
 		{
 			compiler.compile(GL::SL::Compiler::PROGRAM);
+			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)
 		{