X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frenderer.h;h=2854bc8ff181f3ead7f0f19ec9b0ec56d79b0470;hb=917db342def84f9ce925df3cb27043b92ef2bfda;hp=a1217c77833216266e51a014c4984e0f4a056a59;hpb=47bfbdc8cf844aa079995fca34a3b906b49a4f66;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index a1217c77..2854bc8f 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -19,6 +19,7 @@ class Mesh;
 class Lighting;
 class Program;
 class Renderable;
+class Sampler;
 class Texture;
 class Texturing;
 class VertexSetup;
@@ -68,6 +69,7 @@ private:
 		const Camera *camera;
 		Matrix modelview_matrix;
 		const Texture *texture;
+		const Sampler *sampler;
 		const Texturing *texturing;
 		unsigned lowest_effect_texunit;
 		const Material *material;
@@ -124,7 +126,7 @@ public:
 	/** Returns the current modelview matrix. */
 	const Matrix &get_matrix() const { return state->modelview_matrix; }
 
-	void set_texture(const Texture *);
+	void set_texture(const Texture *, const Sampler * = 0);
 	void set_texturing(const Texturing *);
 	unsigned allocate_effect_texunit();
 	void set_material(const Material *);