X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderpass.h;h=3b3b54b8569e12936cf6f8ffb04dbe0d8378ed95;hp=50cefb76698ea48c63b965e79489816b1d239657;hb=22ed49c0b233566fc5d72b7c9769fd3ba543ab40;hpb=c537fbfc72d3b76719b2080266291fcf7623750b

diff --git a/source/renderpass.h b/source/renderpass.h
index 50cefb76..3b3b54b8 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -37,6 +37,8 @@ public:
 		void texunit(unsigned);
 		void texunit_named(unsigned, const std::string &);
 		void uniforms();
+		void uniform_slot(const std::string &);
+		void uniform_slot2(const std::string &, const std::string &);
 	};
 
 private:
@@ -56,8 +58,10 @@ private:
 	};
 
 	const Program *shprog;
-	ProgramData *shdata;
+	RefPtr<ProgramData> shdata;
+	std::map<std::string, std::string> uniform_slots;
 	RefPtr<const Material> material;
+	std::string material_slot;
 	Texturing *texturing;
 	std::map<std::string, unsigned> tex_names;
 	bool back_faces;
@@ -70,9 +74,11 @@ public:
 
 	void set_shader_program(const Program *, const ProgramData *);
 	const Program *get_shader_program() const { return shprog; }
-	const ProgramData *get_shader_data() const { return shdata; }
+	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 *);
 	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 *);
 	const Texturing *get_texturing() const { return texturing; }
 	int get_texture_index(const std::string &) const;