X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=428c74ce7b1f280046e4268b66ec7005d2cf7a4c;hb=146df2d02940a04aeafe854bdd981a1489cc80b3;hp=34c315b3a2c0cc797031c024d2b1f315906bff7d;hpb=72a13418cc19e750abf3f8d8a52aea5e1abe4983;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index 34c315b3..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,9 +31,12 @@ 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 &);
@@ -57,8 +59,9 @@ 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;
@@ -72,9 +75,15 @@ 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(); }