X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=9d5870cd1a6b03dbc71a1f4d444948684ca83a9c;hb=56c9bfa0b47583fb9067705a69c3639a17d4a097;hp=fcfead76f16c2ea9495801d98f7a9ed2e7bd7801;hpb=e17243fb2421977cb781361828b77718e2cf8d48;p=libs%2Fgl.git

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index fcfead76..9d5870cd 100644
--- a/source/pipeline.cpp
+++ b/source/pipeline.cpp
@@ -37,17 +37,17 @@ Pipeline::~Pipeline()
 
 PipelinePass &Pipeline::add_pass(const Tag &tag)
 {
-	if(passes.count(tag.id))
+	if(passes.count(tag))
 		throw KeyError("Pass already exists");
 
-	PipelinePass &pass=passes[tag.id];
+	PipelinePass &pass=passes[tag];
 	pass_order.push_back(tag);
 	return pass;
 }
 
 PipelinePass &Pipeline::get_pass(const Tag &tag)
 {
-	map<unsigned, PipelinePass>::iterator i=passes.find(tag.id);
+	PassMap::iterator i=passes.find(tag);
 	if(i==passes.end())
 		throw KeyError("Unknown pass");
 	return i->second;
@@ -55,17 +55,12 @@ PipelinePass &Pipeline::get_pass(const Tag &tag)
 
 const PipelinePass &Pipeline::get_pass(const Tag &tag) const
 {
-	map<unsigned, PipelinePass>::const_iterator i=passes.find(tag.id);
+	PassMap::const_iterator i=passes.find(tag);
 	if(i==passes.end())
 		throw KeyError("Unknown pass");
 	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);
@@ -115,7 +110,7 @@ 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();