X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=943dcfaf66a3f12381b56b5c087dde1f967f0941;hb=8141d1e1cf5de45d1e8d640f3f8643ee748292dc;hp=ded9f8a7bb242c38f5606b9cc1dce7bef67d4b2a;hpb=a8b400939e1325ed1efeb697771ba38156729d00;p=libs%2Fgl.git diff --git a/source/programdata.cpp b/source/programdata.cpp index ded9f8a7..943dcfaf 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,4 +1,4 @@ -#include "arb_shader_objects.h" +#include #include "buffer.h" #include "color.h" #include "error.h" @@ -33,6 +33,24 @@ ProgramData::ProgramData(const ProgramData &other): i->second = i->second->clone(); } +ProgramData &ProgramData::operator=(const ProgramData &other) +{ + for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) + delete i->second; + uniforms.clear(); + + for(UniformMap::const_iterator i=other.uniforms.begin(); i!=other.uniforms.end(); ++i) + uniforms.insert(uniforms.end(), UniformMap::value_type(i->first, i->second->clone())); + + for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) + delete i->second.block; + blocks.clear(); + + changes = NO_CHANGES; + + return *this; +} + ProgramData::~ProgramData() { for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)