X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.h;h=79ba54b81b027c8b16743e0f1281b3e961611319;hb=6211e1556df8345ad1c4e7edbd635bccdd7f54f0;hp=19ad594781825a5cef996fe9c1958cb392074395;hpb=c7d1d96540688b7a853fa69d4ca45d968755a89c;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index 19ad5947..79ba54b8 100644
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -29,11 +29,9 @@ class LocationAllocator: private TraversingVisitor
 private:
 	struct Uniform
 	{
-		int location;
-		int desc_set;
-		int bind_point;
-
-		Uniform(): location(-1), desc_set(0), bind_point(-1) { }
+		int location = -1;
+		int desc_set = 0;
+		int bind_point = -1;
 	};
 
 	Features features;
@@ -43,7 +41,7 @@ private:
 	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;
 
 public:
 	void apply(Module &, const Features &, bool = true);
@@ -55,7 +53,6 @@ private:
 
 	bool visit_uniform(const std::string &, RefPtr<Layout> &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &) { }
 };
 
@@ -119,14 +116,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
@@ -144,9 +139,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