X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Fcompiler.cpp;h=7021c62d9a2949c9459e6fa183955829bf04f469;hb=5bc24ab4e232241a9e4696787e22f2cb0c3602d8;hp=5ff003e71722e5da09d0cda8786bbca89f7726f8;hpb=c1b42fd479c5ca4cbab258ee0fa5c7cac319f928;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 5ff003e7..7021c62d 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -82,9 +82,13 @@ void Compiler::compile(Mode mode)
 		generate(*i);
 	ConstantIdAssigner().apply(*module, features);
 
+	for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+		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());
@@ -102,6 +106,8 @@ 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);
 
@@ -167,6 +173,20 @@ const map<string, unsigned> &Compiler::get_fragment_outputs() const
 	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;
@@ -297,13 +317,18 @@ void Compiler::resolve(Stage &stage, unsigned flags)
 	}
 }
 
-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)
@@ -348,7 +373,8 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
 
 	/* 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);
 
@@ -363,6 +389,10 @@ void Compiler::finalize(Stage &stage, Mode mode)
 		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)