X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=4fc2e1b00c42806768e0aca28b9166eb2284939b;hb=0a8abd433b3052ed99adac4069fef55c6a56ccaa;hp=bde0618abf2bc3dc5d73f57209486f575fa1e1b6;hpb=efbce87192ce73ba577684369f759693dccec67c;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index bde0618a..4fc2e1b0 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -29,22 +29,26 @@ class LocationAllocator: private TraversingVisitor
 private:
 	struct Uniform
 	{
-		int location;
-		int desc_set;
-		int bind_point;
-
-		Uniform(): location(-1), desc_set(-1), bind_point(-1) { }
+		int location = -1;
+		int desc_set = 0;
+		int bind_point = -1;
 	};
 
+	Features features;
+	bool alloc_new = true;
 	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;
+	std::vector<VariableDeclaration *> unbound_blocks;
+
+	/* Dirty hack to work around an issue where vertex attributes prevent the
+	flat qualifier from working on the same location. */
+	std::set<unsigned> used_vertex_attribs;
 
 public:
-	void apply(Module &, const Features &);
+	void apply(Module &, const Features &, bool = true);
 private:
 	void apply(Stage &);
 
@@ -53,10 +57,31 @@ private:
 
 	bool visit_uniform(const std::string &, RefPtr<Layout> &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &) { }
 };
 
+/**
+Converts the output depth range to match expectations of the target API.
+*/
+class DepthRangeConverter: private TraversingVisitor
+{
+private:
+	bool assignment_target = false;
+	bool r_gl_pervertex = false;
+	bool r_gl_position = false;
+	bool r_position_z_assigned = false;
+
+public:
+	void apply(Stage &, const Features &);
+
+private:
+	virtual void visit(VariableReference &);
+	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
+	virtual void visit(Assignment &);
+	virtual void visit(FunctionDeclaration &);
+};
+
 /** Generates default precision declarations or removes precision declarations
 according to the requirements of the target API. */
 class PrecisionConverter: private TraversingVisitor
@@ -117,14 +142,12 @@ private:
 	bool supports_stage(Stage::Type) const;
 	bool supports_unified_interface_syntax() const;
 	virtual void visit(VariableReference &);
-	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
 	virtual void visit(Assignment &);
 	bool supports_unified_sampling_functions() const;
 	virtual void visit(FunctionCall &);
-	virtual void visit(VariableDeclaration &);
 	bool supports_interface_blocks(const std::string &) const;
-	virtual void visit(InterfaceBlock &);
+	virtual void visit(VariableDeclaration &);
 };
 
 /** Converts qualifiers on variables and blocksto match a particular set of
@@ -142,9 +165,8 @@ private:
 	bool supports_sample_sampling() const;
 	bool supports_uniform_location() const;
 	bool supports_binding() const;
-	virtual void visit(VariableDeclaration &);
 	bool supports_interface_block_location() const;
-	virtual void visit(InterfaceBlock &);
+	virtual void visit(VariableDeclaration &);
 };
 
 } // namespace SL