Make Tag directly comparable and use it as a key in relevant maps

[libs/gl.git] / source / pipeline.cpp

diff --git a/source/pipeline.cpp b/source/pipeline.cpp
index 5969246ba7010f37b976eef4972a81a11ad7eff6..9d5870cd1a6b03dbc71a1f4d444948684ca83a9c 100644 (file)
--- 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,7 +55,7 @@ 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;