X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=tools%2Fglslcompiler.cpp;h=bcc787ebbb252e029b83d1793e9d749a69b8b180;hb=aa389f9840d961f7edbcf64eadced812134d8481;hp=5dfd520d903296a367aa45670cc6ecbef9a2ddf6;hpb=d1e4737f17767fb8512ac5f8bade9aa9ddea9739;p=libs%2Fgl.git

diff --git a/tools/glslcompiler.cpp b/tools/glslcompiler.cpp
index 5dfd520d..bcc787eb 100644
--- a/tools/glslcompiler.cpp
+++ b/tools/glslcompiler.cpp
@@ -1,5 +1,9 @@
 #include <msp/core/application.h>
 #include <msp/core/getopt.h>
+#include <msp/datafile/collection.h>
+#include <msp/datafile/directorysource.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/gl/glsl/compiler.h>
 #include <msp/gl/glsl/glsl_error.h>
 #include <msp/io/print.h>
@@ -8,7 +12,19 @@
 class GlslCompiler: public Msp::RegisteredApplication<GlslCompiler>
 {
 private:
+	class Resources: public Msp::DataFile::Collection
+	{
+	private:
+		Msp::DataFile::DirectorySource source;
+
+	public:
+		Resources();
+
+		void add_include_path(const Msp::FS::Path &);
+	};
+
 	std::string source_fn;
+	std::vector<std::string> include_paths;
 	Msp::GL::SL::Features features;
 	Msp::GL::SL::Compiler::Mode compile_mode;
 	std::map<std::string, int> spec_values;
@@ -28,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),
@@ -50,11 +66,12 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 	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_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));
+		features = GL::SL::Features::from_api_version(GL::OPENGL, GL::Version(target_version/100, target_version%100));
 
 	if(as_module)
 	{
@@ -107,9 +124,16 @@ GlslCompiler::GlslCompiler(int argc, char **argv):
 
 int GlslCompiler::main()
 {
+	Resources resources;
+	for(const string &p: include_paths)
+		resources.add_include_path(p);
+	FS::Path shaderlib_path = FS::get_sys_data_dir()/"shaderlib";
+	if(FS::exists(shaderlib_path))
+		resources.add_include_path(shaderlib_path);
+
 	GL::SL::Compiler compiler(features);
 	IO::File file(source_fn);
-	compiler.load_source(file, source_fn);
+	compiler.load_source(file, &resources, source_fn);
 	if(compile_mode==GL::SL::Compiler::PROGRAM)
 		compiler.specialize(spec_values);
 	if(!parse_only)
@@ -159,3 +183,14 @@ int GlslCompiler::main()
 
 	return 0;
 }
+
+
+GlslCompiler::Resources::Resources()
+{
+	add_source(source);
+}
+
+void GlslCompiler::Resources::add_include_path(const FS::Path &p)
+{
+	source.add_directory(p);
+}