+#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"
buffer(0),
changes(NO_CHANGES)
{
- static RequireExtension _ext("GL_ARB_shader_objects");
+ static Require _req(ARB_shader_objects);
}
// Blocks are intentionally left uncopied
uniform(name, new Uniform4f(v));
}
-void ProgramData::uniform_matrix4(const string &name, const float *v)
+void ProgramData::uniform_matrix2(const string &name, const float *v)
{
- uniform(name, new UniformMatrix4x4f(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 Matrix &m)
+void ProgramData::uniform(const string &name, const Matrix &m)
{
float v[16];
copy(m.data(), m.data()+16, v);
uniform_matrix4(name, v);
}
+void ProgramData::uniform_matrix4(const string &name, const float *v)
+{
+ uniform(name, new UniformMatrix4x4f(v));
+}
+
void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
{
uniform(name, new UniformArray<Uniform1f>(n, v));