From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 31 Mar 2021 11:47:52 +0000 (+0300)
Subject: Add a compile mode flag to the command-line GLSL compiler
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=f157c4fa40d3f771f00fcb20ba128a37d61c6970

Add a compile mode flag to the command-line GLSL compiler
---

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index 24df1f2b..5d8362d4 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -9,6 +9,7 @@ class GlslCompiler: public Msp::RegisteredApplication<GlslCompiler>
 {
 private:
 	std::string source_fn;
+	Msp::GL::SL::Compiler::Mode compile_mode;
 	std::map<std::string, int> spec_values;
 	bool parse_only;
 	bool combined;
@@ -25,6 +26,7 @@ using namespace std;
 using namespace Msp;
 
 GlslCompiler::GlslCompiler(int argc, char **argv):
+	compile_mode(GL::SL::Compiler::PROGRAM),
 	parse_only(false),
 	combined(false),
 	stage(GL::SL::Stage::SHARED),
@@ -32,6 +34,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 {
 	string stage_str;
 	vector<string> spec_values_in;
+	bool as_module = false;
 
 	GetOpt getopt;
 	getopt.add_option('c', "combined", combined, GetOpt::NO_ARG).set_help("Output combined GLSL");
@@ -39,9 +42,13 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	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_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile");
 	getopt(argc, argv);
 
+	if(as_module)
+		compile_mode = GL::SL::Compiler::MODULE;
+
 	if(parse_only)
 	{
 		if(!stage_str.empty())
@@ -79,12 +86,13 @@ int GlslCompiler::main()
 	GL::SL::Compiler compiler(GL::SL::Features::all());
 	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)
 	{
 		try
 		{
-			compiler.compile(GL::SL::Compiler::PROGRAM);
+			compiler.compile(compile_mode);
 			string diag = compiler.get_diagnostics();
 			if(!diag.empty())
 				IO::print("Diagnostic messages from compiler:\n%s\n", diag);