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

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 21200713..fd29737a 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -1,5 +1,5 @@
-#ifndef MSP_GL_SL_COMPATIBILITY_H_
-#define MSP_GL_SL_COMPATIBILITY_H_
+#ifndef MSP_GL_SL_FINALIZE_H_
+#define MSP_GL_SL_FINALIZE_H_
 
 #include <string>
 #include "visitor.h"
@@ -8,37 +8,74 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Generates default precision declarations if they are missing, to satisfy
-GLSL ES requirements. */
-class DefaultPrecisionGenerator: private TraversingVisitor
+/** Assigns offset layout qualifiers to struct members. */
+class StructOrganizer: private TraversingVisitor
 {
 private:
-	Stage *stage;
-	std::set<std::string> have_default;
-	NodeList<Statement>::iterator insert_point;
+	int offset;
 
 public:
-	DefaultPrecisionGenerator();
+	StructOrganizer();
 
-	void apply(Stage &);
+	void apply(Stage &s) { s.content.visit(*this); }
 
 private:
-	virtual void visit(Block &);
-	virtual void visit(Precision &);
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 };
 
-/** Removes precision qualifiers from variable declarations, as well as
-default precision declarations. */
-class PrecisionRemover: private TraversingVisitor
+/** Assigns location and binding layout qualifiers to interface variables and
+blocks. */
+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, 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 &, const Features &);
+private:
+	void apply(Stage &);
+
+	void allocate_locations(const std::string &);
+	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(FunctionDeclaration &) { }
+};
+
+/** 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 +87,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 +109,14 @@ 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;
+	bool supports_binding() const;
 	virtual void visit(VariableDeclaration &);
 	bool supports_interface_blocks(const std::string &) const;
+	bool supports_interface_block_location() const;
 	virtual void visit(InterfaceBlock &);
 };