X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=c201eb07c807564a58c1edaa8446d0e83af2e9f6;hb=8ac93980ef87834fd431c97104baa441561a7ce0;hp=688327bb84ebb7c067a504c2b03779181f026b2b;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index 688327bb..c201eb07 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -39,10 +39,10 @@ public:
 
 	private:
 		void init();
-		virtual void finish();
-		void material();
+		void material_inline();
 		void material(const std::string &);
 		void texunit(unsigned);
+		void texunit_named(unsigned, const std::string &);
 		void uniforms();
 	};
 
@@ -68,6 +68,7 @@ private:
 	ProgramData *shdata;
 	RefPtr<const Material> material;
 	Texturing *texturing;
+	std::map<std::string, unsigned> tex_names;
 
 	RenderPass &operator=(const RenderPass &);
 public:
@@ -81,6 +82,7 @@ public:
 	const Material *get_material() const { return material.get(); }
 	void set_texture(unsigned, const Texture *);
 	const Texturing *get_texturing() const { return texturing; }
+	int get_texture_index(const std::string &) const;
 };
 
 } // namespace GL