X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturing.h;h=0da3eae41794d167d5ee9421943cdac29c9cc74f;hb=47bfbdc8cf844aa079995fca34a3b906b49a4f66;hp=daeb2bb812d7bfe62331951070a9fb4977d18490;hpb=f1b12c992db974c679d85ae6ec22cd318199d0d5;p=libs%2Fgl.git

diff --git a/source/texturing.h b/source/texturing.h
index daeb2bb8..0da3eae4 100644
--- a/source/texturing.h
+++ b/source/texturing.h
@@ -14,9 +14,11 @@ class Texturing: public Bindable<Texturing>
 private:
 	struct Attachment
 	{
-		const Texture *tex;
+		unsigned unit;
+		const Texture *texture;
+		const Sampler *sampler;
 
-		Attachment();
+		Attachment(unsigned, const Texture *, const Sampler *);
 	};
 
 	std::vector<Attachment> attachments;
@@ -24,18 +26,23 @@ private:
 public:
 	~Texturing();
 
-	void attach(unsigned, const Texture &);
+	int find_free_unit(const std::string & = std::string()) const;
+	void attach(unsigned, const Texture &, const Sampler * = 0);
+	void attach(unsigned, const Sampler &);
 	void detach(unsigned);
 private:
-	void set_attachment(unsigned, const Texture *);
-	void bind_attachment(unsigned) const;
-
-	static void unbind_attachment(unsigned);
-
+	void set_attachment(unsigned, const Texture *, const Sampler *);
 public:
+	const Texture *get_attached_texture(unsigned) const;
+	const Sampler *get_attached_sampler(unsigned) const;
+
 	void bind() const;
 
 	static void unbind();
+
+private:
+	void bind_attachment(const Attachment &) const;
+	static void unbind_attachment(unsigned);
 };
 
 } // namespace GL