X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=4a166ba6d640d0fad01eb8b51c6eff19b2e12a57;hb=8c4d64c71df5c4dcab1838d81412d7a7244ada58;hp=0ce5f01d722ac424c064d7a7f64d862f72b16390;hpb=6288c42adde9ee7d39a47de51fa2856cf965dccc;p=libs%2Fgl.git

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index 0ce5f01d..4a166ba6 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -1,6 +1,7 @@
 #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>
 
@@ -35,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")
@@ -73,7 +81,21 @@ int GlslCompiler::main()
 	compiler.load_source(file, source_fn);
 	compiler.specialize(spec_values);
 	if(!parse_only)
-		compiler.compile(GL::SL::Compiler::PROGRAM);
+	{
+		try
+		{
+			compiler.compile(GL::SL::Compiler::PROGRAM);
+		}
+		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)
 	{