X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=5b488f4d4a8f74ac1216e1f6be193b9510d95f63;hb=59347f76bc985e8c9c769d4a3eee672cba9c920b;hp=7021c62d9a2949c9459e6fa183955829bf04f469;hpb=9d9e008291a447b5d192e724e9022180503c8c3e;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 7021c62d..5b488f4d 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -8,10 +8,11 @@
 #include "finalize.h"
 #include "generate.h"
 #include "glsl_error.h"
+#include "modulecache.h"
 #include "optimize.h"
 #include "output.h"
 #include "resolve.h"
-#include "resources.h"
+#include "spirv.h"
 #include "validate.h"
 
 #undef interface
@@ -52,17 +53,17 @@ void Compiler::clear()
 void Compiler::set_source(const string &source, const string &src_name)
 {
 	clear();
-	Parser parser;
 	imported_names.push_back(src_name);
-	append_module(parser.parse(source, src_name, 1), 0);
+	ModuleCache mod_cache(0);
+	append_module(mod_cache.add_module(source, src_name), mod_cache);
 }
 
 void Compiler::load_source(IO::Base &io, DataFile::Collection *res, const string &src_name)
 {
 	clear();
-	Parser parser;
 	imported_names.push_back(src_name);
-	append_module(parser.parse(io, src_name, 1), res);
+	ModuleCache mod_cache(res);
+	append_module(mod_cache.add_module(io, src_name), mod_cache);
 }
 
 void Compiler::load_source(IO::Base &io, const string &src_name)
@@ -78,6 +79,9 @@ void Compiler::specialize(const map<string, int> &sv)
 
 void Compiler::compile(Mode mode)
 {
+	if(specialized && mode!=PROGRAM)
+		throw invalid_operation("Compiler::compile");
+
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		generate(*i);
 	ConstantIdAssigner().apply(*module, features);
@@ -93,7 +97,7 @@ void Compiler::compile(Mode mode)
 	if(!valid)
 		throw invalid_shader_source(get_diagnostics());
 
-	if(mode==PROGRAM && specialized)
+	if(specialized)
 	{
 		for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 			ConstantSpecializer().apply(*i, spec_values);
@@ -153,6 +157,15 @@ string Compiler::get_stage_glsl(Stage::Type stage_type) const
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
+vector<UInt32> Compiler::get_combined_spirv() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_combined_spirv");
+	SpirVGenerator gen;
+	gen.apply(*module);
+	return gen.get_code();
+}
+
 const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
 	if(!compiled)
@@ -210,7 +223,7 @@ string Compiler::get_diagnostics() const
 	return combined;
 }
 
-void Compiler::append_module(Module &mod, DataFile::Collection *res)
+void Compiler::append_module(const Module &mod, ModuleCache &mod_cache)
 {
 	module->source_map.merge_from(mod.source_map);
 
@@ -219,15 +232,14 @@ void Compiler::append_module(Module &mod, DataFile::Collection *res)
 		if(Import *imp = dynamic_cast<Import *>(i->get()))
 			imports.push_back(imp);
 	for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
-		import(res, (*i)->module);
-	NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
+		import(mod_cache, (*i)->module);
 
 	append_stage(mod.shared);
-	for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
+	for(list<Stage>::const_iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
 		append_stage(*i);
 }
 
-void Compiler::append_stage(Stage &stage)
+void Compiler::append_stage(const Stage &stage)
 {
 	Stage *target = 0;
 	if(stage.type==Stage::SHARED)
@@ -251,22 +263,18 @@ void Compiler::append_stage(Stage &stage)
 
 	if(stage.required_features.glsl_version>target->required_features.glsl_version)
 		target->required_features.glsl_version = stage.required_features.glsl_version;
-	for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
-		target->content.body.push_back(*i);
+	for(NodeList<Statement>::const_iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
+		if(!dynamic_cast<Import *>(i->get()))
+			target->content.body.push_back(*i);
 }
 
-void Compiler::import(DataFile::Collection *resources, const string &name)
+void Compiler::import(ModuleCache &mod_cache, const string &name)
 {
-	string fn = name+".glsl";
-	if(find(imported_names, fn)!=imported_names.end())
+	if(find(imported_names, name)!=imported_names.end())
 		return;
-	imported_names.push_back(fn);
+	imported_names.push_back(name);
 
-	RefPtr<IO::Seekable> io = (resources ? resources->open_raw(fn) : Resources::get_builtins().open(fn));
-	if(!io)
-		throw runtime_error(format("module %s not found", name));
-	Parser import_parser;
-	append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
+	append_module(mod_cache.get_module(name), mod_cache);
 }
 
 void Compiler::generate(Stage &stage)
@@ -389,6 +397,8 @@ void Compiler::finalize(Stage &stage, Mode mode)
 		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
 		PrecisionConverter().apply(stage);
 	}
+	else if(mode==SPIRV)
+		StructOrganizer().apply(stage);
 
 	// Collect bindings from all stages into the shared stage's maps
 	module->shared.texture_bindings.insert(stage.texture_bindings.begin(), stage.texture_bindings.end());