X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=428c74ce7b1f280046e4268b66ec7005d2cf7a4c;hb=56133280d92c08c1c649a725260a6c4d5afb5e75;hp=c90108d1c27be58632c313e77f491012dcfb8b79;hpb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index c90108d1..428c74ce 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -3,7 +3,6 @@
 
 #include <msp/core/refptr.h>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 
 namespace Msp {
 namespace GL {
@@ -32,11 +31,16 @@ public:
 
 	private:
 		void init();
+
 		void material_inline();
 		void material(const std::string &);
+		void shader(const std::string &);
 		void texunit(unsigned);
+		void texunit_auto(const std::string &);
 		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:
@@ -55,8 +59,10 @@ private:
 		void texture2d();
 	};
 
-	const Program *shprog;
-	ProgramData *shdata;
+	RefPtr<const Program> shprog;
+	bool shprog_from_material;
+	RefPtr<ProgramData> shdata;
+	std::map<std::string, std::string> uniform_slots;
 	RefPtr<const Material> material;
 	std::string material_slot;
 	Texturing *texturing;
@@ -69,9 +75,16 @@ public:
 	RenderPass &operator=(const RenderPass &);
 	~RenderPass();
 
+private:
+	void finalize_material(DataFile::Collection *);
+	void maybe_create_material_shader(DataFile::Collection *);
+	void ensure_private_shader_data();
+
+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 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 *);
 	const Material *get_material() const { return material.get(); }
 	const std::string &get_material_slot_name() const { return material_slot; }