X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=bdbe4c1d9e4427721e73096a7b74570e73d26786;hb=9b2e1d2c6fe27574f10016b154dddad4f511996d;hp=69fcdbe0e91fca03b968f355ef397dbaaae273de;hpb=7699570b9a07ef1fbe2b3b8badfa923de2fdd0a1;p=libs%2Fgl.git diff --git a/source/programdata.cpp b/source/programdata.cpp index 69fcdbe0..bdbe4c1d 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,4 +1,3 @@ -#include "arb_shader_objects.h" #include "buffer.h" #include "color.h" #include "error.h" @@ -18,9 +17,7 @@ ProgramData::ProgramData(): last_block(0), buffer(0), changes(NO_CHANGES) -{ - static Require _req(ARB_shader_objects); -} +{ } // Blocks are intentionally left uncopied ProgramData::ProgramData(const ProgramData &other): @@ -149,9 +146,7 @@ void ProgramData::uniform_matrix3(const string &name, const float *v) void ProgramData::uniform(const string &name, const Matrix &m) { - float v[16]; - copy(m.data(), m.data()+16, v); - uniform_matrix4(name, v); + uniform_matrix4(name, m.data()); } void ProgramData::uniform_matrix4(const string &name, const float *v)