X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramdata.cpp;h=cd12c2ca47fbff99cdbfe2578d30ebbd0468d997;hp=a0e0e8bc61376b814f28af1439f01329d8e7e61e;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=72a13418cc19e750abf3f8d8a52aea5e1abe4983

diff --git a/source/programdata.cpp b/source/programdata.cpp
index a0e0e8bc..cd12c2ca 100644
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -271,6 +271,16 @@ void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
 	uniform(name, new UniformArray<Uniform4f>(n, v));
 }
 
+void ProgramData::uniform_matrix2_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<UniformMatrix2x2f>(n, v));
+}
+
+void ProgramData::uniform_matrix3_array(const string &name, unsigned n, const float *v)
+{
+	uniform(name, new UniformArray<UniformMatrix3x3f>(n, v));
+}
+
 void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
 {
 	uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
@@ -455,7 +465,7 @@ ProgramData::ProgramBlock::ProgramBlock():
 
 ProgramData::ProgramBlock::ProgramBlock(int p, SharedBlock *b):
 	bind_point(p),
-	block(b ? b->block : 0),
+	block((b && b->used) ? b->block : 0),
 	shared(b)
 { }