X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=1ecd3a1dc42eaef6a62785f3fa4f07e1809a6405;hb=8f7d5b6460ef68e7316c7f556b7152d9c9f7bfe2;hp=7334596c0d4873cfb550b995e5791d8b5236cd2d;hpb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;p=libs%2Fgl.git

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 7334596c..1ecd3a1d 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)
@@ -118,6 +119,16 @@ void ProgramData::uniform4(const string &name, const float *v)
 	uniform(name, new Uniform4f(v));
 }
 
+void ProgramData::uniform_matrix2(const string &name, const float *v)
+{
+	uniform(name, new UniformMatrix2x2f(v));
+}
+
+void ProgramData::uniform_matrix3(const string &name, const float *v)
+{
+	uniform(name, new UniformMatrix3x3f(v));
+}
+
 void ProgramData::uniform_matrix4(const string &name, const float *v)
 {
 	uniform(name, new UniformMatrix4x4f(v));
@@ -171,7 +182,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;