X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=458a56cee87caec21ef54dc42c5d0a5603a42583;hp=a1eb1a1fa4d87ddd77c71c47acb0fca563c5b309;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=cdc2c7176202b4f8d1f3fd21db9c571511b32fa2

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index a1eb1a1f..458a56ce 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -37,7 +37,8 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 {
 	string stage_str;
 	vector<string> spec_values_in;
-	bool as_module = false;
+	unsigned as_module = 0;
+	string module_type = "glsl";
 	unsigned target_version = 0;
 
 	GetOpt getopt;
@@ -46,7 +47,7 @@ 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_option('m', "module", module_type, GetOpt::OPTIONAL_ARG).bind_seen_count(as_module).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");
@@ -56,7 +57,17 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 		features = GL::SL::Features::from_version(GL::Version(target_version/100, target_version%100));
 
 	if(as_module)
-		compile_mode = GL::SL::Compiler::MODULE;
+	{
+		if(module_type=="glsl" || module_type=="GLSL")
+			compile_mode = GL::SL::Compiler::MODULE;
+		else if(module_type=="spirv" || module_type=="spir-v" || module_type=="SPIRV" || module_type=="SPIR-V")
+			compile_mode = GL::SL::Compiler::SPIRV;
+		else
+			throw usage_error("Invalid module type");
+	}
+
+	if(compile_mode==GL::SL::Compiler::SPIRV && out_filename.empty())
+		throw usage_error("-o is required for SPIR-V");
 
 	if(parse_only)
 	{
@@ -65,7 +76,9 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 		dump_ast = true;
 	}
 
-	if(stage_str=="vertex")
+	if(!stage_str.empty() && compile_mode==GL::SL::Compiler::SPIRV)
+		throw usage_error("-s can't be used with SPIR-V");
+	else if(stage_str=="vertex")
 		stage = GL::SL::Stage::VERTEX;
 	else if(stage_str=="geometry")
 		stage = GL::SL::Stage::GEOMETRY;
@@ -134,7 +147,12 @@ int GlslCompiler::main()
 		out = out_file.get();
 	}
 
-	if(combined)
+	if(compile_mode==GL::SL::Compiler::SPIRV)
+	{
+		vector<uint32_t> code = compiler.get_combined_spirv();
+		out->write(reinterpret_cast<char *>(&code.front()), code.size()*4);
+	}
+	else if(combined)
 		IO::print(*out, "%s\n", compiler.get_combined_glsl());
 	else if(stage!=GL::SL::Stage::SHARED)
 		IO::print(*out, "%s\n", compiler.get_stage_glsl(stage));