X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompiler.cpp;h=0ad41dfac46c2de102c827e17fa550b421166f3e;hb=8f2713a3f1501e90016bb8069ecd08dde2f90e56;hp=e0a676065953412db77519308f28db7becd88af2;hpb=20a86c5905e1f7527d3c9edc3f56f6b7679c268a;p=libs%2Fgl.git

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index e0a67606..0ad41dfa 100644
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -106,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);
 
@@ -171,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;
@@ -371,6 +387,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)