X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=8757ea92e87e54a6a0e1b0dc33afe1c7f5b006e3;hb=df435a8983a5c1d1c327a4a2a19836a13aff267b;hp=eca9a49a3c22dfca97cfa5119da4e2d53710ec7a;hpb=97e1aa9b5d2bacd3f1dddf2d1889f2714e36b766;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index eca9a49a..8757ea92 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -1,7 +1,6 @@
 #include <msp/core/maputils.h>
 #include "blend.h"
 #include "camera.h"
-#include "effect.h"
 #include "framebuffer.h"
 #include "lighting.h"
 #include "pipeline.h"
@@ -35,6 +34,9 @@ Pipeline::~Pipeline()
 	delete fbo;
 	delete color_buf;
 	delete depth_buf;
+	delete fbo_ms;
+	delete color_buf_ms;
+	delete depth_buf_ms;
 }
 
 void Pipeline::set_hdr(bool h)
@@ -108,11 +110,6 @@ void Pipeline::remove_renderable(const Renderable &r)
 		}
 }
 
-void Pipeline::add_effect(Effect &e)
-{
-	effects.push_back(&e);
-}
-
 void Pipeline::add_postprocessor(PostProcessor &pp)
 {
 	postproc.push_back(&pp);
@@ -130,15 +127,9 @@ void Pipeline::render(Renderer &renderer, const Tag &tag) const
 	Bind bind_blend(pass.blend);
 	Bind bind_lighting(pass.lighting);
 
-	for(vector<Effect *>::const_iterator i=pass.effects.begin(); i!=pass.effects.end(); ++i)
-		(*i)->prepare();
-
 	for(vector<Slot>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		if(i->passes.empty() || i->passes.count(tag))
 			i->renderable->render(renderer, tag);
-
-	for(vector<Effect *>::const_iterator i=pass.effects.end(); i!=pass.effects.begin();)
-		(*--i)->cleanup();
 }
 
 void Pipeline::render_all() const
@@ -153,16 +144,10 @@ void Pipeline::render_all() const
 		f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 
-	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
-		(*i)->prepare();
-
 	Renderer renderer(camera);
 	for(vector<Tag>::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i)
 		render(renderer, *i);
 
-	for(vector<Effect *>::const_iterator i=effects.end(); i!=effects.begin();)
-		(*--i)->cleanup();
-
 	if(fbo)
 	{
 		if(fbo_ms)