X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=5969246ba7010f37b976eef4972a81a11ad7eff6;hb=e759062876ee7fc81d1c2f40818d5bf97898d53d;hp=b0a38a2d3240a11cc63dd8ee9c801e22a534514e;hpb=83bf78244e92ca6731edd8075f158fcec6e53027;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index b0a38a2d..5969246b 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -61,11 +61,6 @@ const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 	return i->second;
 }
 
-bool Pipeline::has_pass(const Tag &tag) const
-{
-	return passes.count(tag.id);
-}
-
 void Pipeline::add_renderable(const Renderable &r)
 {
 	renderables.push_back(&r);
@@ -101,10 +96,7 @@ void Pipeline::render(const Tag &tag) const
 	if(pass.lighting)
 		pass.lighting->bind();
 	for(vector<Effect *>::const_iterator i=pass.effects.begin(); i!=pass.effects.end(); ++i)
-	{
 		(*i)->prepare();
-		glViewport(0, 0, width, height);
-	}
 	for(vector<const Renderable *>::const_iterator i=renderables.begin(); i!=renderables.end(); ++i)
 		(*i)->render(tag);
 	for(vector<Effect *>::const_iterator i=pass.effects.end(); i--!=pass.effects.begin();)
@@ -118,13 +110,10 @@ void Pipeline::render_all() const
 	if(fbo)
 	{
 		fbo->bind();
-		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+		clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT);
 	}
 	for(vector<Effect *>::const_iterator i=effects.begin(); i!=effects.end(); ++i)
-	{
 		(*i)->prepare();
-		glViewport(0, 0, width, height);
-	}
 	for(vector<Tag>::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i)
 		render(*i);
 	for(vector<Effect *>::const_iterator i=effects.end(); i--!=effects.begin();)