X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterials%2Frenderpass.h;h=0e8ccdf236e68b88c75d9d7ba8095f569bd37d6c;hb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;hp=9e704376a446b56abb056edf0d1aab803a269f7d;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/materials/renderpass.h b/source/materials/renderpass.h
index 9e704376..0e8ccdf2 100644
--- a/source/materials/renderpass.h
+++ b/source/materials/renderpass.h
@@ -31,6 +31,8 @@ public:
 	private:
 		void init();
 
+		static std::string get_shader_name(const std::string &);
+
 		void material_inline();
 		void material(const std::string &);
 		void shader(const std::string &);
@@ -62,7 +64,7 @@ private:
 	RefPtr<const Program> shprog;
 	bool shprog_from_material;
 	RefPtr<ProgramData> shdata;
-	std::map<std::string, std::string> uniform_slots;
+	std::map<Tag, Tag> uniform_slots;
 	RefPtr<const Material> material;
 	std::string material_slot;
 	Texturing *texturing;
@@ -84,11 +86,11 @@ public:
 	void set_shader_program(const Program *, const ProgramData *);
 	const Program *get_shader_program() const { return shprog.get(); }
 	const ProgramData *get_shader_data() const { return shdata.get(); }
-	const std::string &get_slotted_uniform_name(const std::string &) const;
-	void set_material(const Material *);
+	Tag get_slotted_uniform_tag(Tag) const;
+	void set_material(const Material *, DataFile::Collection * = 0);
 	const Material *get_material() const { return material.get(); }
 	const std::string &get_material_slot_name() const { return material_slot; }
-	void set_texture(unsigned, const Texture *);
+	void set_texture(unsigned, const Texture *, const Sampler * = 0);
 	const Texturing *get_texturing() const { return texturing; }
 	int get_texture_index(const std::string &) const;
 	void set_back_faces(bool);