X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=a1eb1a1fa4d87ddd77c71c47acb0fca563c5b309;hb=cc5483cc709fdf7b6966a3e69dabfcafebaaffa0;hp=fdc2f1f18cb0593816528e5479acbdf1c71bb73e;hpb=ccabaf9a1942a3b7a1d048b6dabaee41614e1123;p=libs%2Fgl.git

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index fdc2f1f1..a1eb1a1f 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -16,6 +16,7 @@ private:
 	bool combined;
 	Msp::GL::SL::Stage::Type stage;
 	bool dump_ast;
+	std::string out_filename;
 
 public:
 	GlslCompiler(int, char **);
@@ -47,6 +48,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	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_option('o', "out-file", out_filename, GetOpt::REQUIRED_ARG).set_help("Write output to file instead of stdout", "FILE");
 	getopt.add_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile");
 	getopt(argc, argv);
 
@@ -72,6 +74,8 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	else if(!dump_ast)
 		combined = true;
 
+	if(!spec_values_in.empty() && as_module)
+		throw usage_error("Modules can't be specialized");
 	for(vector<string>::const_iterator i=spec_values_in.begin(); i!=spec_values_in.end(); ++i)
 	{
 		unsigned colon = i->find(':');
@@ -122,10 +126,18 @@ int GlslCompiler::main()
 			IO::print("%s\n", compiler.get_stage_debug(*i));
 	}
 
+	IO::Base *out = &IO::cout;
+	RefPtr<IO::File> out_file;
+	if(!out_filename.empty())
+	{
+		out_file = new IO::File(out_filename, IO::M_WRITE);
+		out = out_file.get();
+	}
+
 	if(combined)
-		IO::print("%s\n", compiler.get_combined_glsl());
+		IO::print(*out, "%s\n", compiler.get_combined_glsl());
 	else if(stage!=GL::SL::Stage::SHARED)
-		IO::print("%s\n", compiler.get_stage_glsl(stage));
+		IO::print(*out, "%s\n", compiler.get_stage_glsl(stage));
 
 	return 0;
 }