X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.h;h=9e704376a446b56abb056edf0d1aab803a269f7d;hp=428c74ce7b1f280046e4268b66ec7005d2cf7a4c;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=fd62e55d37716787fe909883a1b18e5b8128ec80

diff --git a/source/renderpass.h b/source/renderpass.h
index 428c74ce..9e704376 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -11,14 +11,13 @@ class Material;
 class Program;
 class ProgramData;
 class Renderer;
+class Sampler;
 class Texture;
 class Texturing;
 
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
 This includes shader and data for it, material and texturing.
-
-XXX Does not delete inline texture from datafiles properly
 */
 class RenderPass
 {
@@ -48,15 +47,16 @@ private:
 	{
 	private:
 		unsigned index;
-		RefPtr<Texture> tex;
+		const Texture *tex;
+		const Sampler *samp;
 
 	public:
 		TextureLoader(Texturing &, unsigned, Collection *);
 	private:
 		virtual void finish();
 
+		void sampler(const std::string &);
 		void texture(const std::string &);
-		void texture2d();
 	};
 
 	RefPtr<const Program> shprog;