X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=36b349125f51eb236cff061d9c08c0ad49c2a542;hb=7b03ca83ca6c48b9f8c3f77c13760e7f87e9632d;hp=212007131e80a3d0e37173364005d68f3b8d1166;hpb=c8de66203565f07f10898a74dbd55072432790fc;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 21200713..36b34912 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -8,37 +8,43 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Generates default precision declarations if they are missing, to satisfy
-GLSL ES requirements. */
-class DefaultPrecisionGenerator: private TraversingVisitor
+class LocationAllocator: private TraversingVisitor
 {
 private:
-	Stage *stage;
-	std::set<std::string> have_default;
-	NodeList<Statement>::iterator insert_point;
+	std::map<std::string, std::set<unsigned> > used_locations;
+	std::map<std::string, unsigned> uniform_locations;
+	std::vector<VariableDeclaration *> unplaced_variables;
 
 public:
-	DefaultPrecisionGenerator();
-
+	void apply(Module &);
+private:
 	void apply(Stage &);
 
-private:
-	virtual void visit(Block &);
-	virtual void visit(Precision &);
+	void allocate_locations(const std::string &);
+	void add_location(RefPtr<Layout> &, unsigned);
+
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &) { }
+	virtual void visit(FunctionDeclaration &) { }
 };
 
-/** Removes precision qualifiers from variable declarations, as well as
-default precision declarations. */
-class PrecisionRemover: private TraversingVisitor
+/** Generates default precision declarations or removes precision declarations
+according to the requirements of the target API. */
+class PrecisionConverter: private TraversingVisitor
 {
 private:
+	Stage *stage;
+	std::set<std::string> have_default;
+	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
 
 public:
+	PrecisionConverter();
+
 	void apply(Stage &);
 
 private:
+	virtual void visit(Block &);
 	virtual void visit(Precision &);
 	virtual void visit(VariableDeclaration &);
 };
@@ -50,7 +56,6 @@ class LegacyConverter: private TraversingVisitor
 private:
 	Stage *stage;
 	Features features;
-	std::string r_type;
 	VariableDeclaration *frag_out;
 	NodeList<Statement>::iterator uniform_insert_point;
 	std::set<Node *> nodes_to_remove;
@@ -73,10 +78,13 @@ private:
 	bool supports_unified_sampling_functions() const;
 	virtual void visit(FunctionCall &);
 	bool supports_interface_layouts() const;
+	bool supports_stage_interface_layouts() const;
 	bool supports_centroid_sampling() const;
 	bool supports_sample_sampling() const;
+	bool supports_uniform_location() const;
 	virtual void visit(VariableDeclaration &);
 	bool supports_interface_blocks(const std::string &) const;
+	bool supports_interface_block_location() const;
 	virtual void visit(InterfaceBlock &);
 };