X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=ed4b0a292b339ddc8c8bea858281949e96fca118;hb=6afbace895a7bbcf216ab8e48280ea0303ab5892;hp=7334596c0d4873cfb550b995e5791d8b5236cd2d;hpb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;p=libs%2Fgl.git diff --git a/source/programdata.cpp b/source/programdata.cpp index 7334596c..ed4b0a29 100644 --- a/source/programdata.cpp +++ b/source/programdata.cpp @@ -1,7 +1,7 @@ +#include "arb_shader_objects.h" #include "buffer.h" #include "color.h" #include "error.h" -#include "extension.h" #include "matrix.h" #include "program.h" #include "programdata.h" @@ -19,7 +19,7 @@ ProgramData::ProgramData(): buffer(0), changes(NO_CHANGES) { - static RequireExtension _ext("GL_ARB_shader_objects"); + static Require _req(ARB_shader_objects); } // Blocks are intentionally left uncopied @@ -39,6 +39,7 @@ ProgramData::~ProgramData() delete i->second; for(BlockMap::iterator i=blocks.begin(); i!=blocks.end(); ++i) delete i->second.block; + delete buffer; } void ProgramData::uniform(const string &name, Uniform *uni) @@ -171,7 +172,10 @@ UniformBlock *ProgramData::create_block(const Program::UniformBlockInfo &info) c { UniformBlock *block = new UniformBlock(info.data_size); if(!buffer) + { buffer = new Buffer(UNIFORM_BUFFER); + buffer->set_usage(STREAM_DRAW); + } block->use_buffer(buffer, last_block); last_block = block; return block;