X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=b2c4f9ba2cbed88dee8b4e70f00d8a6c4afb5739;hp=803862cb45787974a21a50628d9495009eb2fbca;hb=cdc2c7176202b4f8d1f3fd21db9c571511b32fa2;hpb=1f09306906fbf57c05dccb27189264706cc64cfa

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 803862cb..b2c4f9ba 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -1,14 +1,16 @@
 #include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "builtin.h"
-#include "compatibility.h"
 #include "compiler.h"
 #include "debug.h"
 #include "error.h"
+#include "finalize.h"
 #include "generate.h"
 #include "glsl_error.h"
 #include "optimize.h"
 #include "output.h"
+#include "resolve.h"
 #include "resources.h"
 #include "validate.h"
 
@@ -23,12 +25,14 @@ namespace SL {
 Compiler::Compiler():
 	features(Features::from_context()),
 	module(0),
+	compiled(false),
 	specialized(false)
 { }
 
 Compiler::Compiler(const Features &f):
 	features(f),
 	module(0),
+	compiled(false),
 	specialized(false)
 { }
 
@@ -74,18 +78,30 @@ 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);
+
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-		generate(*i, mode);
+		validate(*i);
+	GlobalInterfaceValidator().apply(*module);
 
 	bool valid = true;
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
-		if(!validate(*i))
+		if(!check_errors(*i))
 			valid = false;
 	if(!valid)
 		throw invalid_shader_source(get_diagnostics());
 
-	unsigned n = 0;
-	for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
+	if(specialized)
+	{
+		for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+			ConstantSpecializer().apply(*i, spec_values);
+	}
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
 	{
 		OptimizeResult result = optimize(*i);
 		if(result==REDO_PREVIOUS)
@@ -93,12 +109,19 @@ void Compiler::compile(Mode mode)
 		else if(result!=REDO_STAGE)
 			++i;
 	}
+
+	LocationAllocator().apply(*module, features);
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		finalize(*i, mode);
+
+	compiled = true;
 }
 
 string Compiler::get_combined_glsl() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_combined_glsl");
+
 	string glsl;
 
 	unsigned source_count = module->source_map.get_count();
@@ -107,7 +130,7 @@ string Compiler::get_combined_glsl() const
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 	{
 		glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
-		glsl += Formatter().apply(*i, MODULE);
+		glsl += Formatter().apply(*i);
 		glsl += '\n';
 	}
 
@@ -125,14 +148,18 @@ vector<Stage::Type> Compiler::get_stages() const
 
 string Compiler::get_stage_glsl(Stage::Type stage_type) const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_stage_glsl");
 	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==stage_type)
-			return Formatter().apply(*i, PROGRAM);
+			return Formatter().apply(*i);
 	throw key_error(Stage::get_stage_name(stage_type));
 }
 
 const map<string, unsigned> &Compiler::get_vertex_attributes() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_vertex_attributes");
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==Stage::VERTEX)
 			return i->locations;
@@ -141,12 +168,28 @@ const map<string, unsigned> &Compiler::get_vertex_attributes() const
 
 const map<string, unsigned> &Compiler::get_fragment_outputs() const
 {
+	if(!compiled)
+		throw invalid_operation("Compiler::get_fragment_outputs");
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		if(i->type==Stage::FRAGMENT)
 			return i->locations;
 	throw invalid_operation("Compiler::get_fragment_outputs");
 }
 
+const map<string, unsigned> &Compiler::get_texture_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_texture_bindings");
+	return module->shared.texture_bindings;
+}
+
+const map<string, unsigned> &Compiler::get_uniform_block_bindings() const
+{
+	if(!compiled)
+		throw invalid_operation("Compiler::get_uniform_block_bindings");
+	return module->shared.uniform_block_bindings;
+}
+
 const SourceMap &Compiler::get_source_map() const
 {
 	return module->source_map;
@@ -165,7 +208,8 @@ string Compiler::get_diagnostics() const
 	string combined;
 	for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
 		for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
-			combined += format("%s:%d: %s\n", module->source_map.get_name(j->source), j->line, j->message);
+			if(j->source!=INTERNAL_SOURCE)
+				append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
 	return combined;
 }
 
@@ -173,7 +217,10 @@ void Compiler::append_module(Module &mod, DataFile::Collection *res)
 {
 	module->source_map.merge_from(mod.source_map);
 
-	vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
+	vector<Import *> imports;
+	for(NodeList<Statement>::const_iterator i=mod.shared.content.body.begin(); i!=mod.shared.content.body.end(); ++i)
+		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()));
@@ -205,18 +252,10 @@ void Compiler::append_stage(Stage &stage)
 		target = &*i;
 	}
 
-	if(target->content.body.empty())
-	{
-		Stage *builtins = get_builtins(stage.type);
-		if(builtins && builtins!=&stage)
-			append_stage(*builtins);
-	}
-
 	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);
-	DeclarationCombiner().apply(*target);
 }
 
 void Compiler::import(DataFile::Collection *resources, const string &name)
