X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.cpp;h=8ca8e336c0d18dc3f0efb08b31914824570f36c4;hb=3137e87b72823bc4227d4382c157867b19aacb49;hp=f07b2015c8c459bd36d480d9cc655d7da15d7c01;hpb=d02c2ebbdb48b65a45c10293e97be2aa747eb913;p=libs%2Fgl.git diff --git a/source/program.cpp b/source/program.cpp index f07b2015..8ca8e336 100644 --- a/source/program.cpp +++ b/source/program.cpp @@ -271,17 +271,6 @@ string Program::get_info_log() const return log; } -void Program::bind() const -{ - if(!linked) - throw invalid_operation("Program::bind"); - - if(!set_current(this)) - return; - - glUseProgramObjectARB(id); -} - int Program::get_uniform_location(const string &n) const { UniformMap::const_iterator i = uniforms.find(n); @@ -307,6 +296,17 @@ int Program::get_uniform_location(const string &n) const return i->second.location; } +void Program::bind() const +{ + if(!linked) + throw invalid_operation("Program::bind"); + + if(!set_current(this)) + return; + + glUseProgramObjectARB(id); +} + void Program::unbind() { if(!set_current(0))