X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=f7bb2de9af1b8b090341d34383e0cde66cb7a204;hb=HEAD;hp=d11fd611f23efa3125e53345596a89b52a997c5e;hpb=51ab184781646ff6138c5c43eba2dac4fa15611c;p=libs%2Fgl.git

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index d11fd611..f7bb2de9 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -44,7 +44,7 @@ using namespace std;
 using namespace Msp;
 
 GlslCompiler::GlslCompiler(int argc, char **argv):
-	features(GL::SL::Features::opengl_latest()),
+	features(GL::SL::Features::latest(GL::OPENGL)),
 	compile_mode(GL::SL::Compiler::PROGRAM),
 	parse_only(false),
 	combined(false),
@@ -55,6 +55,7 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	vector<string> spec_values_in;
 	unsigned as_module = 0;
 	string module_type = "glsl";
+	bool vulkan = false;
 	unsigned target_version = 0;
 
 	GetOpt getopt;
@@ -64,14 +65,21 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	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", module_type, GetOpt::OPTIONAL_ARG).bind_seen_count(as_module).set_help("Compile as unspecialized module");
+	getopt.add_option("vulkan", vulkan, GetOpt::NO_ARG).set_help("Compile for Vulkan target");
 	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_option('I', "include", include_paths, GetOpt::REQUIRED_ARG).set_help("Add a directory to look for imported files", "DIR");
 	getopt.add_argument("source", source_fn, GetOpt::REQUIRED_ARG).set_help("GLSL file to compile");
 	getopt(argc, argv);
 
-	if(target_version)
-		features = GL::SL::Features::from_opengl_version(GL::Version(target_version/100, target_version%100));
+	if(vulkan)
+	{
+		features = GL::SL::Features::latest(GL::VULKAN);
+		as_module = 1;
+		module_type = "spirv";
+	}
+	else if(target_version)
+		features = GL::SL::Features::from_api_version(GL::OPENGL, GL::Version(target_version/100, target_version%100));
 
 	if(as_module)
 	{
@@ -160,7 +168,7 @@ int GlslCompiler::main()
 	{
 		vector<GL::SL::Stage::Type> stages = compiler.get_stages();
 		for(vector<GL::SL::Stage::Type>::const_iterator i=stages.begin(); i!=stages.end(); ++i)
-			IO::print("%s\n", compiler.get_stage_debug(*i));
+			IO::print("%s\n", compiler.get_stage_debug(*i, true));
 	}
 
 	IO::Base *out = &IO::cout;