X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderpass.h;h=7a2f65688104015afe9650b4b5b6e5814a84a95f;hb=5bc9c7214feaf4ea4797fc0d4a906e5e59b75839;hp=3570151258beb225f84ecd6ef43dd269f8579c7b;hpb=3500f13f51dabadd2e7f06b81820936520cc8115;p=libs%2Fgl.git

diff --git a/source/renderpass.h b/source/renderpass.h
index 35701512..7a2f6568 100644
--- a/source/renderpass.h
+++ b/source/renderpass.h
@@ -17,8 +17,6 @@ class Texturing;
 /**
 Encapsulates the data that determines the appearance of a rendered surface.
 This includes shader and data for it, material and texturing.
-
-XXX Does not delete inline texture from datafiles properly
 */
 class RenderPass
 {
@@ -34,6 +32,7 @@ public:
 
 		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 &);
@@ -47,18 +46,15 @@ private:
 	{
 	private:
 		unsigned index;
-		RefPtr<Texture> tex;
 
 	public:
 		TextureLoader(Texturing &, unsigned, Collection *);
 	private:
-		virtual void finish();
-
 		void texture(const std::string &);
-		void texture2d();
 	};
 
-	const Program *shprog;
+	RefPtr<const Program> shprog;
+	bool shprog_from_material;
 	RefPtr<ProgramData> shdata;
 	std::map<std::string, std::string> uniform_slots;
 	RefPtr<const Material> material;
@@ -74,12 +70,13 @@ public:
 	~RenderPass();
 
 private:
-	void finalize_material();
+	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 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 *);