@@ -233,32 +272,67 @@ void Compiler::import(DataFile::Collection *resources, const string &name)
 	append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
 }
 
-void Compiler::generate(Stage &stage, Mode mode)
+void Compiler::generate(Stage &stage)
 {
 	stage.required_features.gl_api = features.gl_api;
 	if(module->shared.required_features.glsl_version>stage.required_features.glsl_version)
 		stage.required_features.glsl_version = module->shared.required_features.glsl_version;
+
 	inject_block(stage.content, module->shared.content);
+	if(const Stage *builtins = get_builtins(stage.type))
+		inject_block(stage.content, builtins->content);
+	if(const Stage *builtins = get_builtins(Stage::SHARED))
+		inject_block(stage.content, builtins->content);
 
 	// Initial resolving pass
-	BlockHierarchyResolver().apply(stage);
-	FunctionResolver().apply(stage);
-	VariableResolver().apply(stage);
+	resolve(stage);
 
 	/* All variables local to a stage have been resolved.  Resolve non-local
 	variables through interfaces. */
 	InterfaceGenerator().apply(stage);
-	VariableResolver().apply(stage);
+	resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
+}
 
-	FunctionResolver().apply(stage);
-	ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
-	if(mode==PROGRAM)
-		LegacyConverter().apply(stage, features);
+template<typename T>
+bool Compiler::resolve(Stage &stage, unsigned &flags, unsigned bit)
+{
+	if(!(flags&bit))
+		return false;
+
+	flags &= ~bit;
+	return T().apply(stage);
+}
+
+void Compiler::resolve(Stage &stage, unsigned flags)
+{
+	while(flags)
+	{
+		if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
+			;
+		else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
+			flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+		else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
+			flags |= RESOLVE_EXPRESSIONS;
+		else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
+			flags |= RESOLVE_EXPRESSIONS;
+		else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
+			flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
+	}
 }
 
-bool Compiler::validate(Stage &stage)
+void Compiler::validate(Stage &stage)
 {
 	DeclarationValidator().apply(stage);
+	IdentifierValidator().apply(stage);
+	ReferenceValidator().apply(stage);
+	ExpressionValidator().apply(stage);
+	FlowControlValidator().apply(stage);
+	StageInterfaceValidator().apply(stage);
+}
+
+bool Compiler::check_errors(Stage &stage)
+{
+	stable_sort(stage.diagnostics, &diagnostic_line_order);
 
 	for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
 		if(i->severity==Diagnostic::ERR)
@@ -267,32 +341,61 @@ bool Compiler::validate(Stage &stage)
 	return true;
 }
 
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
+{
+	if(diag1.provoking_source!=diag2.provoking_source)
+	{
+		// Sort builtins first and imported modules according to import order.
+		if(diag1.provoking_source<=BUILTIN_SOURCE)
+			return diag1.provoking_source<diag2.provoking_source;
+		else if(diag2.provoking_source<=BUILTIN_SOURCE)
+			return false;
+		else
+			return diag1.provoking_source>diag2.provoking_source;
+	}
+	return diag1.provoking_line<diag2.provoking_line;
+}
+
 Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 {
+	if(ConstantFolder().apply(stage))
+		resolve(stage, RESOLVE_EXPRESSIONS);
 	ConstantConditionEliminator().apply(stage);
 
-	bool any_inlined = FunctionInliner().apply(stage);
-	any_inlined |= ExpressionInliner().apply(stage);
-	if(any_inlined)
+	bool any_inlined = false;
+	if(FunctionInliner().apply(stage))
+	{
+		resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+		any_inlined = true;
+	}
+	if(ExpressionInliner().apply(stage))
 	{
-		VariableResolver().apply(stage);
-		FunctionResolver().apply(stage);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+		any_inlined = true;
 	}
 
 	/* Removing variables or functions may cause things from the previous stage
 	to become unused. */
-	bool any_removed = UnusedVariableRemover().apply(stage);
+	bool any_removed = UnreachableCodeRemover().apply(stage);
+	any_removed |= UnusedVariableRemover().apply(stage);
 	any_removed |= UnusedFunctionRemover().apply(stage);
+	any_removed |= UnusedTypeRemover().apply(stage);
 
 	return any_removed ? REDO_PREVIOUS : any_inlined ? REDO_STAGE : NEXT_STAGE;
 }
 
 void Compiler::finalize(Stage &stage, Mode mode)
 {
-	if(get_gl_api()==OPENGL_ES2 && mode==PROGRAM)
-		DefaultPrecisionGenerator().apply(stage);
-	else if(mode==MODULE)
-		PrecisionRemover().apply(stage);
+	if(mode==PROGRAM)
+	{
+		LegacyConverter().apply(stage, features);
+		resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+		PrecisionConverter().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());
+	module->shared.uniform_block_bindings.insert(stage.uniform_block_bindings.begin(), stage.uniform_block_bindings.end());
 }
 
 void Compiler::inject_block(Block &target, const Block &source)