X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexunit.h;h=6253d8d914f52c85f7f9eec6a4beae0fcd733722;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=f3f95e7e422b2179ffea94f6d9c3834891ea8bc9;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b;p=libs%2Fgl.git

diff --git a/source/texunit.h b/source/texunit.h
index f3f95e7e..6253d8d9 100644
--- a/source/texunit.h
+++ b/source/texunit.h
@@ -6,18 +6,18 @@
 namespace Msp {
 namespace GL {
 
-class TexEnv;
-class TexGen;
+class Sampler;
 class Texture;
 
 /**
-Keeps track of texture unit related state.  Mostly for internal use.
+Keeps track of texture unit related state.  Intended for internal use.
 */
 class TexUnit
 {
 private:
 	unsigned index;
 	const Texture *texture;
+	const Sampler *sampler;
 
 	static std::vector<TexUnit> units;
 	static TexUnit *cur_unit;
@@ -28,6 +28,8 @@ public:
 	unsigned get_index() const { return index; }
 	bool set_texture(const Texture *);
 	const Texture *get_texture() const { return texture; }
+	bool set_sampler(const Sampler *);
+	const Sampler *get_sampler() const { return sampler; }
 	void bind();
 
 	static unsigned get_n_units();