X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=3db581be732cd3c5ea7e0b40fce67498db9e1e45;hp=28145aebd9e2837abedcb2b5ec54ae3b8f745414;hb=8f2713a3f1501e90016bb8069ecd08dde2f90e56;hpb=c6b29fbf9927467b21dca65539a1fa2c98f96e0e

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 28145aeb..3db581be 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -11,20 +11,33 @@ namespace SL {
 class LocationAllocator: private TraversingVisitor
 {
 private:
+	struct Uniform
+	{
+		int location;
+		int desc_set;
+		int bind_point;
+
+		Uniform(): location(-1), desc_set(-1), bind_point(-1) { }
+	};
+
 	std::map<std::string, std::set<unsigned> > used_locations;
-	std::map<std::string, unsigned> uniform_locations;
+	std::map<std::string, Uniform> uniforms;
+	std::map<unsigned, std::set<unsigned> > used_bindings;
 	std::vector<VariableDeclaration *> unplaced_variables;
+	std::vector<VariableDeclaration *> unbound_textures;
+	std::vector<InterfaceBlock *> unbound_blocks;
 
 public:
-	void apply(Module &);
+	void apply(Module &, const Features &);
 private:
 	void apply(Stage &);
 
 	void allocate_locations(const std::string &);
-	void add_location(RefPtr<Layout> &, unsigned);
+	void bind_uniform(RefPtr<Layout> &, const std::string &, unsigned);
+	void add_layout_value(RefPtr<Layout> &, const std::string &, unsigned);
 
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &) { }
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &) { }
 };